- if(context->save==NULL) {
-/* WARNING("**** Yielding to somebody else ****"); */
-/* WARNING("Saving current_context value (%p) to context(%p)->save",current_context,context); */
- context->save = current_context ;
-/* WARNING("current_context becomes context(%p) ",context); */
- current_context = context ;
-/* WARNING("Current position memorized (context->save). Jumping to context (%p)",context); */
- return_value = swapcontext (&(context->save->uc), &(context->uc));
- xbt_assert0((return_value==0),"Context swapping failure");
-/* WARNING("I am (%p). Coming back\n",context); */
+ xbt_context_t self = current_context;
+ DEBUG2("[%p] **** Locking ctx %p ****", self, context);
+ xbt_os_mutex_lock(context->mutex);
+ DEBUG1("[%p] **** Updating current_context ****", self);
+ current_context = context;
+ DEBUG1("[%p] **** Releasing the prisonner ****", self);
+ xbt_os_cond_signal(context->cond);
+ DEBUG3("[%p] **** Going to jail on individual %p/%p ****", self,
+ context->cond, context->mutex);
+ xbt_os_cond_wait(context->cond, context->mutex);
+ DEBUG2("[%p] **** Unlocking individual %p ****", self, context->mutex);
+ xbt_os_mutex_unlock(context->mutex);
+ DEBUG1("[%p] **** Updating current_context ****", self);
+ current_context = self;
+ }
+#else /* use SUSv2 contexts */
+ VOIRP(current_context);
+ if (current_context)
+ VOIRP(current_context->save);
+
+ VOIRP(context);
+
+ if (context)
+ VOIRP(context->save);
+
+ if (context) {
+
+ int return_value = 0;
+
+ if (context->save == NULL) {
+
+ DEBUG1("[%p] **** Yielding to somebody else ****", current_context);
+ DEBUG2("Saving current_context value (%p) to context(%p)->save",
+ current_context, context);
+ context->save = current_context;
+ DEBUG1("current_context becomes context(%p) ", context);
+ current_context = context;
+ DEBUG1
+ ("Current position memorized (context->save). Jumping to context (%p)",
+ context);
+ return_value = swapcontext(&(context->save->uc), &(context->uc));
+ xbt_assert0((return_value == 0), "Context swapping failure");
+ DEBUG1("I am (%p). Coming back\n", context);