[ViewVC] Diff of: cvs/libcoro/coro.h

Comparing libcoro/coro.h (file contents):
Revision 1.24 by root, Sun Mar 2 16:10:22 2008 UTC vs.
Revision 1.36 by root, Sat Nov 8 13:53:27 2008 UTC

  *            Use _setjmp instead of setjmp on _XOPEN_SOURCE >= 600.
  * 2007-05-02 Add assembly versions for x86 and amd64 (to avoid reliance
  *            on SIGUSR2 and sigaltstack in Crossfire).
  * 2008-01-21 Disable CFI usage on anything but GNU/Linux.
  * 2008-03-02 Switched to 2-clause BSD license with GPL exception.
+ * 2008-04-04 New (but highly unrecommended) pthreads backend.
+ * 2008-04-24 Reinstate CORO_LOSER (had wrong stack adjustments).
+ * 2008-10-30 Support assembly method on x86 with and without frame pointer.
+ * 2008-11-03 Use a global asm statement for CORO_ASM, idea by pippijn.
+ * 2008-11-05 Hopefully fix misaligned stacks with CORO_ASM/SETJMP.
+ * 2008-11-07 rbp wasn't saved in CORO_ASM on x86_64.
+ *            introduce coro_destroy, which is a nop except for pthreads.
+ *            speed up CORO_PTHREAD. Do no longer leak threads either.
+ *            coro_create now allows one to create source coro_contexts.
+ *            do not rely on makecontext passing a void * correctly.
+ *            try harder to get _setjmp/_longjmp.
+ *            major code cleanup/restructuring.
  */
 #ifndef CORO_H
 #define CORO_H
  * -DCORO_ASM
  *
  *    Handcoded assembly, known to work only on a few architectures/ABI:
  *    ELF Linux x86 && amd64 when gcc is used and optimisation is turned on.
  *
