projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
API cleanup: Remove handle from struct lttng_ust_channel_buffer
[lttng-ust.git]
/
liblttng-ust-java-agent
/
jni
/
common
/
lttng_ust_context.c
diff --git
a/liblttng-ust-java-agent/jni/common/lttng_ust_context.c
b/liblttng-ust-java-agent/jni/common/lttng_ust_context.c
index eeb37ebedda9fd3eb2b4c3a67b355e20d3d0f24d..ae478ba3c407c26ccd015ea9a2232454e763c5c7 100644
(file)
--- a/
liblttng-ust-java-agent/jni/common/lttng_ust_context.c
+++ b/
liblttng-ust-java-agent/jni/common/lttng_ust_context.c
@@
-11,10
+11,10
@@
#include <string.h>
#include <inttypes.h>
#include <lttng/ust-events.h>
#include <string.h>
#include <inttypes.h>
#include <lttng/ust-events.h>
-#include <lttng/ringbuffer-con
fig
.h>
-#include <
lttng/
ust-context-provider.h>
+#include <lttng/ringbuffer-con
text
.h>
+#include <ust-context-provider.h>
-#include "helper.h"
+#include "
ust-
helper.h"
#include "lttng_ust_context.h"
enum lttng_ust_jni_type {
#include "lttng_ust_context.h"
enum lttng_ust_jni_type {
@@
-73,11
+73,11
@@
static struct lttng_ust_jni_ctx_entry *lookup_ctx_by_name(const char *ctx_name)
return NULL;
}
return NULL;
}
-static size_t get_size_cb(struct lttng_ctx_field *field, size_t offset)
+static size_t get_size_cb(struct lttng_
ust_
ctx_field *field, size_t offset)
{
struct lttng_ust_jni_ctx_entry *jctx;
size_t size = 0;
{
struct lttng_ust_jni_ctx_entry *jctx;
size_t size = 0;
- const char *ctx_name = field->event_field
.
name;
+ const char *ctx_name = field->event_field
->
name;
enum lttng_ust_jni_type jni_type;
enum lttng_ust_jni_type jni_type;
@@
-135,12
+135,12
@@
static size_t get_size_cb(struct lttng_ctx_field *field, size_t offset)
}
}
-static void record_cb(struct lttng_ctx_field *field,
+static void record_cb(struct lttng_
ust_
ctx_field *field,
struct lttng_ust_lib_ring_buffer_ctx *ctx,
struct lttng_ust_lib_ring_buffer_ctx *ctx,
- struct lttng_
channel *chan
)
+ struct lttng_
ust_channel_buffer *lttng_chan_buf
)
{
struct lttng_ust_jni_ctx_entry *jctx;
{
struct lttng_ust_jni_ctx_entry *jctx;
- const char *ctx_name = field->event_field
.
name;
+ const char *ctx_name = field->event_field
->
name;
enum lttng_ust_jni_type jni_type;
char sel_char;
enum lttng_ust_jni_type jni_type;
char sel_char;
@@
-155,7
+155,7
@@
static void record_cb(struct lttng_ctx_field *field,
case JNI_TYPE_NULL:
sel_char = LTTNG_UST_DYNAMIC_TYPE_NONE;
lib_ring_buffer_align_ctx(ctx, lttng_alignof(char));
case JNI_TYPE_NULL:
sel_char = LTTNG_UST_DYNAMIC_TYPE_NONE;
lib_ring_buffer_align_ctx(ctx, lttng_alignof(char));
-
chan
->ops->event_write(ctx, &sel_char, sizeof(sel_char));
+
lttng_chan_buf
->ops->event_write(ctx, &sel_char, sizeof(sel_char));
break;
case JNI_TYPE_INTEGER:
{
break;
case JNI_TYPE_INTEGER:
{
@@
-163,9
+163,9
@@
static void record_cb(struct lttng_ctx_field *field,
sel_char = LTTNG_UST_DYNAMIC_TYPE_S32;
lib_ring_buffer_align_ctx(ctx, lttng_alignof(char));
sel_char = LTTNG_UST_DYNAMIC_TYPE_S32;
lib_ring_buffer_align_ctx(ctx, lttng_alignof(char));
-
chan
->ops->event_write(ctx, &sel_char, sizeof(sel_char));
+
lttng_chan_buf
->ops->event_write(ctx, &sel_char, sizeof(sel_char));
lib_ring_buffer_align_ctx(ctx, lttng_alignof(v));
lib_ring_buffer_align_ctx(ctx, lttng_alignof(v));
-
chan
->ops->event_write(ctx, &v, sizeof(v));
+
lttng_chan_buf
->ops->event_write(ctx, &v, sizeof(v));
break;
}
case JNI_TYPE_LONG:
break;
}
case JNI_TYPE_LONG:
@@
-174,9
+174,9
@@
static void record_cb(struct lttng_ctx_field *field,
sel_char = LTTNG_UST_DYNAMIC_TYPE_S64;
lib_ring_buffer_align_ctx(ctx, lttng_alignof(char));
sel_char = LTTNG_UST_DYNAMIC_TYPE_S64;
lib_ring_buffer_align_ctx(ctx, lttng_alignof(char));
-
chan
->ops->event_write(ctx, &sel_char, sizeof(sel_char));
+
lttng_chan_buf
->ops->event_write(ctx, &sel_char, sizeof(sel_char));
lib_ring_buffer_align_ctx(ctx, lttng_alignof(v));
lib_ring_buffer_align_ctx(ctx, lttng_alignof(v));
-
chan
->ops->event_write(ctx, &v, sizeof(v));
+
lttng_chan_buf
->ops->event_write(ctx, &v, sizeof(v));
break;
}
case JNI_TYPE_DOUBLE:
break;
}
case JNI_TYPE_DOUBLE:
@@
-185,9
+185,9
@@
static void record_cb(struct lttng_ctx_field *field,
sel_char = LTTNG_UST_DYNAMIC_TYPE_DOUBLE;
lib_ring_buffer_align_ctx(ctx, lttng_alignof(char));
sel_char = LTTNG_UST_DYNAMIC_TYPE_DOUBLE;
lib_ring_buffer_align_ctx(ctx, lttng_alignof(char));
-
chan
->ops->event_write(ctx, &sel_char, sizeof(sel_char));
+
lttng_chan_buf
->ops->event_write(ctx, &sel_char, sizeof(sel_char));
lib_ring_buffer_align_ctx(ctx, lttng_alignof(v));
lib_ring_buffer_align_ctx(ctx, lttng_alignof(v));
-
chan
->ops->event_write(ctx, &v, sizeof(v));
+
lttng_chan_buf
->ops->event_write(ctx, &v, sizeof(v));
break;
}
case JNI_TYPE_FLOAT:
break;
}
case JNI_TYPE_FLOAT:
@@
-196,9
+196,9
@@
static void record_cb(struct lttng_ctx_field *field,
sel_char = LTTNG_UST_DYNAMIC_TYPE_FLOAT;
lib_ring_buffer_align_ctx(ctx, lttng_alignof(char));
sel_char = LTTNG_UST_DYNAMIC_TYPE_FLOAT;
lib_ring_buffer_align_ctx(ctx, lttng_alignof(char));
-
chan
->ops->event_write(ctx, &sel_char, sizeof(sel_char));
+
lttng_chan_buf
->ops->event_write(ctx, &sel_char, sizeof(sel_char));
lib_ring_buffer_align_ctx(ctx, lttng_alignof(v));
lib_ring_buffer_align_ctx(ctx, lttng_alignof(v));
-
chan
->ops->event_write(ctx, &v, sizeof(v));
+
lttng_chan_buf
->ops->event_write(ctx, &v, sizeof(v));
break;
}
case JNI_TYPE_SHORT:
break;
}
case JNI_TYPE_SHORT:
@@
-207,9
+207,9
@@
static void record_cb(struct lttng_ctx_field *field,
sel_char = LTTNG_UST_DYNAMIC_TYPE_S16;
lib_ring_buffer_align_ctx(ctx, lttng_alignof(char));
sel_char = LTTNG_UST_DYNAMIC_TYPE_S16;
lib_ring_buffer_align_ctx(ctx, lttng_alignof(char));
-
chan
->ops->event_write(ctx, &sel_char, sizeof(sel_char));
+
lttng_chan_buf
->ops->event_write(ctx, &sel_char, sizeof(sel_char));
lib_ring_buffer_align_ctx(ctx, lttng_alignof(v));
lib_ring_buffer_align_ctx(ctx, lttng_alignof(v));
-
chan
->ops->event_write(ctx, &v, sizeof(v));
+
lttng_chan_buf
->ops->event_write(ctx, &v, sizeof(v));
break;
}
case JNI_TYPE_BYTE:
break;
}
case JNI_TYPE_BYTE:
@@
-218,9
+218,9
@@
static void record_cb(struct lttng_ctx_field *field,
sel_char = LTTNG_UST_DYNAMIC_TYPE_S8;
lib_ring_buffer_align_ctx(ctx, lttng_alignof(char));
sel_char = LTTNG_UST_DYNAMIC_TYPE_S8;
lib_ring_buffer_align_ctx(ctx, lttng_alignof(char));
-
chan
->ops->event_write(ctx, &sel_char, sizeof(sel_char));
+
lttng_chan_buf
->ops->event_write(ctx, &sel_char, sizeof(sel_char));
lib_ring_buffer_align_ctx(ctx, lttng_alignof(v));
lib_ring_buffer_align_ctx(ctx, lttng_alignof(v));
-
chan
->ops->event_write(ctx, &v, sizeof(v));
+
lttng_chan_buf
->ops->event_write(ctx, &v, sizeof(v));
break;
}
case JNI_TYPE_BOOLEAN:
break;
}
case JNI_TYPE_BOOLEAN:
@@
-229,9
+229,9
@@
static void record_cb(struct lttng_ctx_field *field,
sel_char = LTTNG_UST_DYNAMIC_TYPE_S8;
lib_ring_buffer_align_ctx(ctx, lttng_alignof(char));
sel_char = LTTNG_UST_DYNAMIC_TYPE_S8;
lib_ring_buffer_align_ctx(ctx, lttng_alignof(char));
-
chan
->ops->event_write(ctx, &sel_char, sizeof(sel_char));
+
lttng_chan_buf
->ops->event_write(ctx, &sel_char, sizeof(sel_char));
lib_ring_buffer_align_ctx(ctx, lttng_alignof(v));
lib_ring_buffer_align_ctx(ctx, lttng_alignof(v));
-
chan
->ops->event_write(ctx, &v, sizeof(v));
+
lttng_chan_buf
->ops->event_write(ctx, &v, sizeof(v));
break;
}
case JNI_TYPE_STRING:
break;
}
case JNI_TYPE_STRING:
@@
-245,9
+245,9
@@
static void record_cb(struct lttng_ctx_field *field,
sel_char = LTTNG_UST_DYNAMIC_TYPE_NONE;
}
lib_ring_buffer_align_ctx(ctx, lttng_alignof(char));
sel_char = LTTNG_UST_DYNAMIC_TYPE_NONE;
}
lib_ring_buffer_align_ctx(ctx, lttng_alignof(char));
-
chan
->ops->event_write(ctx, &sel_char, sizeof(sel_char));
+
lttng_chan_buf
->ops->event_write(ctx, &sel_char, sizeof(sel_char));
if (str) {
if (str) {
-
chan
->ops->event_write(ctx, str, strlen(str) + 1);
+
lttng_chan_buf
->ops->event_write(ctx, str, strlen(str) + 1);
}
break;
}
}
break;
}
@@
-256,11
+256,11
@@
static void record_cb(struct lttng_ctx_field *field,
}
}
}
}
-static void get_value_cb(struct lttng_ctx_field *field,
- struct lttng_ctx_value *value)
+static void get_value_cb(struct lttng_
ust_
ctx_field *field,
+ struct lttng_
ust_
ctx_value *value)
{
struct lttng_ust_jni_ctx_entry *jctx;
{
struct lttng_ust_jni_ctx_entry *jctx;
- const char *ctx_name = field->event_field
.
name;
+ const char *ctx_name = field->event_field
->
name;
enum lttng_ust_jni_type jni_type;
jctx = lookup_ctx_by_name(ctx_name);
enum lttng_ust_jni_type jni_type;
jctx = lookup_ctx_by_name(ctx_name);
@@
-354,6
+354,7
@@
JNIEXPORT jlong JNICALL Java_org_lttng_ust_agent_context_LttngContextApi_registe
if (!provider) {
goto error_provider;
}
if (!provider) {
goto error_provider;
}
+ provider->struct_size = sizeof(*provider);
provider->name = provider_name_cstr;
provider->get_size = get_size_cb;
provider->record = record_cb;
provider->name = provider_name_cstr;
provider->get_size = get_size_cb;
provider->record = record_cb;
This page took
0.026339 seconds
and
4
git commands to generate.