diff --git a/maestro/pool_manager_registry.c b/maestro/pool_manager_registry.c index af22504a0e1f9541b2bc38052a4c92df542f8685..9e5eccf3fcc95b2831a41506108022c5040cbbb5 100644 --- a/maestro/pool_manager_registry.c +++ b/maestro/pool_manager_registry.c @@ -720,7 +720,8 @@ mstro_pm_cdo_registry_declare(mstro_app_id app, }); } else { /* have previous registration for this CDO */ - struct per_app_cdo_entry *per_app_entry = malloc(sizeof(struct per_app_cdo_entry)); + struct per_app_cdo_entry *per_app_entry + = malloc(sizeof(struct per_app_cdo_entry)); if(per_app_entry==NULL) { ERR("Cannot allocate new per-app CDO entry\n"); status=MSTRO_NOMEM; @@ -732,7 +733,7 @@ mstro_pm_cdo_registry_declare(mstro_app_id app, HASH_ADD(hh, regentry->app_to_attributes, app, sizeof(mstro_app_id), per_app_entry); } - DEBUG("CDO %s now has registered by %d applications\n", + DEBUG("CDO %s now has been registered by %d applications\n", cdo_name, HASH_COUNT(regentry->app_to_attributes)); status = MSTRO_OK; BAILOUT_UNLOCK: diff --git a/maestro/subscription_registry.c b/maestro/subscription_registry.c index cb34610d24b8a738ae25ae3859dc5c0d310c942b..2661f81972caaa87a9b3b6b0a42e11da40f72967 100644 --- a/maestro/subscription_registry.c +++ b/maestro/subscription_registry.c @@ -1323,14 +1323,14 @@ event_ack_cb(mstro_event event, void *ctx) uint64_t nr_left = atomic_fetch_sub_explicit(&(ectx->nr_outstanding_acks), 1, memory_order_acquire); - DEBUG("event ack on event %p, ctx %p, nr_left=%" PRIu64 "\n", + DEBUG("event ack on event %p, ctx %p, (pre-) nr_left=%" PRIu64 "\n", event, ectx, nr_left); if(nr_left==1) { /* we were the last ones */ mstro_event event = ectx->continuation; void *result; free(ectx); - DEBUG("Triggering continuation event %p\n", event); + DEBUG("Last outstanding ack, triggering continuation event %p\n", event); mstro_status s = mstro_event_trigger(event, &result); assert(s==MSTRO_OK); }