+ * -DCORO_PTHREAD
+ *
+ *    Use the pthread API. You have to provide <pthread.h> and -lpthread.
+ *
  * If you define neither of these symbols, coro.h will try to autodetect
  * the model. This currently works for CORO_LOSER only. For the other
  * alternatives you should check (e.g. using autoconf) and define the
  * following symbols: HAVE_UCONTEXT_H / HAVE_SETJMP_H / HAVE_SIGALTSTACK.
  */
 /*
  * This function creates a new coroutine. Apart from a pointer to an
  * uninitialised coro_context, it expects a pointer to the entry function
  * and the single pointer value that is given to it as argument.
  *
- * Allocating/deallocating the stack is your own responsibility, so there is
+ * Allocating/deallocating the stack is your own responsibility.
- * no coro_destroy function.
+ *
+ * As a special case, if coro, arg, sptr and ssize are all zero,
+ * then an "empty" coro_contetx will be created that is suitable
+ * as an initial source for coro_transfer.
+ *
+ * This function is not reentrant, but putting a mutex around it
+ * will work.
  */
 void coro_create (coro_context *ctx, /* an uninitialised coro_context */
                   coro_func coro,    /* the coroutine code to be executed */
                   void *arg,         /* a single pointer passed to the coro */
                   void *sptr,        /* start of stack area */
 /*
  * The following prototype defines the coroutine switching function. It is
  * usually implemented as a macro, so watch out.
  *
+ * This function is thread-safe and reentrant.
+ */
+#if 0
-void coro_transfer(coro_context *prev, coro_context *next);
+void coro_transfer (coro_context *prev, coro_context *next);
+#endif
+/*
+ * The following prototype defines the coroutine destroy function. It is
+ * usually implemented as a macro, so watch out. It also serves
+ * no purpose unless you want to use the CORO_PTHREAD backend.
- */
+ *
+ * This function is thread-safe and reentrant.
+ */
+#if 0
+void coro_destroy (coro_context *ctx);
+#endif
 /*
  * That was it. No other user-visible functions are implemented here.
  */
 /*****************************************************************************/
 #if !defined(CORO_LOSER) && !defined(CORO_UCONTEXT) \
     && !defined(CORO_SJLJ) && !defined(CORO_LINUX) \
-    && !defined(CORO_IRIX) && !defined(CORO_ASM)
+    && !defined(CORO_IRIX) && !defined(CORO_ASM) \
+    && !defined(CORO_PTHREAD)
 # if defined(WINDOWS)
 #  define CORO_LOSER 1 /* you don't win with windoze */
 # elif defined(__linux) && (defined(__x86) || defined (__amd64))
 #  define CORO_ASM 1
 # elif defined(HAVE_UCONTEXT_H)
 struct coro_context {
   ucontext_t uc;
 };
 # define coro_transfer(p,n) swapcontext (&((p)->uc), &((n)->uc))
+# define coro_destroy(ctx) (void *)(ctx)
 #elif CORO_SJLJ || CORO_LOSER || CORO_LINUX || CORO_IRIX
 # if defined(CORO_LINUX) && !defined(_GNU_SOURCE)
 #  define _GNU_SOURCE /* for linux libc */
 # endif
+# if !CORO_LOSER
+#  include <unistd.h>
+# endif
+/* solaris is hopelessly borked, it expands _XOPEN_UNIX to nothing */
+# if __sun
+#  undef _XOPEN_UNIX
+#  define _XOPEN_UNIX 1
+# endif
 # include <setjmp.h>
 struct coro_context {
+#if _XOPEN_UNIX > 0 || CORO_LOSER
   jmp_buf env;
+#else
+  sigjmp_buf env;
+#endif
 };
-# if CORO_LINUX || (_XOPEN_SOURCE >= 600)
+# if _XOPEN_UNIX > 0
-#  define coro_transfer(p,n) do { if (!_setjmp ((p)->env)) _longjmp ((n)->env, 1); } while (0)
+#  define coro_transfer(p,n) do { if (!  _setjmp ((p)->env   ))   _longjmp ((n)->env, 1); } while (0)
+# elif CORO_LOSER
+#  define coro_transfer(p,n) do { if (!   setjmp ((p)->env   ))    longjmp ((n)->env, 1); } while (0)
 # else
-#  define coro_transfer(p,n) do { if (!setjmp  ((p)->env)) longjmp  ((n)->env, 1); } while (0)
+#  define coro_transfer(p,n) do { if (!sigsetjmp ((p)->env, 0)) siglongjmp ((n)->env, 1); } while (0)
 # endif
+# define coro_destroy(ctx) (void *)(ctx)
 #elif CORO_ASM
 struct coro_context {
-  volatile void **sp;
+  void **sp; /* must be at offset 0 */
 };
-void __attribute__ ((__noinline__, __fastcall__))
+void __attribute__ ((__noinline__, __regparm__(2)))
-     coro_transfer(coro_context *prev, coro_context *next);
+coro_transfer (coro_context *prev, coro_context *next);
-#endif
+# define coro_destroy(ctx) (void *)(ctx)
-#endif
+#elif CORO_PTHREAD
+# include <pthread.h>
+extern pthread_mutex_t coro_mutex;
+struct coro_context {
+  pthread_cond_t cv;
+  pthread_t id;
+};
+void coro_transfer (coro_context *prev, coro_context *next);
+void coro_destroy (coro_context *ctx);
+#endif
+#endif

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing libcoro/coro.h (file contents): Revision 1.24 by root, Sun Mar 2 16:10:22 2008 UTC vs. Revision 1.36 by root, Sat Nov 8 13:53:27 2008 UTC

Diff Legend

Comparing libcoro/coro.h (file contents):
Revision 1.24 by root, Sun Mar 2 16:10:22 2008 UTC vs.
Revision 1.36 by root, Sat Nov 8 13:53:27 2008 UTC