projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 2.5.7
[lttng-ust.git]
/
liblttng-ust
/
lttng-ust-abi.c
diff --git
a/liblttng-ust/lttng-ust-abi.c
b/liblttng-ust/lttng-ust-abi.c
index a852aaef99752789ee66cb6a017485c8604e43b6..c5cc42b727c107a26d1466cea45227072643aa0c 100644
(file)
--- a/
liblttng-ust/lttng-ust-abi.c
+++ b/
liblttng-ust/lttng-ust-abi.c
@@
-185,6
+185,7
@@
static
void objd_ref(int id)
{
struct lttng_ust_obj *obj = _objd_get(id);
void objd_ref(int id)
{
struct lttng_ust_obj *obj = _objd_get(id);
+ assert(obj != NULL);
obj->u.s.f_count++;
}
obj->u.s.f_count++;
}
@@
-466,8
+467,6
@@
int lttng_abi_map_channel(int session_objd,
chan_name = "channel";
break;
default:
chan_name = "channel";
break;
default:
- transport_name = "<unknown>";
- chan_name = "<unknown>";
ret = -EINVAL;
goto notransport;
}
ret = -EINVAL;
goto notransport;
}
@@
-933,6
+932,8
@@
static const struct lttng_ust_objd_ops lttng_channel_ops = {
* Disable recording for this enabler
* LTTNG_UST_FILTER
* Attach a filter to an enabler.
* Disable recording for this enabler
* LTTNG_UST_FILTER
* Attach a filter to an enabler.
+ * LTTNG_UST_EXCLUSION
+ * Attach exclusions to an enabler.
*/
static
long lttng_enabler_cmd(int objd, unsigned int cmd, unsigned long arg,
*/
static
long lttng_enabler_cmd(int objd, unsigned int cmd, unsigned long arg,
@@
-958,6
+959,11
@@
long lttng_enabler_cmd(int objd, unsigned int cmd, unsigned long arg,
return ret;
return 0;
}
return ret;
return 0;
}
+ case LTTNG_UST_EXCLUSION:
+ {
+ return lttng_enabler_attach_exclusion(enabler,
+ (struct lttng_ust_excluder_node *) arg);
+ }
default:
return -EINVAL;
}
default:
return -EINVAL;
}
@@
-981,6
+987,8
@@
static const struct lttng_ust_objd_ops lttng_enabler_ops = {
void lttng_ust_abi_exit(void)
{
lttng_ust_abi_close_in_progress = 1;
void lttng_ust_abi_exit(void)
{
lttng_ust_abi_close_in_progress = 1;
+ ust_lock_nocheck();
objd_table_destroy();
objd_table_destroy();
+ ust_unlock();
lttng_ust_abi_close_in_progress = 0;
}
lttng_ust_abi_close_in_progress = 0;
}
This page took
0.02588 seconds
and
4
git commands to generate.