Fix: consumer: use uint64_t for all sessiond_id
A message that is not in the archive (sent off-list or not yet received): 20130628161834.GA21417@Krystal
Ping ? This is still not merged.
Quoted 74 lines · * Mathieu Desnoyers ([email protected]) wrote:
Signed-off-by Mathieu Desnoyers <[email protected]>---
src/common/consumer.c +3
-3@@ -1162,7 +1162,7 @@ struct lttng_consumer_local_data *lttng_consumer_create( struct lttng_consumer_local_data *ctx), int (*recv_channel)(struct lttng_consumer_channel *channel), int (*recv_stream)(struct lttng_consumer_stream *stream), - int (*update_stream)(int stream_key, uint32_t state)) + int (*update_stream)(uint64_t stream_key, uint32_t state)) { int ret;struct lttng_consumer_local_data *ctx;@@ -3074,7 +3074,7 @@ void lttng_consumer_init(void)int consumer_add_relayd_socket (uint64_t net_seq_idx,int sock_type,struct lttng_consumer_local_data *ctx,int sock,struct pollfd *consumer_sockpoll, -struct lttcomm_relayd_sock *relayd_sock,unsigned int sessiond_id) +struct lttcomm_relayd_sock *relayd_sock,uint64_t sessiond_id) {int fd =-1 , ret =-1 , relayd_created =0 ;enum lttng_error_code ret_code =LTTNG_OK ;@@ -3095,7 +3095,7 @@ int consumer_add_relayd_socket(uint64_t net_seq_idx, int sock_type, ret_code =LTTCOMM_CONSUMERD_ENOMEM ; ret = -ENOMEM ; }else { - relayd->sessiond_session_id = (uint64_t ) sessiond_id; + relayd->sessiond_session_id = sessiond_id; relayd_created =1 ; }src/common/consumer.h +3
-3@@ -340,7 +340,7 @@ struct lttng_consumer_local_data {* == 0 (success, FD is left to library) * < 0 (error) */ -int (*on_update_stream)(int sessiond_key,uint32_t state); +int (*on_update_stream)(uint64_t sessiond_key,uint32_t state);enum lttng_consumer_type type;/* socket to communicate errors with sessiond */ int consumer_error_socket;@@ -502,7 +502,7 @@ struct lttng_consumer_local_data *lttng_consumer_create( struct lttng_consumer_local_data *ctx), int (*recv_channel)(struct lttng_consumer_channel *channel), int (*recv_stream)(struct lttng_consumer_stream *stream), - int (*update_stream)(int sessiond_key, uint32_t state)); + int (*update_stream)(uint64_t sessiond_key, uint32_t state));void lttng_consumer_destroy (struct lttng_consumer_local_data *ctx); ssize_t lttng_consumer_on_read_subbuffer_mmap( struct lttng_consumer_local_data *ctx,@@ -528,7 +528,7 @@ int lttng_consumer_on_recv_stream(struct lttng_consumer_stream *stream);int consumer_add_relayd_socket (uint64_t net_seq_idx,int sock_type,struct lttng_consumer_local_data *ctx,int sock,struct pollfd *consumer_sockpoll,struct lttcomm_relayd_sock *relayd_sock, -unsigned int sessiond_id); +uint64_t sessiond_id);void consumer_flag_relayd_for_destroy (struct consumer_relayd_sock_pair *relayd);int consumer_data_pending (uint64_t id);Signature · 9 lines
-- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
Signature · 3 lines
Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com
A message that is not in the archive (sent off-list or not yet received): 20130705233116.GB28784@Krystal
Quoted 1 line · * Mathieu Desnoyers ([email protected]) wrote:
Ping ? This is still not merged.
As a precision: this bugfix applies to both master and stable-2.2.
It's only merged in stable-2.2, but should also be pulled into master.
Thanks,
Mathieu
Quoted 86 lines · * Mathieu Desnoyers ([email protected]) wrote:
Quoted 74 lines
Signed-off-by Mathieu Desnoyers <[email protected]>---
src/common/consumer.c +3
-3@@ -1162,7 +1162,7 @@ struct lttng_consumer_local_data *lttng_consumer_create( struct lttng_consumer_local_data *ctx), int (*recv_channel)(struct lttng_consumer_channel *channel), int (*recv_stream)(struct lttng_consumer_stream *stream), - int (*update_stream)(int stream_key, uint32_t state)) + int (*update_stream)(uint64_t stream_key, uint32_t state)) { int ret;struct lttng_consumer_local_data *ctx;@@ -3074,7 +3074,7 @@ void lttng_consumer_init(void)int consumer_add_relayd_socket (uint64_t net_seq_idx,int sock_type,struct lttng_consumer_local_data *ctx,int sock,struct pollfd *consumer_sockpoll, -struct lttcomm_relayd_sock *relayd_sock,unsigned int sessiond_id) +struct lttcomm_relayd_sock *relayd_sock,uint64_t sessiond_id) {int fd =-1 , ret =-1 , relayd_created =0 ;enum lttng_error_code ret_code =LTTNG_OK ;@@ -3095,7 +3095,7 @@ int consumer_add_relayd_socket(uint64_t net_seq_idx, int sock_type, ret_code =LTTCOMM_CONSUMERD_ENOMEM ; ret = -ENOMEM ; }else { - relayd->sessiond_session_id = (uint64_t ) sessiond_id; + relayd->sessiond_session_id = sessiond_id; relayd_created =1 ; }src/common/consumer.h +3
-3@@ -340,7 +340,7 @@ struct lttng_consumer_local_data {* == 0 (success, FD is left to library) * < 0 (error) */ -int (*on_update_stream)(int sessiond_key,uint32_t state); +int (*on_update_stream)(uint64_t sessiond_key,uint32_t state);enum lttng_consumer_type type;/* socket to communicate errors with sessiond */ int consumer_error_socket;@@ -502,7 +502,7 @@ struct lttng_consumer_local_data *lttng_consumer_create( struct lttng_consumer_local_data *ctx), int (*recv_channel)(struct lttng_consumer_channel *channel), int (*recv_stream)(struct lttng_consumer_stream *stream), - int (*update_stream)(int sessiond_key, uint32_t state)); + int (*update_stream)(uint64_t sessiond_key, uint32_t state));void lttng_consumer_destroy (struct lttng_consumer_local_data *ctx); ssize_t lttng_consumer_on_read_subbuffer_mmap( struct lttng_consumer_local_data *ctx,@@ -528,7 +528,7 @@ int lttng_consumer_on_recv_stream(struct lttng_consumer_stream *stream);int consumer_add_relayd_socket (uint64_t net_seq_idx,int sock_type,struct lttng_consumer_local_data *ctx,int sock,struct pollfd *consumer_sockpoll,struct lttcomm_relayd_sock *relayd_sock, -unsigned int sessiond_id); +uint64_t sessiond_id);void consumer_flag_relayd_for_destroy (struct consumer_relayd_sock_pair *relayd);int consumer_data_pending (uint64_t id);Signature · 9 lines
-- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-devSignature · 8 lines
Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
Signature · 3 lines
Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com
A message that is not in the archive (sent off-list or not yet received): 20130705233351.GC28784@Krystal
I confirmed that this is already in stable-2.2
bcfa3ff
77c5447
98cf381
Mathieu Desnoyers:
Quoted 98 lines · * Mathieu Desnoyers ([email protected]) wrote:
Quoted 1 line
Ping ? This is still not merged.
As a precision: this bugfix applies to both master and stable-2.2.
It's only merged in stable-2.2, but should also be pulled into master.
Thanks,
Mathieu
Quoted 86 lines · * Mathieu Desnoyers ([email protected]) wrote:
Quoted 74 lines
Signed-off-by Mathieu Desnoyers <[email protected]>---
src/common/consumer.c +3
-3@@ -1162,7 +1162,7 @@ struct lttng_consumer_local_data *lttng_consumer_create( struct lttng_consumer_local_data *ctx), int (*recv_channel)(struct lttng_consumer_channel *channel), int (*recv_stream)(struct lttng_consumer_stream *stream), - int (*update_stream)(int stream_key, uint32_t state)) + int (*update_stream)(uint64_t stream_key, uint32_t state)) { int ret;struct lttng_consumer_local_data *ctx;@@ -3074,7 +3074,7 @@ void lttng_consumer_init(void)int consumer_add_relayd_socket (uint64_t net_seq_idx,int sock_type,struct lttng_consumer_local_data *ctx,int sock,struct pollfd *consumer_sockpoll, -struct lttcomm_relayd_sock *relayd_sock,unsigned int sessiond_id) +struct lttcomm_relayd_sock *relayd_sock,uint64_t sessiond_id) {int fd =-1 , ret =-1 , relayd_created =0 ;enum lttng_error_code ret_code =LTTNG_OK ;@@ -3095,7 +3095,7 @@ int consumer_add_relayd_socket(uint64_t net_seq_idx, int sock_type, ret_code =LTTCOMM_CONSUMERD_ENOMEM ; ret = -ENOMEM ; }else { - relayd->sessiond_session_id = (uint64_t ) sessiond_id; + relayd->sessiond_session_id = sessiond_id; relayd_created =1 ; }src/common/consumer.h +3
-3@@ -340,7 +340,7 @@ struct lttng_consumer_local_data {* == 0 (success, FD is left to library) * < 0 (error) */ -int (*on_update_stream)(int sessiond_key,uint32_t state); +int (*on_update_stream)(uint64_t sessiond_key,uint32_t state);enum lttng_consumer_type type;/* socket to communicate errors with sessiond */ int consumer_error_socket;@@ -502,7 +502,7 @@ struct lttng_consumer_local_data *lttng_consumer_create( struct lttng_consumer_local_data *ctx), int (*recv_channel)(struct lttng_consumer_channel *channel), int (*recv_stream)(struct lttng_consumer_stream *stream), - int (*update_stream)(int sessiond_key, uint32_t state)); + int (*update_stream)(uint64_t sessiond_key, uint32_t state));void lttng_consumer_destroy (struct lttng_consumer_local_data *ctx); ssize_t lttng_consumer_on_read_subbuffer_mmap( struct lttng_consumer_local_data *ctx,@@ -528,7 +528,7 @@ int lttng_consumer_on_recv_stream(struct lttng_consumer_stream *stream);int consumer_add_relayd_socket (uint64_t net_seq_idx,int sock_type,struct lttng_consumer_local_data *ctx,int sock,struct pollfd *consumer_sockpoll,struct lttcomm_relayd_sock *relayd_sock, -unsigned int sessiond_id); +uint64_t sessiond_id);void consumer_flag_relayd_for_destroy (struct consumer_relayd_sock_pair *relayd);int consumer_data_pending (uint64_t id);Signature · 9 lines
-- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-devSignature · 8 lines
Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 5 lines · * David Goulet ([email protected]) wrote:
I confirmed that this is already in stable-2.2
bcfa3ff
77c5447
98cf381
as you noticed, it was missing in master, not stable-2.2. For the records, it's now merged as master commit:
commit 30319bcbeabf573068172289850aea0bcfe23abc
Author: Mathieu Desnoyers <[email protected]> Date: Fri Jun 28 12:18:35 2013 -0400
Fix: consumer: use uint64_t for all sessiond_id
Quoted 105 lines
Mathieu Desnoyers:
Quoted 98 lines · * Mathieu Desnoyers ([email protected]) wrote:
Quoted 1 line
Ping ? This is still not merged.
As a precision: this bugfix applies to both master and stable-2.2.
It's only merged in stable-2.2, but should also be pulled into master.
Thanks,
Mathieu
Quoted 86 lines · * Mathieu Desnoyers ([email protected]) wrote:
Quoted 74 lines
Signed-off-by Mathieu Desnoyers <[email protected]>---
src/common/consumer.c +3
-3@@ -1162,7 +1162,7 @@ struct lttng_consumer_local_data *lttng_consumer_create( struct lttng_consumer_local_data *ctx), int (*recv_channel)(struct lttng_consumer_channel *channel), int (*recv_stream)(struct lttng_consumer_stream *stream), - int (*update_stream)(int stream_key, uint32_t state)) + int (*update_stream)(uint64_t stream_key, uint32_t state)) { int ret;struct lttng_consumer_local_data *ctx;@@ -3074,7 +3074,7 @@ void lttng_consumer_init(void)int consumer_add_relayd_socket (uint64_t net_seq_idx,int sock_type,struct lttng_consumer_local_data *ctx,int sock,struct pollfd *consumer_sockpoll, -struct lttcomm_relayd_sock *relayd_sock,unsigned int sessiond_id) +struct lttcomm_relayd_sock *relayd_sock,uint64_t sessiond_id) {int fd =-1 , ret =-1 , relayd_created =0 ;enum lttng_error_code ret_code =LTTNG_OK ;@@ -3095,7 +3095,7 @@ int consumer_add_relayd_socket(uint64_t net_seq_idx, int sock_type, ret_code =LTTCOMM_CONSUMERD_ENOMEM ; ret = -ENOMEM ; }else { - relayd->sessiond_session_id = (uint64_t ) sessiond_id; + relayd->sessiond_session_id = sessiond_id; relayd_created =1 ; }src/common/consumer.h +3
-3@@ -340,7 +340,7 @@ struct lttng_consumer_local_data {* == 0 (success, FD is left to library) * < 0 (error) */ -int (*on_update_stream)(int sessiond_key,uint32_t state); +int (*on_update_stream)(uint64_t sessiond_key,uint32_t state);enum lttng_consumer_type type;/* socket to communicate errors with sessiond */ int consumer_error_socket;@@ -502,7 +502,7 @@ struct lttng_consumer_local_data *lttng_consumer_create( struct lttng_consumer_local_data *ctx), int (*recv_channel)(struct lttng_consumer_channel *channel), int (*recv_stream)(struct lttng_consumer_stream *stream), - int (*update_stream)(int sessiond_key, uint32_t state)); + int (*update_stream)(uint64_t sessiond_key, uint32_t state));void lttng_consumer_destroy (struct lttng_consumer_local_data *ctx); ssize_t lttng_consumer_on_read_subbuffer_mmap( struct lttng_consumer_local_data *ctx,@@ -528,7 +528,7 @@ int lttng_consumer_on_recv_stream(struct lttng_consumer_stream *stream);int consumer_add_relayd_socket (uint64_t net_seq_idx,int sock_type,struct lttng_consumer_local_data *ctx,int sock,struct pollfd *consumer_sockpoll,struct lttcomm_relayd_sock *relayd_sock, -unsigned int sessiond_id); +uint64_t sessiond_id);void consumer_flag_relayd_for_destroy (struct consumer_relayd_sock_pair *relayd);int consumer_data_pending (uint64_t id);Signature · 9 lines
-- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-devSignature · 8 lines
Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
Signature · 3 lines
Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com