su_wait.h has now OSX CoreFoundation specific event support

darcs-hash:20060927221546-1b897-1558dee5fe85845579c41a5af876438903999de3.gz

libsofia-sip-ua/su/sofia-sip/su_wait.h

@@ -47,13 +47,41 @@
 #if SU_HAVE_POLL
 #include <sys/poll.h>
 #endif
+#if SU_USE_OSX_CF_API
+#include <CoreFoundation/CoreFoundation.h>
+#endif
 
 SOFIA_BEGIN_DECLS
 
 /* ---------------------------------------------------------------------- */
 /* Constants */
 
-#if SU_HAVE_POLL || DOCUMENTATION_ONLY
+#if SU_USE_OSX_CF_API
+#define SU_WAIT_CMP(x, y) \
+ (((x).fd - (y).fd) ? ((x).fd - (y).fd) : ((x).events - (y).events))
+
+/** Incoming data is available on socket. @HI */
+#define SU_WAIT_IN      (POLLIN)
+/** Data can be sent on socket. @HI */
+#define SU_WAIT_OUT     (POLLOUT)
+/** Socket is connected. @HI */
+#define SU_WAIT_CONNECT (POLLOUT)
+/** An error occurred on socket. @HI */
+#define SU_WAIT_ERR     (POLLERR)
+/** The socket connection was closed. @HI */
+#define SU_WAIT_HUP     (POLLHUP)
+/** A listening socket accepted a new connection. @HI */
+#define SU_WAIT_ACCEPT  (POLLIN)
+
+/** No timeout for su_wait(). */
+#define SU_WAIT_FOREVER (-1)
+/** The return value of su_wait() if timeout occurred. */
+#define SU_WAIT_TIMEOUT (-2)
+
+/** Initializer for a wait object. @HI */
+#define SU_WAIT_INIT    { INVALID_SOCKET, 0, 0, NULL }
+
+#elif SU_HAVE_POLL || DOCUMENTATION_ONLY
 /** Compare wait object */
 #define SU_WAIT_CMP(x, y) \
  (((x).fd - (y).fd) ? ((x).fd - (y).fd) : ((x).events - (y).events))
@@ -118,6 +146,17 @@ typedef struct _pollfd {
   short events;     /* requested events */
   short revents;    /* returned events */
 } su_wait_t;
+#elif SU_USE_OSX_CF_API
+/* Use container for both pollfds and CoreFoundation sources */
+/* NOTE! The order is crucial! */
+typedef struct {
+  /* struct pollfd      w_fd[1]; */
+  int fd;
+  short events;
+  short revents;
+
+  CFRunLoopSourceRef w_source;
+} su_wait_t;
 #elif SU_HAVE_BSDSOCK
 typedef struct pollfd su_wait_t;
 #elif SU_HAVE_WINSOCK