Test the viewer detach command
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v2 2/2 Test the viewer detach command
Signed-off-by Julien Desfossez <[email protected]>
--- tests/regression/tools/live/live_test.c | 58 ++++++++++++++++++++++++++++++++- 1 file changed, 57 insertions(+), 1 deletion(-)
tests/regression/tools/live/live_test.c +57 -1
@@ -50,7 +50,7 @@#define LIVE_TIMER 2000000/* Number of TAP tests in this file */ -#define NUM_TESTS 8 +#define NUM_TESTS 11#define mmap_size 524288int ust_consumerd32_fd;
@@ -282,6 +282,53 @@ error:return -1 ; } +int detach_viewer_session (uint64_t id) +{ +struct lttng_viewer_cmd cmd; +struct lttng_viewer_detach_session_response resp; +struct lttng_viewer_detach_session_request rq; +int ret; +ssize_t ret_len; + + cmd.cmd =htobe32 (LTTNG_VIEWER_DETACH_SESSION ); + cmd.data_size =sizeof (rq); + cmd.cmd_version =0 ; + +memset (&rq,0 ,sizeof (rq)); + rq.session_id =htobe64 (id); + + ret_len =lttng_live_send (control_sock, &cmd,sizeof (cmd)); +if (ret_len <0 ) { +fprintf (stderr,"[error] Error sending cmd\n" ); + ret = ret_len; + goto error; + } + + ret_len =lttng_live_send (control_sock, &rq,sizeof (rq)); +if (ret_len <0 ) { +fprintf (stderr,"Error sending attach request\n" ); + ret = ret_len; + goto error; + } + + ret_len =lttng_live_recv (control_sock, &resp,sizeof (resp)); +if (ret_len <0 ) { +fprintf (stderr,"[error] Error receiving detach session reply\n" ); + ret = ret_len; + goto error; + } + +if (be32toh (resp.status) !=LTTNG_VIEWER_DETACH_SESSION_OK ) { +fprintf (stderr,"[error] Error detaching viewer session\n" ); + ret =-1 ; + goto error; + } + ret =0 ; + +error: +return ret; +} +int attach_session (int id) {struct lttng_viewer_cmd cmd;
@@ -656,5 +703,14 @@ int main(int argc, char **argv) first_packet_stream_id, first_packet_offset, first_packet_len); + ret =detach_viewer_session (session_id); +ok (ret ==0 ,"Detach viewer session" ); + + ret =list_sessions (&session_id); +ok (ret >0 ,"List sessions : %d session(s)" , ret); + + ret =attach_session (session_id); +ok (ret >0 ,"Attach to session, %d streams received" , ret); +return exit_status (); }
Signature · 1 line
1.9.1
Re: [LTTNG-TOOLS PATCH v2 1/2] Command to detach a live viewer session
In reply to a message not in the archiveWould you mind rebasing both patches on master? These will not apply on the relayd refactor introduced in 2.7.
Jérémie
Quoted 149 lines · Julien Desfossez
The
LTTNG_VIEWER_DETACH_SESSIONcommand allows the viewer to detach from the session it is currently attached to without requiring it to close the network connection. This allows the relayd to release its reference on the session and eventually clear it if it is destroyed on the consumer.Fixes #853Signed-off-by Julien Desfossez <[email protected]>--- src/bin/lttng-relayd/live.c | 73 +++++++++++++++++++++++++++++++++ src/bin/lttng-relayd/lttng-viewer-abi.h | 18 ++++++++ 2 files changed, 91 insertions(+)src/bin/lttng-relayd/live.c +73
-0@@ -1733,6 +1733,76 @@ end:return ret; } +/* +* Detach a viewer session. +* +* Return 0 on success or else a negative value. +*/ +static +int viewer_detach_session (struct relay_connection *conn) +{ +int ret, found; +struct lttng_viewer_detach_session_response resp; +struct lttng_viewer_detach_session_request request; +struct relay_session *session, *tmp_session; +uint64_t to_close; + +DBG ("Viewer detach session received" ); + +assert (conn); + +health_code_update (); + +/* Receive the request from the connected client. */ + ret =recv_request (conn->sock, &request,sizeof (request)); +if (ret <0 ) { + goto end; + } + to_close =be64toh (request.session_id); + +if (!conn->viewer_session) { + resp.status =htobe32 (LTTNG_VIEWER_DETACH_SESSION_ERR ); + goto send_reply; + } + +health_code_update (); + +memset (&resp,0 ,sizeof (resp)); +DBG ("Cleaning connection of session ID %" PRIu64, to_close); + + found =0 ; +rcu_read_lock (); +cds_list_for_each_entry_safe (session, tmp_session, + &conn->viewer_session->sessions_head, + viewer_session_list) { +if (session->id == to_close) { +DBG ("Cleaning connection of session ID %" PRIu64, session->id); +cleanup_session (conn, session); + found =1 ; +break ; + } + } +rcu_read_unlock (); + +if (!found) { + resp.status =htobe32 (LTTNG_VIEWER_DETACH_SESSION_ERR ); + }else { + resp.status =htobe32 (LTTNG_VIEWER_DETACH_SESSION_OK ); + } + +send_reply: +health_code_update (); + ret =send_response (conn->sock, &resp,sizeof (resp)); +if (ret <0 ) { + goto end; + } +health_code_update (); + ret =0 ; + +end: +return ret; +} +/* * live_relay_unknown_command: send -1 if received unknown command @@ -1797,6 +1867,9 @@ int process_control(struct lttng_viewer_cmd *recv_hdr,case LTTNG_VIEWER_CREATE_SESSION : ret =viewer_create_session (conn);break ; +case LTTNG_VIEWER_DETACH_SESSION : + ret =viewer_detach_session (conn); +break ;default :ERR ("Received unknown viewer command (%u)" ,be32toh (recv_hdr->cmd));live_relay_unknown_command (conn);src/bin/lttng-relayd/lttng-viewer-abi.h +18
-1@@ -48,6 +48,7 @@ enum lttng_viewer_command {LTTNG_VIEWER_GET_METADATA =6 ,LTTNG_VIEWER_GET_NEW_STREAMS =7 ,LTTNG_VIEWER_CREATE_SESSION =8 , + LTTNG_VIEWER_DETACH_SESSION = 9, }; enum lttng_viewer_attach_return_code {@@ -105,6 +106,11 @@ enum lttng_viewer_create_session_return_code { LTTNG_VIEWER_CREATE_SESSION_ERR = 2, }; +enum lttng_viewer_detach_session_return_code { +LTTNG_VIEWER_DETACH_SESSION_OK =1 , +LTTNG_VIEWER_DETACH_SESSION_ERR =2 , +}; +struct lttng_viewer_session {uint64_t id;uint32_t live_timer;@@ -232,4 +238,16 @@ struct lttng_viewer_create_session_response {uint32_t status; } __attribute__((__packed__)); +/* +* LTTNG_VIEWER_DETACH_SESSION payload. +*/ +struct lttng_viewer_detach_session_request { +uint64_t session_id; +} __attribute__((__packed__ )); + +struct lttng_viewer_detach_session_response { +/* enum lttng_viewer_detach_session_return_code */ +uint32_t status; +} __attribute__((__packed__ )); +#endif /* LTTNG_VIEWER_ABI_H */ --1.9.1
Signature · 8 lines
Jérémie Galarneau EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev