Changeset 656

Timestamp:

Nov 8, 2011, 6:50:31 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba Server 3.5: Some more work to get high-mem working

Location:

trunk/server

Files:

• lib/tdb/common/tdb_private.h (modified) (1 diff)
• lib/tdb/common/transaction.c (modified) (8 diffs)
• source3/build.cmd (modified) (10 diffs)
• source3/lib/os2helper.c (modified) (6 diffs)
• source3/lib/recvfile.c (modified) (2 diffs)
• source3/lib/select.c (modified) (1 diff)
• source3/libsmb/clientgen.c (modified) (1 diff)
• source3/passdb/pdb_tdb.c (modified) (8 diffs)

trunk/server/lib/tdb/common/tdb_private.h

@@ -38 +38 @@
 #include "tdb.h"
 
-/* #define TDB_TRACE 1 */
+#define TDB_TRACE 1
 #ifndef HAVE_GETPAGESIZE
 #define getpagesize() 0x2000

trunk/server/lib/tdb/common/transaction.c

@@ -1020 +1020 @@
 
         tdb_trace(tdb, "tdb_transaction_commit");
-
+        tdb_trace(tdb, "@todo: tdb_transaction_error");
         if (tdb->transaction->transaction_error) {
                 tdb->ecode = TDB_ERR_IO;
@@ -1028 +1028 @@
         }
 
-
+        tdb_trace(tdb, "@todo: tdb_transaction_nesting");
         if (tdb->transaction->nesting != 0) {
                 tdb->transaction->nesting--;
@@ -1034 +1034 @@
         }
 
+        tdb_trace(tdb, "@todo: tdb_null_transaction");
         /* check for a null transaction */
         if (tdb->transaction->blocks == NULL) {
@@ -1040 +1041 @@
         }
 
