This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 2e1e06c8c9d9c19a44f7e60f8fb7e6a219cb6308 (commit) via 9ac61f9520b55792fb7b1e4a9f2017fc9225eb69 (commit) via c9cebb949ebc7d482224453483de074bd0bc9241 (commit) via fc530449b754ebe9f3478f4a4569765832614f37 (commit) via 055b110ccf7430bfc0cf793db79790bb9705212b (commit) via 5784d8b4f6b037a04b5d32d734864a2af60d4a34 (commit) via 569b2642fb70caeac542a52cc80b53641ab99aa0 (commit) via a16e1412cdc681e8c07f529e230d4f616e983d3f (commit) via d5385faa8d300ab089f4764516dd2a138d8196f9 (commit) via 8740224ab1d8561b688d1c53405961922511c9b4 (commit) from a5b7b6f7d83a0e7b02abf7fe105d0956749e35af (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2e1e06c8c9d9c19a44f7e60f8fb7e6a219cb6308 Author: Phil Carns <[email protected]> Date: Mon Aug 20 14:10:22 2012 -0400 ae-blocking-parser header warnings commit 9ac61f9520b55792fb7b1e4a9f2017fc9225eb69 Author: Phil Carns <[email protected]> Date: Mon Aug 20 13:58:17 2012 -0400 ae-init warnings commit c9cebb949ebc7d482224453483de074bd0bc9241 Author: Phil Carns <[email protected]> Date: Mon Aug 20 13:57:40 2012 -0400 hints warnings commit fc530449b754ebe9f3478f4a4569765832614f37 Author: Phil Carns <[email protected]> Date: Mon Aug 20 13:53:31 2012 -0400 resource.c warnings commit 055b110ccf7430bfc0cf793db79790bb9705212b Author: Phil Carns <[email protected]> Date: Mon Aug 20 13:52:56 2012 -0400 resourcebuilder warnings commit 5784d8b4f6b037a04b5d32d734864a2af60d4a34 Author: Phil Carns <[email protected]> Date: Mon Aug 20 13:50:59 2012 -0400 fix timer warnings commit 569b2642fb70caeac542a52cc80b53641ab99aa0 Author: Phil Carns <[email protected]> Date: Mon Aug 20 13:48:43 2012 -0400 fix aethread warnings commit a16e1412cdc681e8c07f529e230d4f616e983d3f Author: Phil Carns <[email protected]> Date: Mon Aug 20 13:46:39 2012 -0400 update c-utils submodule to newest version commit d5385faa8d300ab089f4764516dd2a138d8196f9 Author: Phil Carns <[email protected]> Date: Mon Aug 20 13:33:37 2012 -0400 fix warnings commit 8740224ab1d8561b688d1c53405961922511c9b4 Author: Phil Carns <[email protected]> Date: Mon Aug 20 13:33:17 2012 -0400 fix warnings in clang label workaround ----------------------------------------------------------------------- Summary of changes: ae-blocking-parser.h | 3 +-- ae-init.c | 2 ++ hints.c | 6 ++---- hints.h | 2 ++ resource.c | 5 ++--- resources/resourcebuilder/resourcebuilder.c | 5 ++--- resources/thread/aethread.c | 6 +----- resources/timer/timer.c | 5 ----- src/c-utils | 2 +- src/socket/aesocket.ae | 4 +++- 10 files changed, 16 insertions(+), 24 deletions(-) Diff of changes: diff --git a/ae-blocking-parser.h b/ae-blocking-parser.h index 21855a6..6ddfa60 100644 --- a/ae-blocking-parser.h +++ b/ae-blocking-parser.h @@ -208,6 +208,7 @@ fake_label_to_please_clang: \ if(*__ae_state == AE_CTL_CALL_COMPLETE) \ { \ void* foo = &&fake_label_to_please_clang; \ + (void)foo; \ assert(__ae_ctl->gen.state_label); \ goto *__ae_ctl->gen.state_label; \ } @@ -612,8 +613,6 @@ __ae_pbranch_##__pbranch_pos_str##_after: {} \ __fname##_immediate_completion: \ { \ - void (* __ae_local_cb)(void *); \ - AE_MK_DONE_DECLS(); \ AE_MK_END_OF_BLOCKING(__fname, " (IC)"); \ ae_debug_pbranch("ctl_done: bfun ic: %p\n", __ae_ctl); \ ae_ctl_done(&__ae_ctl->gen); \ diff --git a/ae-init.c b/ae-init.c index f1df2e9..8b35bea 100644 --- a/ae-init.c +++ b/ae-init.c @@ -14,6 +14,8 @@ int ae_init (void) /* Call the constructor functions here */ aesop_timer_init_register (); triton_aethread_init_register (); + + return(0); } /* diff --git a/hints.c b/hints.c index 069e43d..5c96bf8 100644 --- a/hints.c +++ b/hints.c @@ -228,7 +228,6 @@ int ae_hints_del(ae_hints_t *hints, const char *key) struct ae_hint_info *info; struct ae_hint_entry *entry, *tmpentry; - int ret; info = ae_hints_get_info_by_key(key); if(!info) @@ -266,7 +265,6 @@ int ae_hints_modify(ae_hints_t * hints, struct ae_hint_info *info; struct ae_hint_entry *entry, *tmpentry; - int ret; info = ae_hints_get_info_by_key(key); if(!info) @@ -384,7 +382,6 @@ int ae_hints_get(ae_hints_t *hints, { struct ae_hint_entry *entry, *tmpentry; struct ae_hint_info *info; - ae_hints_t *p; assert(hints); @@ -544,6 +541,7 @@ done: return ret; } +#if 0 int ae_hints_check(ae_hints_t *hints, int type) { struct ae_hint_entry *entry, *tmpentry; @@ -564,7 +562,6 @@ int ae_hints_check(ae_hints_t *hints, int type) static uint32_t count_transferable_hints(struct ae_hints *h) { uint64_t count = 0; - struct ae_hints_entry *entry, *tmpentry; while(h) { @@ -573,6 +570,7 @@ static uint32_t count_transferable_hints(struct ae_hints *h) } return count; } +#endif /* * Local variables: diff --git a/hints.h b/hints.h index 6497e44..5c8d8c3 100644 --- a/hints.h +++ b/hints.h @@ -110,10 +110,12 @@ int ae_hints_clone(ae_hints_t *oldh, ae_hints_t ** newh); */ int ae_hints_dup(ae_hints_t *oldh, ae_hints_t ** newh); +#if 0 /** * Check that hints hold a value for a particular hint type. */ int ae_hints_check(ae_hints_t *hints, int type); +#endif /** * Initialize members of hint structure. diff --git a/resource.c b/resource.c index e3addcb..7c3efd6 100644 --- a/resource.c +++ b/resource.c @@ -156,7 +156,6 @@ int ae_resource_register_with_data(struct ae_resource *resource, int *newid, void *user_data) { int reindex = -1; - int ret; int i; if(ae_resource_count == 0) @@ -565,8 +564,6 @@ static void timeout_cb(EV_P_ ev_timer *w, int revents) int ae_poll(ae_context_t context, int millisecs) { struct ev_loop* target_loop; - int ret; - int i; ev_timer timeout; int hit_timeout = 0; @@ -1012,6 +1009,8 @@ int ae_resource_cleanup (void) ae_resource_init_register_cleanup (); ev_async_stop (eloop, &eloop_breaker); ev_default_destroy (); + + return(0); } /* diff --git a/resources/resourcebuilder/resourcebuilder.c b/resources/resourcebuilder/resourcebuilder.c index d7f062c..4f22420 100644 --- a/resources/resourcebuilder/resourcebuilder.c +++ b/resources/resourcebuilder/resourcebuilder.c @@ -124,7 +124,7 @@ static int rb_callback (rb_slot_t * slot, int success) return AE_ERR_NOT_FOUND; } - if (status == STATUS_COMPLETED_SUCCESS | status == STATUS_COMPLETED_CANCEL) + if (status == STATUS_COMPLETED_SUCCESS || status == STATUS_COMPLETED_CANCEL) { /* was already completed */ return AE_ERR_INVALID; @@ -136,7 +136,6 @@ static int rb_callback (rb_slot_t * slot, int success) /* some internal checks */ int resource_id; - struct ae_op * op = &slot->op; assert (slot == (rb_slot_t *) intptr2op (ae_id_lookup (slot->op_id, &resource_id))); @@ -181,7 +180,7 @@ void rb_slot_destroy (rb_slot_t * slot) { /* make sure the slot has been properly completed (or cancelled) */ const int status = OPA_load_int (&slot->status); - assert (status == STATUS_COMPLETED_CANCEL | + assert (status == STATUS_COMPLETED_CANCEL || status == STATUS_COMPLETED_SUCCESS); OPA_store_int (&slot->status, STATUS_UNINITIALIZED); } diff --git a/resources/thread/aethread.c b/resources/thread/aethread.c index 1f693a6..2252554 100644 --- a/resources/thread/aethread.c +++ b/resources/thread/aethread.c @@ -165,9 +165,6 @@ ae_define_post(int, aethread_hint, struct aethread_group *group) { struct ae_op *op; struct aethread_op *a_op; - pthread_t tid; - pthread_attr_t attr; - int ret; assert(initialized && group); @@ -198,7 +195,7 @@ ae_define_post(int, aethread_hint, struct aethread_group *group) return AE_SUCCESS; } -static int triton_aethread_poll(ae_context_t context) +static int triton_aethread_poll(ae_context_t context, void *user_data) { return AE_SUCCESS; } @@ -208,7 +205,6 @@ static int triton_aethread_cancel(ae_context_t triton_ctx, ae_op_id_t op_id) int resource_id; struct ae_op *op; struct aethread_op *aop; - ae_context_t ctx; struct aethread_group *group, *tmpgroup; int found = 0; diff --git a/resources/timer/timer.c b/resources/timer/timer.c index adc6147..4e66d4c 100644 --- a/resources/timer/timer.c +++ b/resources/timer/timer.c @@ -54,7 +54,6 @@ static ae_ops_t cancel_oplist; ae_define_post(int, aesop_timer, int millisecs) { struct timeval adjust, now; - int ret; struct timer_op *top; struct ae_op *op; struct ae_op *iter, *safe, *holder; @@ -265,9 +264,6 @@ static void timer_cb(EV_P_ ev_timer *w, int revents) struct timer_op *top; struct timeval now; struct timeval diff; - int did_something = 0; - ae_context_t ctx; - int ret; ev_tstamp tstamp; triton_mutex_lock(&timer_mutex); @@ -285,7 +281,6 @@ static void timer_cb(EV_P_ ev_timer *w, int revents) top = ae_op_entry(gop, struct timer_op, op); triton_mutex_unlock(&timer_mutex); - ctx = gop->ctx; ae_opcache_complete_op(timer_opcache, gop, int, 0); /* setup for next iteration */ triton_mutex_lock(&timer_mutex); diff --git a/src/c-utils b/src/c-utils index 8b480ad..13204b3 160000 --- a/src/c-utils +++ b/src/c-utils @@ -1 +1 @@ -Subproject commit 8b480ad06f857dfecd8aaa809704df97281378c0 +Subproject commit 13204b325870a1f4f9c5317f9d93f2d54c6725c6 diff --git a/src/socket/aesocket.ae b/src/socket/aesocket.ae index 0dd205f..d989b92 100644 --- a/src/socket/aesocket.ae +++ b/src/socket/aesocket.ae @@ -100,6 +100,8 @@ static void * aesocket_thread_main (void * arg) aesocket_check_queue (); ev_loop (socket_ev_loop, EVLOOP_ONESHOT); } + + return(NULL); } int aesocket_init (void) @@ -232,7 +234,7 @@ __blocking int aesocket_ready (int fd, int flags, int * err) rb_slot_destroy (&entry.slot); *err = 0; - return ret; + return(ret); } hooks/post-receive --