projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Run clang-format on the whole tree
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
viewer-session.cpp
diff --git
a/src/bin/lttng-relayd/viewer-session.cpp
b/src/bin/lttng-relayd/viewer-session.cpp
index 9bed097ab8cbbbaa7f23a6a04046f0c95a1e37fd..9d067577a04caedcaf6a90af8825365ec1bd9dc3 100644
(file)
--- a/
src/bin/lttng-relayd/viewer-session.cpp
+++ b/
src/bin/lttng-relayd/viewer-session.cpp
@@
-8,21
+8,22
@@
*/
#define _LGPL_SOURCE
*/
#define _LGPL_SOURCE
-#include <common/common.h>
-#include <urcu/rculist.h>
+#include "ctf-trace.hpp"
+#include "lttng-relayd.hpp"
+#include "session.hpp"
+#include "stream.hpp"
+#include "viewer-session.hpp"
+#include "viewer-stream.hpp"
+
+#include <common/common.hpp>
-#include "lttng-relayd.h"
-#include "ctf-trace.h"
-#include "session.h"
-#include "viewer-session.h"
-#include "viewer-stream.h"
-#include "stream.h"
+#include <urcu/rculist.h>
struct relay_viewer_session *viewer_session_create(void)
{
struct relay_viewer_session *vsession;
struct relay_viewer_session *viewer_session_create(void)
{
struct relay_viewer_session *vsession;
- vsession =
(relay_viewer_session *) zmalloc(sizeof(*vsession)
);
+ vsession =
zmalloc<relay_viewer_session>(
);
if (!vsession) {
goto end;
}
if (!vsession) {
goto end;
}
@@
-32,7
+33,7
@@
end:
}
int viewer_session_set_trace_chunk_copy(struct relay_viewer_session *vsession,
}
int viewer_session_set_trace_chunk_copy(struct relay_viewer_session *vsession,
- struct lttng_trace_chunk *relay_session_trace_chunk)
+
struct lttng_trace_chunk *relay_session_trace_chunk)
{
int ret = 0;
struct lttng_trace_chunk *viewer_chunk;
{
int ret = 0;
struct lttng_trace_chunk *viewer_chunk;
@@
-58,12
+59,10
@@
end:
}
/* The existence of session must be guaranteed by the caller. */
}
/* The existence of session must be guaranteed by the caller. */
-enum lttng_viewer_attach_return_code viewer_session_attach(
- struct relay_viewer_session *vsession,
- struct relay_session *session)
+enum lttng_viewer_attach_return_code viewer_session_attach(struct relay_viewer_session *vsession,
+ struct relay_session *session)
{
{
- enum lttng_viewer_attach_return_code viewer_attach_status =
- LTTNG_VIEWER_ATTACH_OK;
+ enum lttng_viewer_attach_return_code viewer_attach_status = LTTNG_VIEWER_ATTACH_OK;
ASSERT_LOCKED(session->lock);
ASSERT_LOCKED(session->lock);
@@
-77,11
+76,9
@@
enum lttng_viewer_attach_return_code viewer_session_attach(
} else {
int ret;
} else {
int ret;
- LTTNG_ASSERT(!vsession->current_trace_chunk);
session->viewer_attached = true;
session->viewer_attached = true;
- ret = viewer_session_set_trace_chunk_copy(vsession,
- session->current_trace_chunk);
+ ret = viewer_session_set_trace_chunk_copy(vsession, session->current_trace_chunk);
if (ret) {
/*
* The live protocol does not define a generic error
if (ret) {
/*
* The live protocol does not define a generic error
@@
-90,7
+87,7
@@
enum lttng_viewer_attach_return_code viewer_session_attach(
* failure as if the session didn't exist anymore.
*/
DBG("Failed to create a viewer trace chunk from the current trace chunk of session \"%s\", returning LTTNG_VIEWER_ATTACH_UNK",
* failure as if the session didn't exist anymore.
*/
DBG("Failed to create a viewer trace chunk from the current trace chunk of session \"%s\", returning LTTNG_VIEWER_ATTACH_UNK",
-
session->session_name);
+ session->session_name);
viewer_attach_status = LTTNG_VIEWER_ATTACH_UNK;
}
}
viewer_attach_status = LTTNG_VIEWER_ATTACH_UNK;
}
}
@@
-98,8
+95,7
@@
enum lttng_viewer_attach_return_code viewer_session_attach(
if (viewer_attach_status == LTTNG_VIEWER_ATTACH_OK) {
pthread_mutex_lock(&vsession->session_list_lock);
/* Ownership is transfered to the list. */
if (viewer_attach_status == LTTNG_VIEWER_ATTACH_OK) {
pthread_mutex_lock(&vsession->session_list_lock);
/* Ownership is transfered to the list. */
- cds_list_add_rcu(&session->viewer_session_node,
- &vsession->session_list);
+ cds_list_add_rcu(&session->viewer_session_node, &vsession->session_list);
pthread_mutex_unlock(&vsession->session_list_lock);
} else {
/* Put our local ref. */
pthread_mutex_unlock(&vsession->session_list_lock);
} else {
/* Put our local ref. */
@@
-111,7
+107,7
@@
end:
/* The existence of session must be guaranteed by the caller. */
static int viewer_session_detach(struct relay_viewer_session *vsession,
/* The existence of session must be guaranteed by the caller. */
static int viewer_session_detach(struct relay_viewer_session *vsession,
- struct relay_session *session)
+
struct relay_session *session)
{
int ret = 0;
{
int ret = 0;
@@
-144,7
+140,7
@@
void viewer_session_destroy(struct relay_viewer_session *vsession)
* Release ownership of all the streams of one session and detach the viewer.
*/
void viewer_session_close_one_session(struct relay_viewer_session *vsession,
* Release ownership of all the streams of one session and detach the viewer.
*/
void viewer_session_close_one_session(struct relay_viewer_session *vsession,
- struct relay_session *session)
+
struct relay_session *session)
{
struct lttng_ht_iter iter;
struct relay_viewer_stream *vstream;
{
struct lttng_ht_iter iter;
struct relay_viewer_stream *vstream;
@@
-153,8
+149,7
@@
void viewer_session_close_one_session(struct relay_viewer_session *vsession,
* TODO: improvement: create more efficient list of
* vstream per session.
*/
* TODO: improvement: create more efficient list of
* vstream per session.
*/
- cds_lfht_for_each_entry(viewer_streams_ht->ht, &iter.iter,
- vstream, stream_n.node) {
+ cds_lfht_for_each_entry (viewer_streams_ht->ht, &iter.iter, vstream, stream_n.node) {
if (!viewer_stream_get(vstream)) {
continue;
}
if (!viewer_stream_get(vstream)) {
continue;
}
@@
-181,8
+176,8
@@
void viewer_session_close(struct relay_viewer_session *vsession)
struct relay_session *session;
rcu_read_lock();
struct relay_session *session;
rcu_read_lock();
- cds_list_for_each_entry_rcu(session,
-
&vsession->session_list, viewer_session_node)
{
+ cds_list_for_each_entry_rcu(session,
&vsession->session_list, viewer_session_node)
+ {
viewer_session_close_one_session(vsession, session);
}
rcu_read_unlock();
viewer_session_close_one_session(vsession, session);
}
rcu_read_unlock();
@@
-192,8
+187,7
@@
void viewer_session_close(struct relay_viewer_session *vsession)
* Check if a connection is attached to a session.
* Return 1 if attached, 0 if not attached, a negative value on error.
*/
* Check if a connection is attached to a session.
* Return 1 if attached, 0 if not attached, a negative value on error.
*/
-int viewer_session_is_attached(struct relay_viewer_session *vsession,
- struct relay_session *session)
+int viewer_session_is_attached(struct relay_viewer_session *vsession, struct relay_session *session)
{
struct relay_session *iter;
int found = 0;
{
struct relay_session *iter;
int found = 0;
@@
-206,9
+200,8
@@
int viewer_session_is_attached(struct relay_viewer_session *vsession,
goto end;
}
rcu_read_lock();
goto end;
}
rcu_read_lock();
- cds_list_for_each_entry_rcu(iter,
- &vsession->session_list,
- viewer_session_node) {
+ cds_list_for_each_entry_rcu(iter, &vsession->session_list, viewer_session_node)
+ {
if (session == iter) {
found = 1;
goto end_rcu_unlock;
if (session == iter) {
found = 1;
goto end_rcu_unlock;
This page took
0.025963 seconds
and
4
git commands to generate.