Changeset 336

Timestamp:

05/30/07 22:04:54 (2 years ago)

Author:

blackhedd

Message:

provisional implementation of EventMachine#popen

Files:

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

version_0/ext/cmain.cpp

@@ -291 +291 @@
-}
-
+
+/**********
+evma_popen
+**********/
+
+extern "C" const char *evma_popen (const char *cmd, const char *mode)
+{
+        if (!EventMachine)
+                throw std::runtime_error ("not initialized");
+        return EventMachine->Popen (cmd, mode);
+}
+
+
+

version_0/ext/ed.h

@@ -227 +227 @@
-};
-
+/********************
+class PipeDescriptor
+********************/
+
+class PipeDescriptor: public EventableDescriptor
+{
+        public:
+                PipeDescriptor (FILE*);
+                virtual ~PipeDescriptor();
+
+                virtual void Read();
+                virtual void Write();
+                virtual void Heartbeat();
+
+                virtual bool SelectForRead();
+                virtual bool SelectForWrite();
+
+        protected:
+                EventMachine_t *MyEventMachine;
+};
+
-
-

version_0/ext/em.cpp

@@ -1034 +1034 @@
-
-
+/*********************
+EventMachine_t::Popen
+*********************/
+
+const char *EventMachine_t::Popen (const char *cmd, const char *mode)
+{
+        #ifdef OS_WIN32
+        throw std::runtime_error ("popen 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;
+
+        FILE *fp = popen (cmd, mode);
+        if (!fp)
+                return NULL;
+
+        // From here, all early returns must pclose the stream.
+
+        // According to the pipe(2) manpage, descriptors returned from pipe have both
+        // CLOEXEC and NONBLOCK clear. Do NOT set CLOEXEC. DO set nonblocking.
+        if (!SetSocketNonblocking (fileno (fp))) {
+                pclose (fp);
+                return NULL;
+        }
+
+        { // Looking good.
+                PipeDescriptor *pd = new PipeDescriptor (fp);
+                if (!pd)
+                        throw std::runtime_error ("unable to allocate pipe");
+                Add (pd);
+                output_binding = pd->GetBinding().c_str();
+        }
+
+        return output_binding;
+        #endif
+}
+
+
+
-//#endif // OS_UNIX
-

version_0/ext/em.h

@@ -71 +71 @@
-                const char *CreateUnixDomainServer (const char*);
-                const char *_OpenFileForWriting (const char*);
+                const char *Popen (const char*, const char*);
-
-                void Add (EventableDescriptor*);

version_0/ext/eventmachine.h

@@ -56 +56 @@
-
-        const char *evma__write_file (const char *filename);
+        const char *evma_popen (const char *cmd, const char *mode);
-
-#if __cplusplus

version_0/ext/rubymain.cpp

@@ -303 +303 @@
-        if (!f || !*f)
-                rb_raise (rb_eRuntimeError, "file not opened");
+        return rb_str_new2 (f);
+}
+
+/**************
+t_invoke_popen
+**************/
+
+static VALUE t_invoke_popen (VALUE self, VALUE cmd, VALUE mode)
+{
+        const char *f = evma_popen (StringValuePtr(cmd), StringValuePtr(mode));
+        if (!f || !*f) {
+                char *err = strerror (errno);
+                char buf[100];
+                memset (buf, 0, sizeof(buf));
+                snprintf (buf, sizeof(buf)-1, "no popen: %s", (err?err:"???"));
+                rb_raise (rb_eRuntimeError, buf);
+        }
-        return rb_str_new2 (f);
-}
@@ -336 +353 @@
-        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);
+        rb_define_module_function (EmModule, "invoke_popen", (VALUE(*)(...))t_invoke_popen, 2);
-
-  // Provisional:

version_0/lib/eventmachine.rb

@@ -816 +816 @@
-  end
-
+  #--
+  #
+  def self::popen cmd, mode="r"
+          EventMachine::invoke_popen cmd, mode
+  end
-
-  private