+        tdb_trace(tdb, "@todo: tdb_transaction_prepare");
         if (!tdb->transaction->prepared) {
                 int ret = _tdb_transaction_prepare_commit(tdb);
@@ -1048 +1050 @@
         methods = tdb->transaction->io_methods;
 
+        tdb_trace(tdb, "@todo: tdb_transaction perform all the writes");
+
         /* perform all the writes */
         for (i=0;i<tdb->transaction->num_blocks;i++) {
@@ -1062 +1066 @@
                         length = tdb->transaction->last_block_size;
                 }
-
                 if (methods->tdb_write(tdb, offset, tdb->transaction->blocks[i], length) == -1) {
                         TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_transaction_commit: write failed during commit\n"));
@@ -1083 +1086 @@
         tdb->transaction->num_blocks = 0;
 
+        tdb_trace(tdb, "@todo: tdb_transaction ensure the new data is on disk");
         /* ensure the new data is on disk */
         if (transaction_sync(tdb, 0, tdb->map_size) == -1) {
@@ -1100 +1104 @@
            mtime changes when a transaction completes */
 #ifdef HAVE_UTIME
+    tdb_trace(tdb, "@todo: tdb_transaction utime");
         utime(tdb->name, NULL);
 #endif
 
+    tdb_trace(tdb, "@todo: tdb_transaction need repack");
         need_repack = tdb->transaction->need_repack;
 
         /* use a transaction cancel to free memory and remove the
            transaction locks */
+    tdb_trace(tdb, "@todo: tdb_transaction cancel");
         _tdb_transaction_cancel(tdb);
 
         if (need_repack) {
+            tdb_trace(tdb, "@todo: tdb_transaction repack");
                 return tdb_repack(tdb);
         }

trunk/server/source3/build.cmd

@@ -7 +7 @@
 /* version 0.3.1 from 20.08.2010 Silvan (added version.ecs check) */
 /* version 0.3.2 from 08.07.2011 Silvan (pythonhome may be not set) */
+/* version 0.3.3 from 05.11.2011 Herwig (add support for libc064) */
 
 /* load the sysfuncs if not already loaded */
@@ -16 +17 @@
 
 /* init the version string (don't forget to change) */
-version = "0.3.2"
-version_date = "08.07.2011"
-
+version = "0.3.3"
+version_date = "05.11.2011"
 
 '@echo off'
@@ -24 +24 @@
 
 say "Samba for eCS (OS/2) build script v"   || version || " from " || version_date
-
 
 /* No parameter or HELP -> display usage */
@@ -31 +30 @@
     say "Valid commands are:"
     say "      HELP  - this page"
+    say "      064   - link against libc064.dll (default)"
+    say "      064x  - link against libc064x.dll"
     say "      063   - link against libc063.dll"
-    say "      064x  - link against libc064x.dll"
     say "      CONF  - run configure"
     say "      CLEAN - clean up and recompile everything"
@@ -55 +55 @@
 /* defaults */
 make  = ""
-libc  = "064x"
+libc  = "064"
 brand = "No"
 conf  = ""
@@ -83 +83 @@
     build_parms = build_parms||' 'make
 end
-if pos("064X", cmdline) > 0 then do
-    libc = "064X"
-    build_parms = build_parms||' 'libc    
-end
-if pos("063", cmdline) > 0 then do
-    libc = "063"
-    build_parms = build_parms||' 'libc    
+select 
+    when pos("064X", cmdline) > 0 then do
+        libc = "064X"
+        build_parms = build_parms||' 'libc    
+    end
+    when pos("063", cmdline) > 0 then do
+        libc = "063"
+        build_parms = build_parms||' 'libc    
+    end
+    otherwise do
+        libc = "064"
+        build_parms = build_parms||' 'libc    
+    end
 end
 if pos("BRAND", cmdline) > 0 then do
@@ -101 +107 @@
 
 /* start working */
-if libc = "063" then do
-    address cmd "call 063.cmd"
-end
-else do
-    address cmd "call 064x.cmd"
+select
+    when libc = "064X" then address cmd "call 064x.cmd"
+    when libc = "063" then address cmd "call 063.cmd"
+    otherwise address cmd "call 064.cmd"
 end
 
@@ -123 +128 @@
 
 /* is cups env set */
-        sEnvVar = EnvGet('CUPS');
+    sEnvVar = EnvGet('CUPS');
     if sEnvVar <> '' then do
-    call lineout cacheFile, "ac_cv_path_CUPS_CONFIG='" || sEnvVar || "'";
+        call lineout cacheFile, "ac_cv_path_CUPS_CONFIG='" || sEnvVar || "'";
     end
 
 /* is python env set */
-        sEnvVar = EnvGet('PYTHONHOME');
+    sEnvVar = EnvGet('PYTHONHOME');
     if sEnvVar <> '' then do
-    sPythonVersion = PythonVersion(sEnvVar);
-    if sPythonVersion <> '-1' then do
-    call lineout cacheFile, "ac_cv_path_PYTHON_CONFIG='" || sEnvVar || "/config/" || sPythonVersion || "'";
-    call lineout cacheFile, "ac_cv_path_PYTHON='" || sEnvVar || "'";
-    end
+        sPythonVersion = PythonVersion(sEnvVar);
+        if sPythonVersion <> '-1' then do
+            call lineout cacheFile, "ac_cv_path_PYTHON_CONFIG='" || sEnvVar || "/config/" || sPythonVersion || "'";
+            call lineout cacheFile, "ac_cv_path_PYTHON='" || sEnvVar || "'";
+        end
     end
 
@@ -148 +153 @@
     address cmd "make clean"
 end
-       
+
 if brand = "YES" then do
     svninfo = ".\svninfo"
@@ -160 +165 @@
     say build_parms
     address cmd 'make 2>&1 | tee build.log'
-end    
+end
 
 if pos("ZIP", cmdline) > 0 then do

trunk/server/source3/lib/os2helper.c

@@ -1 @@
-/* This file contains helper functions for OS/2 - 
-   do not try to compile on other platforms! */
+/*  This file contains Samba helper functions for eComStation (OS/2) - 
+ *  do not try to compile on other platforms!
+ *  
+ *  Copyright (C) 2007-2011
+ *                Silvan Scherrer 
+ *                Yuri Dario
+ *                Paul Smedley
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
 
 #ifdef __OS2__
@@ -51 +70 @@
 {
         /* We call __libc_Back_ioFileSizeSet directly instead of 
-           ftruncate to force it not to zero expanding files to optimize
-           samba performance when copying files */
+           ftruncate to force it not to zero expanding files to 
+           optimize Samba performance when copying files */
 
         int rc = __libc_Back_ioFileSizeSet(fd, size, 0);
@@ -65 +84 @@
 int os2_isattribute(char *path, unsigned short attr)
 {
-    HDIR          hdirFindHandle = HDIR_CREATE;
-    FILEFINDBUF3  FindBuffer     = {0};      /* Returned from FindFirst/Next */
-    USHORT        dosattr;                      /* attribute to search for */
-    ULONG         ulResultBufLen = sizeof(FILEFINDBUF3);
-    ULONG         ulFindCount    = 1;        /* Look for 1 file at a time    */
-    APIRET        rc             = NO_ERROR; /* Return code                  */
-    if (attr==aARCH) 
+        HDIR          hdirFindHandle = HDIR_CREATE;
+        FILEFINDBUF3  FindBuffer     = {0};      /* Returned from FindFirst/Next */
+        USHORT        dosattr;                   /* attribute to search for */
+        ULONG         ulResultBufLen = sizeof(FILEFINDBUF3);
+        ULONG         ulFindCount    = 1;        /* Look for 1 file at a time    */
+        APIRET        rc             = NO_ERROR; /* Return code                  */
+        if (attr == aARCH) 
                         dosattr=MUST_HAVE_ARCHIVED;
-    else if (attr==aRONLY)
+        else if (attr == aRONLY)
                         dosattr=MUST_HAVE_READONLY;
-    else if (attr==aSYSTEM)
+        else if (attr == aSYSTEM)
                         dosattr=MUST_HAVE_SYSTEM;
-    else if (attr==aHIDDEN)
+        else if (attr == aHIDDEN)
                         dosattr=MUST_HAVE_HIDDEN;
 
-    rc = DosFindFirst( path,                /* File pattern - all files     */
+        rc = DosFindFirst( path,                 /* File pattern - all files     */
                        &hdirFindHandle,      /* Directory search handle      */
-                        dosattr,
+                       dosattr,
                        &FindBuffer,          /* Result buffer                */
                        ulResultBufLen,       /* Result buffer length         */
@@ -88 +107 @@
                        FIL_STANDARD);        /* Return Level 1 file info     */
 
-   if (rc != NO_ERROR) {
-         rc = DosFindClose(hdirFindHandle);    /* Close our directory handle */
-       return 1;
-    } else {
-         rc = DosFindClose(hdirFindHandle);    /* Close our directory handle */
+        if (rc != NO_ERROR) {
+                rc = DosFindClose(hdirFindHandle);    /* Close our directory handle */
+                return 1;
+        } else {
+                rc = DosFindClose(hdirFindHandle);    /* Close our directory handle */
         return 0;
-    } /* endif */
+        } /* endif */
 }
 
@@ -157 +176 @@
 }
 */
+
 // OS/2 specific socketpair() implementation, as it only works in low mem
 int os2_socketpair(int fds[2])
 {
         int mypair[2];
-        int rc = 0;
+        int rc = 0;
 
         rc = socketpair(AF_UNIX, SOCK_STREAM, 0, mypair);
-        if (rc >= 0) {
-                fds[0] = mypair[0];
-                fds[1] = mypair[1];
-        }
+        if (rc >= 0) {
+                fds[0] = mypair[0];
+                fds[1] = mypair[1];
+        }
 
         return rc;
@@ -178 +198 @@
 void os2_randget(char * buffer, int length)
 {
-    UCHAR randbyte();
-    unsigned int idx;
-
-    for (idx=0; idx<length; idx++)
+        UCHAR randbyte();
+        unsigned int idx;
+
+        for (idx=0; idx<length; idx++)
         buffer[idx] = randbyte();
 

trunk/server/source3/lib/recvfile.c

@@ -25 +25 @@
 
 #include "includes.h"
+#ifdef __OS2__
+#define pipe(A) os2_socketpair(A)
+#endif
 
 /* Do this on our own in TRANSFER_BUF_SIZE chunks.
@@ -174 +177 @@
         }
 
-#ifndef __OS2__
         if ((pipefd[0] == -1) && (pipe(pipefd) == -1)) {
-#else
-        if ((pipefd[0] == -1) && (socketpair(AF_UNIX, SOCK_STREAM,0, pipefd) == -1)) {
-#endif
                 try_splice_call = false;
                 return default_sys_recvfile(fromfd, tofd, offset, count);

trunk/server/source3/lib/select.c

@@ -28 +28 @@
    This means all Samba signal handlers should call sys_select_signal().
 */
+#ifdef __OS2__
+#define pipe(A) os2_socketpair(A)
+#endif
 
 static pid_t initialised;

trunk/server/source3/libsmb/clientgen.c

@@ -435 +435 @@
                 DEBUG(0,("Error writing %d bytes to client. (%s)\n",
                          (int)(len+extradata), strerror(errno)));
-printf("@remove me, %d bytes written, %d + %d bytes reqested\n", nwritten, len, extradata);
                 return false;
         }

trunk/server/source3/passdb/pdb_tdb.c

@@ -339 +339 @@
         int ret;
 
+    DEBUG(0,("@todo: tdbsam_convert: tdbsam_convert_backup\n"));
         /* We only need the update backup for local db's. */
         if (db_is_local(name) && !tdbsam_convert_backup(name, pp_db)) {
@@ -349 +350 @@
         state.success = true;
 
+    DEBUG(0,("@todo: tdbsam_convert: transaction_start\n"));
         if (db->transaction_start(db) != 0) {
                 DEBUG(0, ("tdbsam_convert: Could not start transaction\n"));
@@ -354 +356 @@
         }
 
+    DEBUG(0,("@todo: tdbsam_convert: tdbsam_upgrade_next_rid\n"));
         if (!tdbsam_upgrade_next_rid(db)) {
                 DEBUG(0, ("tdbsam_convert: tdbsam_upgrade_next_rid failed\n"));
@@ -359 +362 @@
         }
 
+    DEBUG(0,("@todo: tdbsam_convert: traverse\n"));
         ret = db->traverse(db, tdbsam_convert_one, &state);
         if (ret < 0) {
@@ -370 +374 @@
         }
 
+    DEBUG(0,("@todo: tdbsam_convert: dbwrap_store_int32 major\n"));
         if (dbwrap_store_int32(db, TDBSAM_VERSION_STRING,
                                TDBSAM_VERSION) != 0) {
@@ -375 +380 @@
                 goto cancel;
         }
-
+    DEBUG(0,("@todo: tdbsam_convert: dbwrap_store_int32 minor\n"));
         if (dbwrap_store_int32(db, TDBSAM_MINOR_VERSION_STRING,
                                TDBSAM_MINOR_VERSION) != 0) {
@@ -382 +387 @@
         }
 
+    DEBUG(0,("@todo: tdbsam_convert: transaction_commit\n"));
         if (db->transaction_commit(db) != 0) {
                 DEBUG(0, ("tdbsam_convert: Could not commit transaction\n"));
@@ -390 +396 @@
 
  cancel:
+    DEBUG(0,("@todo: tdbsam_convert: transaction_cancel\n"));
         if (db->transaction_cancel(db) != 0) {
                 smb_panic("tdbsam_convert: transaction_cancel failed");