Changeset 34989

Timestamp:

08/23/09 21:30:26 (4 years ago)

Author:

kazuho

Message:

return more errors

Files:

• lang/c/picoev/trunk/picoev.h (modified) (3 diffs)

lang/c/picoev/trunk/picoev.h

@@ -17 +17 @@
 #define PICOEV_IS_INITED (picoev.max_fd != 0)  
 #define PICOEV_IS_INITED_AND_FD_IN_RANGE(fd) ((fd) < picoev.max_fd)
-#define PICOEV_NO_MEMORY(p) ((p) != NULL)
 #define PICOEV_TOO_MANY_LOOPS (picoev.num_loops != 0) /* use after ++ */
 #define PICOEV_FD_BELONGS_TO_LOOP(loop, fd) \
@@ -79 +78 @@
   /* initializes picoev */
   PICOEV_INLINE
-  void picoev_init(int max_fd) {
+  int picoev_init(int max_fd) {
     assert(! PICOEV_IS_INITED);
     assert(max_fd > 0);
-    picoev.fds = (picoev_fd*)valloc(sizeof(picoev_fd) * max_fd);
-    assert(PICOEV_NO_MEMORY(picoev.fds));
+    if ((picoev.fds = (picoev_fd*)valloc(sizeof(picoev_fd) * max_fd)) == NULL) {
+      return -1;
+    }
     picoev.max_fd = max_fd;
     picoev.num_loops = 0;
@@ -91 +91 @@
       = PICOEV_RND_UP(picoev.timeout_vec_size, PICOEV_SIMD_BITS)
       / PICOEV_LONG_BITS;
+    return 0;
   }