Print this page
keith IIa
XXX keith II
*** 43,62 ****
nvlist_t *vac_return;
STAILQ_ENTRY(v8plus_async_call) vac_callq_entry;
} v8plus_async_call_t;
- nvlist_t *v8plus_method_call_direct(void *, const char *, const nvlist_t *);
-
boolean_t
v8plus_in_event_thread(void)
{
return (_v8plus_uv_event_thread == pthread_self() ? B_TRUE : B_FALSE);
}
static void
! v8plus_async_callback(uv_async_t *async, __attribute__((unused)) int status)
{
if (v8plus_in_event_thread() != B_TRUE)
v8plus_panic("async callback called outside of event loop");
for (;;) {
--- 43,60 ----
nvlist_t *vac_return;
STAILQ_ENTRY(v8plus_async_call) vac_callq_entry;
} v8plus_async_call_t;
boolean_t
v8plus_in_event_thread(void)
{
return (_v8plus_uv_event_thread == pthread_self() ? B_TRUE : B_FALSE);
}
static void
! v8plus_async_callback(uv_async_t *async, int status __UNUSED)
{
if (v8plus_in_event_thread() != B_TRUE)
v8plus_panic("async callback called outside of event loop");
for (;;) {
*** 78,97 ****
break;
/*
* Run the queued method:
*/
- if (pthread_mutex_lock(&vac->vac_mtx) != 0)
- v8plus_panic("could not lock async call mutex");
-
if (vac->vac_run == B_TRUE)
v8plus_panic("async call already run");
-
vac->vac_return = v8plus_method_call_direct(vac->vac_cop,
vac->vac_name, vac->vac_lp);
- vac->vac_run = B_TRUE;
if (pthread_cond_broadcast(&vac->vac_cv) != 0)
v8plus_panic("could not signal async call condvar");
if (pthread_mutex_unlock(&vac->vac_mtx) != 0)
v8plus_panic("could not unlock async call mutex");
}
--- 76,93 ----
break;
/*
* Run the queued method:
*/
if (vac->vac_run == B_TRUE)
v8plus_panic("async call already run");
vac->vac_return = v8plus_method_call_direct(vac->vac_cop,
vac->vac_name, vac->vac_lp);
+ if (pthread_mutex_lock(&vac->vac_mtx) != 0)
+ v8plus_panic("could not lock async call mutex");
+ vac->vac_run = B_TRUE;
if (pthread_cond_broadcast(&vac->vac_cv) != 0)
v8plus_panic("could not signal async call condvar");
if (pthread_mutex_unlock(&vac->vac_mtx) != 0)
v8plus_panic("could not unlock async call mutex");
}
*** 115,133 ****
* outside the event loop thread, we push the call arguments onto a
* queue and post to the event loop thread. We then sleep on our
* condition variable until the event loop thread makes the call
* for us and wakes us up.
*/
vac.vac_cop = cop;
vac.vac_name = name;
vac.vac_lp = lp;
if (pthread_mutex_init(&vac.vac_mtx, NULL) != 0)
v8plus_panic("could not init async call mutex");
if (pthread_cond_init(&vac.vac_cv, NULL) != 0)
v8plus_panic("could not init async call condvar");
vac.vac_run = B_FALSE;
- vac.vac_return = NULL;
/*
* Post request to queue:
*/
if (pthread_mutex_lock(&_v8plus_callq_mtx) != 0)
--- 111,129 ----
* outside the event loop thread, we push the call arguments onto a
* queue and post to the event loop thread. We then sleep on our
* condition variable until the event loop thread makes the call
* for us and wakes us up.
*/
+ bzero(&vac, sizeof (vac));
vac.vac_cop = cop;
vac.vac_name = name;
vac.vac_lp = lp;
if (pthread_mutex_init(&vac.vac_mtx, NULL) != 0)
v8plus_panic("could not init async call mutex");
if (pthread_cond_init(&vac.vac_cv, NULL) != 0)
v8plus_panic("could not init async call condvar");
vac.vac_run = B_FALSE;
/*
* Post request to queue:
*/
if (pthread_mutex_lock(&_v8plus_callq_mtx) != 0)
*** 136,162 ****
if (pthread_mutex_unlock(&_v8plus_callq_mtx) != 0)
v8plus_panic("could not unlock async queue mutex");
uv_async_send(&_v8plus_uv_async);
/*
! * Wait for our request to be serviced on the Event Loop thread:
*/
if (pthread_mutex_lock(&vac.vac_mtx) != 0)
v8plus_panic("could not lock async call mutex");
while (vac.vac_run == B_FALSE) {
if (pthread_cond_wait(&vac.vac_cv, &vac.vac_mtx) != 0)
v8plus_panic("could not wait on async call condvar");
}
return (vac.vac_return);
}
/*
* Initialise structures for off-event-loop method calls.
*
! * Note that uv_async_init() must be called inside the libuv Event Loop, so we
* do it here. We also want to record the thread ID of the Event Loop thread
* so as to determine what kind of method calls to make later.
*/
void
v8plus_crossthread_init(void)
--- 132,165 ----
if (pthread_mutex_unlock(&_v8plus_callq_mtx) != 0)
v8plus_panic("could not unlock async queue mutex");
uv_async_send(&_v8plus_uv_async);
/*
! * Wait for our request to be serviced on the event loop thread:
*/
if (pthread_mutex_lock(&vac.vac_mtx) != 0)
v8plus_panic("could not lock async call mutex");
while (vac.vac_run == B_FALSE) {
if (pthread_cond_wait(&vac.vac_cv, &vac.vac_mtx) != 0)
v8plus_panic("could not wait on async call condvar");
}
+ if (pthread_mutex_unlock(&vac.vac_mtx) != 0)
+ v8plus_panic("could not unlock async call mutex");
+
+ if (pthread_cond_destroy(&vac.vac_cv) != 0)
+ v8plus_panic("could not destroy async call condvar");
+ if (pthread_mutex_destroy(&vac.vac_mtx) != 0)
+ v8plus_panic("could not destroy async call mutex");
return (vac.vac_return);
}
/*
* Initialise structures for off-event-loop method calls.
*
! * Note that uv_async_init() must be called inside the libuv event loop, so we
* do it here. We also want to record the thread ID of the Event Loop thread
* so as to determine what kind of method calls to make later.
*/
void
v8plus_crossthread_init(void)