Merge pull request #4 from ace411/develop

v0.1.0 changes

Author: ace411

README.md

@@ -55,7 +55,7 @@ class Mrloop
     callable $callback,
   ): void
   public tcpServer(int $port, callable $callback): void
-  public writev(int $fd, string $message): void
+  public writev(int|resource $fd, string $message): void
   public static parseHttpRequest(string $request, int $headerlimit = 100): iterable
   public static parseHttpResponse(string $response, int $headerlimit = 100): iterable
   public addTimer(float $interval, callable $callback): void
@@ -290,14 +290,14 @@ The example above will produce output similar to that in the snippet to follow.
 ### `Mrloop::writev`
 
 ```php
-public Mrloop::writev(int $fd, string $contents): void
+public Mrloop::writev(int|resource $fd, string $contents): void
 ```
 
 Performs vectorized non-blocking write operation on a specified file descriptor.
 
 **Parameter(s)**
 
-- **fd** (integer) - The file descriptor to write to.
+- **fd** (integer|resource) - The file descriptor to write to.
 - **contents** (string) - The arbitrary contents to write.
 
 **Return value(s)**

mrloop_arginfo.h

@@ -51,7 +51,7 @@ ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Mrloop_writev, 0, 0, 2)
-ZEND_ARG_TYPE_INFO(0, fd, IS_LONG, 0)
+ZEND_ARG_TYPE_INFO(0, fd, IS_LONG | IS_RESOURCE, 0)
 ZEND_ARG_TYPE_INFO(0, contents, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 

src/loop.c

@@ -549,32 +549,7 @@ static void php_mrloop_add_read_stream(INTERNAL_FUNCTION_PARAMETERS)
   this = PHP_MRLOOP_OBJ(obj);
 
   // convert resource to PHP stream
-  if ((stream = (php_stream *)zend_fetch_resource_ex(res, NULL, php_file_le_stream())))
-  {
-    // extract file descriptor from resource stream
-    if (php_stream_cast(stream, PHP_STREAM_AS_FD | PHP_STREAM_CAST_INTERNAL, (void *)&fd, 1) == FAILURE || fd < 0)
-    {
-      PHP_MRLOOP_THROW("Passed resource without file descriptor");
-      RETURN_NULL();
-
-      close(fd);
-
-      return;
-    }
-  }
-
-  // set non-blocking mode
-  if (fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) | O_NONBLOCK) < 0)
-  {
-    close(fd);
-
-    char *error = strerror(errno);
-    PHP_MRLOOP_THROW(error);
-
-    mr_stop(this->loop);
-
-    return;
-  }
+  PHP_STREAM_TO_FD(stream, res, fd);
 
   fnbytes = (size_t)(nbytes_null == true ? DEFAULT_STREAM_BUFF_LEN : nbytes);
 
@@ -618,30 +593,7 @@ static void php_mrloop_add_write_stream(INTERNAL_FUNCTION_PARAMETERS)
 
   this = PHP_MRLOOP_OBJ(obj);
 
-  if ((stream = (php_stream *)zend_fetch_resource_ex(res, NULL, php_file_le_stream())))
-  {
-    if (php_stream_cast(stream, PHP_STREAM_AS_FD | PHP_STREAM_CAST_INTERNAL, (void *)&fd, 1) == FAILURE || fd < 0)
-    {
-      PHP_MRLOOP_THROW("Passed resource without file descriptor");
-      RETURN_NULL();
-
-      close(fd);
-
-      return;
-    }
-  }
-
-  if (fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) | O_NONBLOCK) < 0)
-  {
-    close(fd);
-
-    char *error = strerror(errno);
-    PHP_MRLOOP_THROW(error);
-
-    mr_stop(this->loop);
-
-    return;
-  }
+  PHP_STREAM_TO_FD(stream, res, fd);
 
   nbytes = ZSTR_LEN(contents);
   iov = emalloc(sizeof(php_iovec_t));
@@ -662,28 +614,44 @@ static void php_mrloop_add_write_stream(INTERNAL_FUNCTION_PARAMETERS)
 }
 static void php_mrloop_writev(INTERNAL_FUNCTION_PARAMETERS)
 {
-  zend_long fd;
   zend_string *contents;
   php_iovec_t iov;
   php_mrloop_t *this;
-  zval *obj;
+  zval *obj, *res;
   size_t nbytes;
+  php_stream *stream;
+  int fd;
 
   obj = getThis();
+  fd = -1;
 
   ZEND_PARSE_PARAMETERS_START(2, 2)
-  Z_PARAM_LONG(fd)
+  Z_PARAM_ZVAL(res)
   Z_PARAM_STR(contents)
   ZEND_PARSE_PARAMETERS_END();
 
   this = PHP_MRLOOP_OBJ(obj);
 
-  if (fcntl((int)fd, F_GETFD) < 0)
+  if (Z_TYPE_P(res) == IS_RESOURCE)
   {
-    PHP_MRLOOP_THROW("Detected invalid file descriptor");
-    mr_stop(this->loop);
+    PHP_STREAM_TO_FD(stream, res, fd);
+  }
+  else if (Z_TYPE_P(res) == IS_LONG)
+  {
+    fd = Z_LVAL_P(res);
 
-    return;
+    if (fcntl(fd, F_GETFD) < 0)
+    {
+      PHP_MRLOOP_THROW("Detected invalid file descriptor");
+      mr_stop(this->loop);
+
+      return;
+    }
+  }
+  else
+  {
+    PHP_MRLOOP_THROW("Detected invalid file descriptor");
+    RETURN_NULL();
   }
 
   nbytes = ZSTR_LEN(contents);

src/loop.h

@@ -176,4 +176,23 @@ zend_class_entry *php_mrloop_ce, *php_mrloop_exception_ce;
     GC_ADDREF(mrloop_cb->fci.object);                                           \
   }
 
+/* extract file descriptor from PHP stream */
+#define PHP_STREAM_TO_FD(fd_stream, fd_resource, fd)                           \
+  if ((fd_stream = (php_stream *)zend_fetch_resource_ex(                       \
+           fd_resource, NULL, php_file_le_stream()))) {                        \
+    if (php_stream_cast(fd_stream,                                             \
+                        PHP_STREAM_AS_FD | PHP_STREAM_CAST_INTERNAL,           \
+                        (void *)&fd, 1) == FAILURE ||                          \
+        fd < 0) {                                                              \
+      PHP_MRLOOP_THROW("Passed resource without file descriptor");             \
+      RETURN_NULL();                                                           \
+    }                                                                          \
+  }                                                                            \
+  if (fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) | O_NONBLOCK) < 0) {            \
+    close(fd);                                                                 \
+    char *error = strerror(errno);                                             \
+    PHP_MRLOOP_THROW(error);                                                   \
+    mr_stop(this->loop);                                                       \
+  }
+
 #endif