Changeset 698

Timestamp:

Apr 23, 2012, 7:29:26 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: some high-mem workarounds removed

Location:

trunk/server

Files:

• lib/async_req/async_sock.c (modified) (1 diff)
• source3/build.cmd (modified) (4 diffs)
• source3/lib/os2helper.c (modified) (2 diffs)

trunk/server/lib/async_req/async_sock.c

@@ -36 +36 @@
 #define TALLOC_FREE(ctx) do { talloc_free(ctx); ctx=NULL; } while(0)
 #endif
-#ifdef __OS2__
-#define connect(A, B, C) os2_connect(A, B, C)
-#endif
+
 struct async_send_state {
         int fd;

trunk/server/source3/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

trunk/server/source3/lib/os2helper.c

@@ -180 +180 @@
 */
 
-// OS/2 specific pipe implementation, we have to use socketpair as select on filehandle is not working
-// and we have to use local variables to be sure we use low mem, as socketpair doesn't work in high mem
+/* OS/2 specific pipe implementation, we have to use socketpair as select on 
+filehandle is not working. */
 int os2_pipe(int fds[2])
 {
-        int mypair[2];
         int rc = 0;
 
-        rc = socketpair(AF_UNIX, SOCK_STREAM, 0, mypair);
-        if (rc >= 0) {
-                fds[0] = mypair[0];
-                fds[1] = mypair[1];
-        }
-
+        rc = socketpair(AF_UNIX, SOCK_STREAM, 0, fds);
         return rc;
 }
 
+#if 0
 // OS/2 specific connect() implementation, as it only works in low mem
 int os2_connect(int fd, const struct sockaddr *address, int address_len)
@@ -212 +207 @@
         return rc;
 }
+#endif
 
 /* OS/2-specific random functions. these functions used to be based on APR