projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Store the relay protocol version in the consumer_output
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
snapshot.c
diff --git
a/src/bin/lttng-sessiond/snapshot.c
b/src/bin/lttng-sessiond/snapshot.c
index 6b1aa8db1085c5edf2c01e404e3ce9387561c17d..3de468a835f496d746cd981a3963e7943e4d0fef 100644
(file)
--- a/
src/bin/lttng-sessiond/snapshot.c
+++ b/
src/bin/lttng-sessiond/snapshot.c
@@
-15,7
+15,7
@@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _
GNU
_SOURCE
+#define _
LGPL
_SOURCE
#include <assert.h>
#include <inttypes.h>
#include <string.h>
#include <assert.h>
#include <inttypes.h>
#include <string.h>
@@
-24,6
+24,7
@@
#include <common/defaults.h>
#include "snapshot.h"
#include <common/defaults.h>
#include "snapshot.h"
+#include "utils.h"
/*
* Return the atomically incremented value of next_output_id.
/*
* Return the atomically incremented value of next_output_id.
@@
-45,10
+46,11
@@
static int output_init(uint64_t max_size, const char *name,
{
int ret = 0, i;
{
int ret = 0, i;
- assert(output);
-
memset(output, 0, sizeof(struct snapshot_output));
memset(output, 0, sizeof(struct snapshot_output));
+ /*
+ * max_size of -1ULL means unset. Set to default (unlimited).
+ */
if (max_size == (uint64_t) -1ULL) {
max_size = 0;
}
if (max_size == (uint64_t) -1ULL) {
max_size = 0;
}
@@
-220,7
+222,7
@@
void snapshot_output_destroy(struct snapshot_output *obj)
if (obj->consumer) {
consumer_output_send_destroy_relayd(obj->consumer);
if (obj->consumer) {
consumer_output_send_destroy_relayd(obj->consumer);
- consumer_
destroy_out
put(obj->consumer);
+ consumer_
output_
put(obj->consumer);
}
free(obj);
}
}
free(obj);
}
@@
-321,4
+323,5
@@
void snapshot_destroy(struct snapshot *obj)
snapshot_output_destroy(output);
}
rcu_read_unlock();
snapshot_output_destroy(output);
}
rcu_read_unlock();
+ ht_cleanup_push(obj->output_ht);
}
}
This page took
0.039294 seconds
and
4
git commands to generate.