Changeset 381

Timestamp:

06/12/07 12:33:40 (2 years ago)

Author:

blackhedd

Message:

converted popen to work with a socketpair instead of a half-duplex pipe. Argument parsing is still not done.

Files:

• version_0/ext/cmain.cpp (modified) (1 diff)
• version_0/ext/ed.cpp (modified) (3 diffs)
• version_0/ext/ed.h (modified) (4 diffs)
• version_0/ext/em.cpp (modified) (2 diffs)
• version_0/ext/em.h (modified) (1 diff)
• version_0/ext/eventmachine.h (modified) (1 diff)
• version_0/ext/pipe.cpp (modified) (5 diffs)
• version_0/ext/rubymain.cpp (modified) (2 diffs)
• version_0/lib/eventmachine.rb (modified) (2 diffs)

version_0/ext/cmain.cpp

@@ -299 +299 @@
-**********/
-
-, const char *mode
-
-
-
-Popen (cmd, mode
+
+
+
+
+Socketpair (cmd
-}
-

version_0/ext/ed.cpp

@@ -1169 +1169 @@
-int ConnectionDescriptor::GetCommInactivityTimeout (int *value)
-{
+        if (value) {
+                *value = InactivityTimeout;
+                return 1;
+        }
+        else {
+                // TODO, extended logging, got bad parameter.
+                return 0;  
+        }
+}
+
+
+/**********************************************
+ConnectionDescriptor::SetCommInactivityTimeout
+**********************************************/
+
+int ConnectionDescriptor::SetCommInactivityTimeout (int *value)
+{
+        int out = 0;
+
+        if (value) {
+                if ((*value==0) || (*value >= 2)) {
+                        // Replace the value and send the old one back to the caller.
+                        int v = *value;
+                        *value = InactivityTimeout;
+                        InactivityTimeout = v;
+                        out = 1;
+                }
+                else {
+                        // TODO, extended logging, got bad value.
+                }
+        }
+        else {
+                // TODO, extended logging, got bad parameter.
+        }
+
+        return out;
+}
+
+/*******************************
+DatagramDescriptor::GetPeername
+*******************************/
+
+bool DatagramDescriptor::GetPeername (struct sockaddr *s)
+{
+        bool ok = false;
+        if (s) {
+                memset (s, 0, sizeof(struct sockaddr));
+                memcpy (s, &ReturnAddress, sizeof(ReturnAddress));
+                ok = true;
+        }
+        return ok;
+}
+
+
+
+/********************************************
+DatagramDescriptor::GetCommInactivityTimeout
+********************************************/
+
+int DatagramDescriptor::GetCommInactivityTimeout (int *value)
+{
-  if (value) {
-    *value = InactivityTimeout;
@@ -1179 +1240 @@
-}
-
-
-
-
-
-
-
+
+
+
+
+
-{
-  int out = 0;
@@ -1207 +1267 @@
-}
-
-/*******************************
-DatagramDescriptor::GetPeername
-*******************************/
-
-bool DatagramDescriptor::GetPeername (struct sockaddr *s)
-{
-        bool ok = false;
-        if (s) {
-                memset (s, 0, sizeof(struct sockaddr));
-                memcpy (s, &ReturnAddress, sizeof(ReturnAddress));
-                ok = true;
-        }
-        return ok;
-}
-
-
-
-/********************************************
-DatagramDescriptor::GetCommInactivityTimeout
-********************************************/
-
-int DatagramDescriptor::GetCommInactivityTimeout (int *value)
-{
-  if (value) {
-    *value = InactivityTimeout;
-    return 1;
-  }
-  else {
-    // TODO, extended logging, got bad parameter.
-    return 0;  
-  }
-}
-
-/********************************************
-DatagramDescriptor::SetCommInactivityTimeout
-********************************************/
-
-int DatagramDescriptor::SetCommInactivityTimeout (int *value)
-{
-  int out = 0;
-
-  if (value) {
-    if ((*value==0) || (*value >= 2)) {
-      // Replace the value and send the old one back to the caller.
-      int v = *value;
-      *value = InactivityTimeout;
-      InactivityTimeout = v;
-      out = 1;
-    }
-    else {
-      // TODO, extended logging, got bad value.
-    }
-  }
-  else {
-    // TODO, extended logging, got bad parameter.
-  }
-
-  return out;
-}
-

version_0/ext/ed.h

@@ -63 +63 @@
-
-                virtual bool GetPeername (struct sockaddr*) {return false;}
+                virtual bool GetSubprocessPid (pid_t*) {return false;}
-
-                virtual void StartTls() {}
@@ -264 +265 @@
-{
-        public:
-
+pid_t, 
-                virtual ~PipeDescriptor();
-
@@ -276 +277 @@
-                int SendOutboundData (const char*, int);
-                virtual int GetOutboundDataSize() {return OutboundDataSize;}
+
+                virtual bool GetSubprocessPid (pid_t*);
-
-        protected:
@@ -295 +298 @@
-                int OutboundDataSize;
-
+                pid_t SubprocessPid;
+
-        private:
-                void _DispatchInboundData (const char *buffer, int size);

version_0/ext/em.cpp

@@ -1296 +1296 @@
-EventMachine_t::Popen
-*********************/
-
+
-const char *EventMachine_t::Popen (const char *cmd, const char *mode)
-{
@@ -1332 +1332 @@
-        #endif
-}
+#endif // OBSOLETE
+
+/**************************
+EventMachine_t::Socketpair
+**************************/
+
+const char *EventMachine_t::Socketpair (const char *cmd)
+{
+        #ifdef OS_WIN32
+        throw std::runtime_error ("socketpair is currently unavailable on this platform");
+        #endif
+
+        // The whole rest of this function is only compiled on Unix systems.
+        // Eventually we need this functionality (or a full-duplex equivalent) on Windows.
+        #ifdef OS_UNIX
+        const char *output_binding = NULL;
+
+        int sv[2];
+        if (socketpair (AF_LOCAL, SOCK_STREAM, 0, sv) < 0)
+                return NULL;
+        // from here, all early returns must close the pair of sockets.
+
+        // Set the socketpair nonblocking. Obviously DON'T set CLOEXEC.
+        if (!SetSocketNonblocking (sv[0]) || !SetSocketNonblocking (sv[1])) {
+                close (sv[0]);
+                close (sv[1]);
+                return NULL;
+        }
+
+        pid_t f = fork();
+        if (f > 0) {
+                close (sv[1]);
+                PipeDescriptor *pd = new PipeDescriptor (fdopen(sv[0], "r+"), f, this);
+                if (!pd)
+                        throw std::runtime_error ("unable to allocate pipe");
+                Add (pd);
+                output_binding = pd->GetBinding().c_str();
+        }
+        else if (f == 0) {
+                close (sv[0]);
+                close (0);
+                dup2 (sv[1], STDIN_FILENO);
+                close (sv[1]);
+                dup2 (STDIN_FILENO, STDOUT_FILENO);
+                execlp ("ls", "ls", "-l", (char*)NULL);
+                exit (-1); // end the child process if the exec doesn't work.
+        }
+        else
+                throw std::runtime_error ("no fork");
+
+        return output_binding;
+        #endif
+}
-
-

version_0/ext/em.h

@@ -72 +72 @@
-                const char *_OpenFileForWriting (const char*);
-                const char *Popen (const char*, const char*);
+                const char *Socketpair (const char*);
-
-                void Add (EventableDescriptor*);

version_0/ext/eventmachine.h

@@ -58 +58 @@
-
-        const char *evma__write_file (const char *filename);
-, const char *mode
+
-
-        int evma_set_rlimit_nofile (int n_files);

version_0/ext/pipe.cpp

@@ -25 +25 @@
-******************************/
-
-
+pid_t subpid, 
-        EventableDescriptor (fileno (fp), parent_em),
-        bReadAttemptedAfterClose (false),
@@ -31 +31 @@
-        InactivityTimeout (0),
-        MyStream (fp),
-
-
-
+
+
+
+
+
+
+
+
-
-/*******************************
@@ -188 +193 @@
-                        OutboundPages.push_front (OutboundPage (buffer, len));
-                }
+                #ifdef HAVE_EPOLL
+                EpollEvent.events = (EPOLLIN | (SelectForWrite() ? EPOLLOUT : 0));
+                assert (MyEventMachine);
+                MyEventMachine->Modify (this);
+                #endif
-        }
-        else {
@@ -243 +253 @@
-
-
-*
+
-PipeDescriptor::SendOutboundData
-********************************/
@@ -262 +272 @@
-        OutboundPages.push_back (OutboundPage (buffer, length));
-        OutboundDataSize += length;
+        #ifdef HAVE_EPOLL
+        EpollEvent.events = (EPOLLIN | EPOLLOUT);
+        assert (MyEventMachine);
+        MyEventMachine->Modify (this);
+        #endif
-        return length;
-}
-
+/********************************
+PipeDescriptor::GetSubprocessPid
+********************************/
+
+bool PipeDescriptor::GetSubprocessPid (pid_t *pid)
+{
+        bool ok = false;
+        if (pid && (SubprocessPid > 0)) {
+                *pid = SubprocessPid;
+                ok = true;
+        }
+        return ok;
+}
+

version_0/ext/rubymain.cpp

@@ -313 +313 @@
-**************/
-
-, VALUE mode
-
-, StringValuePtr(mode)
+
+
+
-        if (!f || !*f) {
-                char *err = strerror (errno);
@@ -399 +399 @@
-        rb_define_module_function (EmModule, "set_timer_quantum", (VALUE(*)(...))t_set_timer_quantum, 1);
-        rb_define_module_function (EmModule, "setuid_string", (VALUE(*)(...))t_setuid_string, 1);
-2
+1
-
-        // Provisional:

version_0/lib/eventmachine.rb

@@ -898 +898 @@
-        #--
-        #
-mode="r", 
+
-                klass = if (handler and handler.is_a?(Class))
-                        handler
@@ -905 +905 @@
-                end
-
-, mode
+
-                c = klass.new s
-                @conns[s] = c