Changeset 655

Timestamp:

Nov 8, 2011, 1:28:52 PM (14 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: some work to get high-mem working

Location:

trunk/server

Files:

• lib/tevent/tevent_signal.c (modified) (2 diffs)
• source3/lib/os2helper.c (modified) (2 diffs)
• source3/libsmb/clireadwrite.c (modified) (1 diff)

trunk/server/lib/tevent/tevent_signal.c

@@ -31 +31 @@
 #include "tevent_util.h"
 #ifdef __OS2__
-#include <sys/socket.h>
+#define pipe(A) os2_socketpair(A)
 #endif
 
@@ -249 +249 @@
            setup */
         if (ev->pipe_fde == NULL) {
-#ifndef __OS2__
                 if (pipe(ev->pipe_fds) == -1) {
-#else
-                if (socketpair(AF_UNIX, SOCK_STREAM,0, ev->pipe_fds) == -1) {
-#endif
                         talloc_free(se);
                         return NULL;

trunk/server/source3/lib/os2helper.c

@@ -18 +18 @@
 #include <types.h>
 #include <string.h>
+#include <sys/socket.h>
 //YD for tmalloc
 #include <malloc.h>
@@ -156 +157 @@
 }
 */
+// OS/2 specific socketpair() implementation, as it only works in low mem
+int os2_socketpair(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];
+        }
+
+        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

trunk/server/source3/libsmb/clireadwrite.c

@@ -815 +815 @@
 
         writesize = cli_write_max_bufsize(cli, write_mode);
-
+printf("@remove me: writesize %d\n", writesize);
         blocks = (size + (writesize-1)) / writesize;