projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Add Fedora version macros
[lttng-modules.git]
/
lttng-context.c
diff --git
a/lttng-context.c
b/lttng-context.c
index 933732266e9eb076ff26d0adefa1381a351b6399..544e95f836f6cf3ab90119adae77f32608d200b5 100644
(file)
--- a/
lttng-context.c
+++ b/
lttng-context.c
@@
-95,12
+95,12
@@
struct lttng_ctx_field *lttng_append_context(struct lttng_ctx **ctx_p)
struct lttng_ctx_field *new_fields;
ctx->allocated_fields = max_t(size_t, 1, 2 * ctx->allocated_fields);
struct lttng_ctx_field *new_fields;
ctx->allocated_fields = max_t(size_t, 1, 2 * ctx->allocated_fields);
- new_fields =
k
zalloc(ctx->allocated_fields * sizeof(struct lttng_ctx_field), GFP_KERNEL);
+ new_fields =
lttng_kv
zalloc(ctx->allocated_fields * sizeof(struct lttng_ctx_field), GFP_KERNEL);
if (!new_fields)
return NULL;
if (ctx->fields)
memcpy(new_fields, ctx->fields, sizeof(*ctx->fields) * ctx->nr_fields);
if (!new_fields)
return NULL;
if (ctx->fields)
memcpy(new_fields, ctx->fields, sizeof(*ctx->fields) * ctx->nr_fields);
-
k
free(ctx->fields);
+
lttng_kv
free(ctx->fields);
ctx->fields = new_fields;
}
field = &ctx->fields[ctx->nr_fields];
ctx->fields = new_fields;
}
field = &ctx->fields[ctx->nr_fields];
@@
-144,6
+144,7
@@
void lttng_context_update(struct lttng_ctx *ctx)
case atype_struct:
case atype_array_compound:
case atype_sequence_compound:
case atype_struct:
case atype_array_compound:
case atype_sequence_compound:
+ case atype_variant:
default:
WARN_ON_ONCE(1);
break;
default:
WARN_ON_ONCE(1);
break;
@@
-166,6
+167,7
@@
void lttng_context_update(struct lttng_ctx *ctx)
case atype_struct:
case atype_array_compound:
case atype_sequence_compound:
case atype_struct:
case atype_array_compound:
case atype_sequence_compound:
+ case atype_variant:
default:
WARN_ON_ONCE(1);
break;
default:
WARN_ON_ONCE(1);
break;
@@
-187,6
+189,7
@@
void lttng_context_update(struct lttng_ctx *ctx)
case atype_struct:
case atype_array_compound:
case atype_sequence_compound:
case atype_struct:
case atype_array_compound:
case atype_sequence_compound:
+ case atype_variant:
default:
WARN_ON_ONCE(1);
break;
default:
WARN_ON_ONCE(1);
break;
@@
-199,6
+202,7
@@
void lttng_context_update(struct lttng_ctx *ctx)
case atype_struct:
case atype_array_compound:
case atype_sequence_compound:
case atype_struct:
case atype_array_compound:
case atype_sequence_compound:
+ case atype_variant:
break;
case atype_enum:
break;
case atype_enum:
@@
-236,7
+240,7
@@
void lttng_destroy_context(struct lttng_ctx *ctx)
if (ctx->fields[i].destroy)
ctx->fields[i].destroy(&ctx->fields[i]);
}
if (ctx->fields[i].destroy)
ctx->fields[i].destroy(&ctx->fields[i]);
}
-
k
free(ctx->fields);
+
lttng_kv
free(ctx->fields);
kfree(ctx);
}
kfree(ctx);
}
@@
-296,18
+300,14
@@
int lttng_context_init(void)
if (ret) {
printk(KERN_WARNING "Cannot add context lttng_add_need_reschedule_to_ctx");
}
if (ret) {
printk(KERN_WARNING "Cannot add context lttng_add_need_reschedule_to_ctx");
}
-#if defined(CONFIG_PREEMPT_RT_FULL) || defined(CONFIG_PREEMPT)
ret = lttng_add_preemptible_to_ctx(<tng_static_ctx);
ret = lttng_add_preemptible_to_ctx(<tng_static_ctx);
- if (ret != -ENOSYS) {
+ if (ret
&& ret
!= -ENOSYS) {
printk(KERN_WARNING "Cannot add context lttng_add_preemptible_to_ctx");
}
printk(KERN_WARNING "Cannot add context lttng_add_preemptible_to_ctx");
}
-#endif
-#ifdef CONFIG_PREEMPT_RT_FULL
ret = lttng_add_migratable_to_ctx(<tng_static_ctx);
ret = lttng_add_migratable_to_ctx(<tng_static_ctx);
- if (ret != -ENOSYS) {
+ if (ret
&& ret
!= -ENOSYS) {
printk(KERN_WARNING "Cannot add context lttng_add_migratable_to_ctx");
}
printk(KERN_WARNING "Cannot add context lttng_add_migratable_to_ctx");
}
-#endif
/* TODO: perf counters for filtering */
return 0;
}
/* TODO: perf counters for filtering */
return 0;
}
This page took
0.026547 seconds
and
4
git commands to generate.