[lttng-dev] [PATCH lttng-tools 2.2] Fix: consumer: use uint64_t for all sessiond_id

[Mathieu Desnoyers]

* David Goulet (dgoulet at efficios.com) 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 <mathieu.desnoyers at efficios.com>
Date:   Fri Jun 28 12:18:35 2013 -0400

    Fix: consumer: use uint64_t for all sessiond_id
    
    Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers at efficios.com>


> 
> Mathieu Desnoyers:
> > * Mathieu Desnoyers (mathieu.desnoyers at efficios.com) 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
> > 
> >>
> >> * Mathieu Desnoyers (mathieu.desnoyers at efficios.com) wrote:
> >>> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
> >>> ---
> >>> diff --git a/src/common/consumer.c b/src/common/consumer.c
> >>> index d810de1..a1a99b4 100644
> >>> --- a/src/common/consumer.c
> >>> +++ b/src/common/consumer.c
> >>> @@ -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;
> >>>  		}
> >>>  
> >>> diff --git a/src/common/consumer.h b/src/common/consumer.h
> >>> index 3cfcb87..a5a758b 100644
> >>> --- a/src/common/consumer.h
> >>> +++ b/src/common/consumer.h
> >>> @@ -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);
> >>>
> >>> -- 
> >>> Mathieu Desnoyers
> >>> EfficiOS Inc.
> >>> http://www.efficios.com
> >>>
> >>> _______________________________________________
> >>> lttng-dev mailing list
> >>> lttng-dev at lists.lttng.org
> >>> http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
> >>
> >> -- 
> >> Mathieu Desnoyers
> >> EfficiOS Inc.
> >> http://www.efficios.com
> >>
> >> _______________________________________________
> >> lttng-dev mailing list
> >> lttng-dev at lists.lttng.org
> >> http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
> > 
> 
> _______________________________________________
> lttng-dev mailing list
> lttng-dev at lists.lttng.org
> http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

-- 
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com