package/wvstreams/0001-fix-uClibc-compile-getcontext.patch

   1 Fix wvstreams so that it builds with uClibc, which does not have the
   2 getcontext() and setcontext() functions.
   3
   4 Signed-off-by: Simon Dawson <spdawson@gmail.com>
   5
   6 diff -Nurp a/include/wvtask.h b/include/wvtask.h
   7 --- a/include/wvtask.h  2008-07-14 20:11:35.000000000 +0100
   8 +++ b/include/wvtask.h  2012-07-28 12:29:53.559981240 +0100
   9 @@ -28,6 +28,13 @@
  10
  11  #define WVTASK_MAGIC 0x123678
  12
  13 +#undef HAVE_GETCONTEXT
  14 +#ifdef HAVE_GETCONTEXT
  15 +typedef ucontext_t TaskContext;
  16 +#else
  17 +typedef jmp_buf TaskContext;
  18 +#endif
  19 +
  20  class WvTaskMan;
  21
  22  /** Represents a single thread of control. */
  23 @@ -54,8 +61,8 @@ class WvTask
  24      bool running, recycled;
  25
  26      WvTaskMan &man;
  27 -    ucontext_t mystate;        // used for resuming the task
  28 -    ucontext_t func_call, func_return;
  29 +    TaskContext mystate;       // used for resuming the task
  30 +    TaskContext func_call, func_return;
  31
  32      TaskFunc *func;
  33      void *userdata;
  34 @@ -94,13 +101,13 @@ class WvTaskMan
  35      static void call_func(WvTask *task);
  36
  37      static char *stacktop;
  38 -    static ucontext_t stackmaster_task;
  39 +    static TaskContext stackmaster_task;
  40
  41      static WvTask *stack_target;
  42 -    static ucontext_t get_stack_return;
  43 +    static TaskContext get_stack_return;
  44
  45      static WvTask *current_task;
  46 -    static ucontext_t toplevel;
  47 +    static TaskContext toplevel;
  48
  49      WvTaskMan();
  50      virtual ~WvTaskMan();
  51 diff -Nurp a/utils/wvtask.cc b/utils/wvtask.cc
  52 --- a/utils/wvtask.cc   2009-05-13 22:42:52.000000000 +0100
  53 +++ b/utils/wvtask.cc   2012-07-28 12:32:23.855974538 +0100
  54 @@ -60,12 +60,14 @@ int WvTask::taskcount, WvTask::numtasks,
  55  WvTaskMan *WvTaskMan::singleton;
  56  int WvTaskMan::links, WvTaskMan::magic_number;
  57  WvTaskList WvTaskMan::all_tasks, WvTaskMan::free_tasks;
  58 -ucontext_t WvTaskMan::stackmaster_task, WvTaskMan::get_stack_return,
  59 +TaskContext WvTaskMan::stackmaster_task, WvTaskMan::get_stack_return,
  60      WvTaskMan::toplevel;
  61  WvTask *WvTaskMan::current_task, *WvTaskMan::stack_target;
  62  char *WvTaskMan::stacktop;
  63
  64 +#ifdef HAVE_GETCONTEXT
  65  static int context_return;
  66 +#endif
  67
  68
  69  static bool use_shared_stack()
  70 @@ -198,9 +200,13 @@ WvTaskMan::WvTaskMan()
  71
  72      stacktop = (char *)alloca(0);
  73
  74 +#ifdef HAVE_GETCONTEXT
  75      context_return = 0;
  76      assert(getcontext(&get_stack_return) == 0);
  77      if (context_return == 0)
  78 +#else
  79 +    if (setjmp(get_stack_return) == 0)
  80 +#endif
  81      {
  82         // initial setup - start the stackmaster() task (never returns!)
  83         stackmaster();
  84 @@ -257,22 +263,30 @@ int WvTaskMan::run(WvTask &task, int val
  85
  86      WvTask *old_task = current_task;
  87      current_task = &task;
  88 -    ucontext_t *state;
  89 +    TaskContext *state;
  90
  91      if (!old_task)
  92         state = &toplevel; // top-level call (not in an actual task yet)
  93      else
  94         state = &old_task->mystate;
  95
  96 +#ifdef HAVE_GETCONTEXT
  97      context_return = 0;
  98      assert(getcontext(state) == 0);
  99      int newval = context_return;
 100 +#else
 101 +    int newval = setjmp(*state);
 102 +#endif
 103      if (newval == 0)
 104      {
 105         // saved the state, now run the task.
 106 +#ifdef HAVE_GETCONTEXT
 107          context_return = val;
 108          setcontext(&task.mystate);
 109          return -1;
 110 +#else
 111 +        longjmp(task.mystate, val);
 112 +#endif
 113      }
 114      else
 115      {
 116 @@ -317,16 +331,24 @@ int WvTaskMan::yield(int val)
 117                  (long)current_task->stacksize);
 118      }
 119  #endif
 120 -
 121 +
 122 +#ifdef HAVE_GETCONTEXT
 123      context_return = 0;
 124      assert(getcontext(&current_task->mystate) == 0);
 125      int newval = context_return;
 126 +#else
 127 +    int newval = setjmp(current_task->mystate);
 128 +#endif
 129      if (newval == 0)
 130      {
 131         // saved the task state; now yield to the toplevel.
 132 +#ifdef HAVE_GETCONTEXT
 133          context_return = val;
 134          setcontext(&toplevel);
 135          return -1;
 136 +#else
 137 +        longjmp(toplevel, val);
 138 +#endif
 139      }
 140      else
 141      {
 142 @@ -340,9 +362,13 @@ int WvTaskMan::yield(int val)
 143
 144  void WvTaskMan::get_stack(WvTask &task, size_t size)
 145  {
 146 +#ifdef HAVE_GETCONTEXT
 147      context_return = 0;
 148      assert(getcontext(&get_stack_return) == 0);
 149      if (context_return == 0)
 150 +#else
 151 +    if (setjmp(get_stack_return) == 0)
 152 +#endif
 153      {
 154         assert(magic_number == -WVTASK_MAGIC);
 155         assert(task.magic_number == WVTASK_MAGIC);
 156 @@ -358,6 +384,7 @@ void WvTaskMan::get_stack(WvTask &task,
 157              static char *next_stack_addr = NULL;
 158  #endif
 159
 160 +#ifndef HAVE_GETCONTEXT
 161              task.stack = mmap(next_stack_addr, task.stacksize,
 162                  PROT_READ | PROT_WRITE,
 163  #ifndef MACOS
 164 @@ -366,12 +393,17 @@ void WvTaskMan::get_stack(WvTask &task,
 165                  MAP_PRIVATE,
 166  #endif
 167                  -1, 0);
 168 +#endif // !HAVE_GETCONTEXT
 169          }
 170
 171         // initial setup
 172         stack_target = &task;
 173 +#ifdef HAVE_GETCONTEXT
 174         context_return = size/1024 + (size%1024 > 0);
 175         setcontext(&stackmaster_task);
 176 +#else
 177 +       longjmp(stackmaster_task, size/1024 + (size%1024 > 0));
 178 +#endif
 179      }
 180      else
 181      {
 182 @@ -408,9 +440,13 @@ void WvTaskMan::_stackmaster()
 183      {
 184         assert(magic_number == -WVTASK_MAGIC);
 185
 186 +#ifdef HAVE_GETCONTEXT
 187          context_return = 0;
 188          assert(getcontext(&stackmaster_task) == 0);
 189          val = context_return;
 190 +#else
 191 +        val = setjmp(stackmaster_task);
 192 +#endif
 193         if (val == 0)
 194         {
 195             assert(magic_number == -WVTASK_MAGIC);
 196 @@ -418,8 +454,12 @@ void WvTaskMan::_stackmaster()
 197             // just did setjmp; save stackmaster's current state (with
 198             // all current stack allocations) and go back to get_stack
 199             // (or the constructor, if that's what called us)
 200 +#ifdef HAVE_GETCONTEXT
 201              context_return = 1;
 202              setcontext(&get_stack_return);
 203 +#else
 204 +            longjmp(get_stack_return, 1);
 205 +#endif
 206         }
 207         else
 208         {
 209 @@ -462,7 +502,9 @@ void WvTaskMan::call_func(WvTask *task)
 210      task->func(task->userdata);
 211      Dprintf("WvTaskMan: returning from task #%d (%s)\n",
 212             task->tid, (const char *)task->name);
 213 +#ifdef HAVE_GETCONTEXT
 214      context_return = 1;
 215 +#endif
 216  }
 217
 218
 219 @@ -473,9 +515,13 @@ void WvTaskMan::do_task()
 220      assert(task->magic_number == WVTASK_MAGIC);
 221
 222      // back here from longjmp; someone wants stack space.
 223 +#ifdef HAVE_GETCONTEXT
 224      context_return = 0;
 225      assert(getcontext(&task->mystate) == 0);
 226      if (context_return == 0)
 227 +#else
 228 +    if (setjmp(task->mystate) == 0)
 229 +#endif
 230      {
 231         // done the setjmp; that means the target task now has
 232         // a working jmp_buf all set up.  Leave space on the stack
 233 @@ -510,6 +556,7 @@ void WvTaskMan::do_task()
 234                  }
 235                  else
 236                  {
 237 +#ifdef HAVE_GETCONTEXT
 238                      assert(getcontext(&task->func_call) == 0);
 239                      task->func_call.uc_stack.ss_size = task->stacksize;
 240                      task->func_call.uc_stack.ss_sp = task->stack;
 241 @@ -519,11 +566,19 @@ void WvTaskMan::do_task()
 242                              task->tid, (const char *)task->name);
 243                      makecontext(&task->func_call,
 244                              (void (*)(void))call_func, 1, task);
 245 +#else
 246 +                    assert(setjmp(task->func_call) == 0);
 247 +#endif
 248
 249 +#ifdef HAVE_GETCONTEXT
 250                      context_return = 0;
 251                      assert(getcontext(&task->func_return) == 0);
 252                      if (context_return == 0)
 253                          setcontext(&task->func_call);
 254 +#else
 255 +                    if (setjmp(task->func_return) == 0)
 256 +                        longjmp(task->func_call, 0);
 257 +#endif
 258                  }
 259
 260                 // the task's function terminated.
 261 @@ -544,8 +599,12 @@ const void *WvTaskMan::current_top_of_st
 262      if (use_shared_stack() || current_task == NULL)
 263          return __libc_stack_end;
 264      else
 265 +#ifdef HAVE_GETCONTEXT
 266          return (const char *)current_task->stack + current_task->stacksize;
 267  #else
 268 +        return 0;
 269 +#endif
 270 +#else
 271      return 0;
 272  #endif
 273  }