X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-events.c;h=6d5e625fc12f1dc5aa0544fab19dd7f0425e117d;hp=6ba6a2e603d01ad3c5a2fffc116b5f006b654870;hb=6633b0dd7ab6ed9a11e496d16f8f14adc84fbf76;hpb=2ae99f0b1ce4b1ae352a7bf179b1f040111afd46 diff --git a/src/bin/lttng-sessiond/notification-thread-events.c b/src/bin/lttng-sessiond/notification-thread-events.c index 6ba6a2e60..6d5e625fc 100644 --- a/src/bin/lttng-sessiond/notification-thread-events.c +++ b/src/bin/lttng-sessiond/notification-thread-events.c @@ -295,7 +295,7 @@ unsigned long lttng_condition_buffer_usage_hash( val = condition->threshold_ratio.value * (double) UINT32_MAX; hash ^= hash_key_u64(&val, lttng_ht_seed); - } else if (condition->threshold_ratio.set) { + } else if (condition->threshold_bytes.set) { uint64_t val; val = condition->threshold_bytes.value; @@ -1014,7 +1014,7 @@ end: * are checked against the channel at that moment. * * If this function returns a non-zero value, it means something is - * fundamentally and the whole subsystem/thread will be torn down. + * fundamentally broken and the whole subsystem/thread will be torn down. * * If a non-fatal error occurs, just set the cmd_result to the appropriate * error code. @@ -1843,10 +1843,6 @@ int client_dispatch_message(struct notification_client *client, if (client->communication.inbound.msg_type == LTTNG_NOTIFICATION_CHANNEL_MESSAGE_TYPE_SUBSCRIBE) { - /* - * FIXME The current state should be evaluated on - * subscription. - */ ret = notification_thread_client_subscribe(client, condition, state, &status); } else {