Changeset 699

Timestamp:

Apr 23, 2012, 8:01:39 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.3: made it high-mem aware

Location:

branches/samba-3.3.x/source

Files:

• build.cmd (modified) (4 diffs)
• lib/os2helper.c (modified) (2 diffs)
• lib/select.c (modified) (2 diffs)
• nmbd/asyncdns.c (modified) (2 diffs)
• printing/print_cups.c (modified) (1 diff)
• printing/printing.c (modified) (2 diffs)

branches/samba-3.3.x/source/build.cmd

@@ -13 +13 @@
 /* version 0.3.6 from 06.04.2012 Herwig (support parallel jobs, show build 
                                          time upon completion) */
+/* version 0.3.7 from 23.04.2012 Silvan (compile and link flags need to be
+                                         set here [happy birthday Jason]) */
                                          
 /* load the sysfuncs if not already loaded */
@@ -22 +24 @@
 
 /* init the version string (don't forget to change) */
-version = "0.3.6"
-version_date = "06.04.2012"
+version = "0.3.7"
+version_date = "23.04.2012"
 
 /* number of make jobs to execute at the same time */
@@ -123 +125 @@
 if conf = "YES" then do
     address cmd 'SETLOCAL'
-/*  address cmd 'SET CFLAGS=-g -Zomf -O1 -march=pentium -mtune=pentium4'
-    address cmd 'SET CXXFLAGS=-g -Zomf -O1 -march=pentium -mtune=pentium4'
-    address cmd 'SET LDFLAGS=-s -Zsym -Zmap -Zbin-files -Zomf -Zexe -Zargs-wild -Zargs-resp'
-    address cmd 'SET AR=emxomfar'
-    address cmd 'SET LIBS=-lsocket -lsyslog' */
-    /* disabled options:
-         --enable-developer --enable-socket-wrapper
-     */
 
 /* we need to delete the cache file and redo it afterwards */
     ok = SysFileDelete(cacheFile);
+
+/* add the compile and link flags to the cache file */
+    call SetCLFlags
 
 /* is cups env set */
@@ -298 +295 @@
     end
 return rc
+
+/**
+ * set the compile and link flags
+ */
+SetCLFlags: procedure expose cacheFile
+
+    call lineout cacheFile, "CFLAGS='-D__EMX__ -DOS2  -D__OS2__ -D__ST_MT_ERRNO__ -O2 -march=pentium -mtune=pentium4'";
+    call lineout cacheFile, "CXXFLAGS='-D__EMX__ -DOS2 -D__OS2__ -D__ST_MT_ERRNO__ -O2 -march=pentium -mtune=pentium4'";
+    call lineout cacheFile, "LDFLAGS='-Zmap -Zargs-wild -Zbin-files -Zhigh-mem -D__ST_MT_ERRNO__ -s'";
+/*  address cmd 'SET AR=emxomfar'
+    address cmd 'SET LIBS=-lsocket -lsyslog' */
+    return

branches/samba-3.3.x/source/lib/os2helper.c

@@ -40 +40 @@
 #include <types.h>
 #include <string.h>
+#include <sys/socket.h>
 //YD for tmalloc
 #include <malloc.h>
@@ -177 +178 @@
 }
 */
+
+/* OS/2 specific pipe implementation, we have to use socketpair as select on 
+filehandle is not working. */
+int os2_pipe(int fds[2])
+{
+        int rc = 0;
+
+        rc = socketpair(AF_UNIX, SOCK_STREAM, 0, fds);
+        return rc;
+}
+
 /* OS/2-specific random functions. these functions used to be based on APR 
    random code, but we discovered some nasty problems with it on fast hardware

branches/samba-3.3.x/source/lib/select.c

@@ -28 +28 @@
    This means all Samba signal handlers should call sys_select_signal().
 */
+#ifdef __OS2__
+#define pipe(A) os2_pipe(A)
+#endif
 
 static pid_t initialised;
@@ -59 +62 @@
 
         if (initialised != sys_getpid()) {
-#ifndef __OS2__
                 if (pipe(select_pipe) == -1)
-#else
-                if (socketpair(AF_UNIX, SOCK_STREAM,0, select_pipe) == -1)
-#endif
                         smb_panic("Could not create select pipe");
 

branches/samba-3.3.x/source/nmbd/asyncdns.c

@@ -17 +17 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
    */
+#ifdef __OS2__
+#define pipe(A) os2_pipe(A)
+#endif
 
 #include "includes.h"
@@ -141 +144 @@
         CatchChild();
 
-#ifdef __OS2__
-// cant use pipes here, because select() from innotek lib does work only for sockets.
-        if (socketpair(AF_UNIX, SOCK_STREAM, 0, fd1) < 0)
-        {
-                DEBUG(0,("can't create asyncdns socketpair1 %d\n", errno));
-                return;         
-        }
-        if (socketpair(AF_UNIX, SOCK_STREAM, 0, fd2) < 0)
-        {
-                DEBUG(0,("can't create asyncdns socketpair2 %d\n", errno));
-                close(fd1[0]);
-                close(fd1[1]);
-                return;         
-        }
-DEBUG(9,("!!!!!!PIPES %d %d %d %d\n", fd1[0], fd1[1], fd2[0], fd2[1]));
-#else
         if (pipe(fd1) || pipe(fd2)) {
                 DEBUG(0,("can't create asyncdns pipes\n"));
                 return;
         }
-#endif /* __OS2__ */
         child_pid = sys_fork();
 

branches/samba-3.3.x/source/printing/print_cups.c

@@ -22 +22 @@
  * JRA. Converted to utf8 pull/push.
  */
+#ifdef __OS2__
+#define pipe(A) os2_pipe(A)
+#endif
 
 #include "includes.h"

branches/samba-3.3.x/source/printing/printing.c

@@ -19 +19 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef __OS2__
+#define pipe(A) os2_pipe(A)
+#endif
 
 #include "includes.h"
@@ -1403 +1406 @@
         DEBUG(3,("start_background_queue: Starting background LPQ thread\n"));
 
-#ifndef __OS2__
         if (pipe(pause_pipe) == -1) {
-#else
-        // on OS2 we have no select() on pipes, so we use socketpair() instead
-        if (socketpair(AF_UNIX, SOCK_STREAM,0, pause_pipe) < 0) {
-#endif
                 DEBUG(5,("start_background_queue: cannot create pipe. %s\n", strerror(errno) ));
                 exit(1);