rcu_read_lock();
cds_lfht_for_each_entry(ust_app_ht, &iter, app, node) {
- struct lttng_ust_tracepoint_iter iter;
+ struct lttng_ust_tracepoint_iter uiter;
handle = ustctl_tracepoint_list(app->key.sock);
if (handle < 0) {
}
while ((ret = ustctl_tracepoint_list_get(app->key.sock, handle,
- &iter)) != -ENOENT) {
+ &uiter)) != -ENOENT) {
if (count >= nbmem) {
DBG2("Reallocating event list from %zu to %zu entries", nbmem,
2 * nbmem);
goto rcu_error;
}
}
- memcpy(tmp[count].name, iter.name, LTTNG_UST_SYM_NAME_LEN);
- memcpy(tmp[count].loglevel, iter.loglevel, LTTNG_UST_SYM_NAME_LEN);
- tmp[count].loglevel_value = iter.loglevel_value;
+ memcpy(tmp[count].name, uiter.name, LTTNG_UST_SYM_NAME_LEN);
+ memcpy(tmp[count].loglevel, uiter.loglevel, LTTNG_UST_SYM_NAME_LEN);
+ tmp[count].loglevel_value = uiter.loglevel_value;
tmp[count].type = LTTNG_UST_TRACEPOINT;
tmp[count].pid = app->key.pid;
tmp[count].enabled = -1;
/* For every registered applications */
cds_lfht_for_each_entry(ust_app_ht, &iter, app, node) {
+ struct cds_lfht_iter uiter;
+
ua_sess = lookup_session_by_app(usess, app);
if (ua_sess == NULL) {
continue;
/* Get channel */
ua_chan_node = hashtable_lookup(ua_sess->channels,
- (void *)uchan->name, strlen(uchan->name), &iter);
+ (void *)uchan->name, strlen(uchan->name), &uiter);
/* If the session if found for the app, the channel must be there */
assert(ua_chan_node);
struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent)
{
int ret = 0;
- struct cds_lfht_iter iter, uiter;
+ struct cds_lfht_iter iter;
struct cds_lfht_node *ua_chan_node, *ua_event_node;
struct ust_app *app;
struct ust_app_session *ua_sess;
/* For all registered applications */
cds_lfht_for_each_entry(ust_app_ht, &iter, app, node) {
+ struct cds_lfht_iter uiter;
+
ua_sess = lookup_session_by_app(usess, app);
if (ua_sess == NULL) {
/* Next app */
struct ltt_ust_channel *uchan)
{
int ret = 0;
- struct cds_lfht_iter iter, uiter;
+ struct cds_lfht_iter iter;
struct cds_lfht_node *ua_chan_node;
struct ust_app *app;
struct ust_app_session *ua_sess;
/* For all registered applications */
cds_lfht_for_each_entry(ust_app_ht, &iter, app, node) {
+ struct cds_lfht_iter uiter;
+
ua_sess = lookup_session_by_app(usess, app);
/* If ua_sess is NULL, there is a code flow error */
assert(ua_sess);
struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent)
{
int ret = 0;
- struct cds_lfht_iter iter, uiter;
+ struct cds_lfht_iter iter;
struct cds_lfht_node *ua_chan_node, *ua_event_node;
struct ust_app *app;
struct ust_app_session *ua_sess;
/* For all registered applications */
cds_lfht_for_each_entry(ust_app_ht, &iter, app, node) {
+ struct cds_lfht_iter uiter;
+
ua_sess = lookup_session_by_app(usess, app);
/* If ua_sess is NULL, there is a code flow error */
assert(ua_sess);
struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent)
{
int ret = 0;
- struct cds_lfht_iter iter, uiter;
+ struct cds_lfht_iter iter;
struct cds_lfht_node *ua_chan_node;
struct ust_app *app;
struct ust_app_session *ua_sess;
/* For all registered applications */
cds_lfht_for_each_entry(ust_app_ht, &iter, app, node) {
+ struct cds_lfht_iter uiter;
+
ua_sess = lookup_session_by_app(usess, app);
/* If ua_sess is NULL, there is a code flow error */
assert(ua_sess);
goto error_rcu_unlock;
}
- /* Flush all buffers before stopping */
- ret = ustctl_sock_flush_buffer(app->key.sock, ua_sess->metadata->obj);
+ /* This inhibits UST tracing */
+ ret = ustctl_stop_session(app->key.sock, ua_sess->handle);
if (ret < 0) {
- ERR("UST app PID %d metadata flush failed", app->key.pid);
- ERR("Ended with ret %d", ret);
+ ERR("Error stopping tracing for app pid: %d", app->key.pid);
+ goto error_rcu_unlock;
}
+ /* Quiescent wait after stopping trace */
+ ustctl_wait_quiescent(app->key.sock);
+
+ /* Flushing buffers */
cds_lfht_for_each_entry(ua_sess->channels, &iter, ua_chan, node) {
ret = ustctl_sock_flush_buffer(app->key.sock, ua_chan->obj);
if (ret < 0) {
}
}
- /* This inhibits UST tracing */
- ret = ustctl_stop_session(app->key.sock, ua_sess->handle);
+ /* Flush all buffers before stopping */
+ ret = ustctl_sock_flush_buffer(app->key.sock, ua_sess->metadata->obj);
if (ret < 0) {
- ERR("Error stopping tracing for app pid: %d", app->key.pid);
- goto error_rcu_unlock;
+ ERR("UST app PID %d metadata flush failed", app->key.pid);
+ ERR("Ended with ret %d", ret);
}
rcu_read_unlock();
- /* Quiescent wait after stopping trace */
- ustctl_wait_quiescent(app->key.sock);
-
return 0;
error_rcu_unlock:
* ltt ust session.
*/
cds_lfht_for_each_entry(ua_sess->channels, &iter, ua_chan, node) {
+ struct cds_lfht_iter uiter;
+
ret = create_ust_channel(app, ua_sess, ua_chan);
if (ret < 0) {
/* FIXME: Should we quit here or continue... */
}
/* For each events */
- cds_lfht_for_each_entry(ua_chan->events, &iter, ua_event, node) {
+ cds_lfht_for_each_entry(ua_chan->events, &uiter, ua_event, node) {
ret = create_ust_event(app, ua_sess, ua_chan, ua_event);
if (ret < 0) {
/* FIXME: Should we quit here or continue... */
{
int ret = 0;
struct cds_lfht_node *ua_chan_node;
- struct cds_lfht_iter iter, uiter;
+ struct cds_lfht_iter iter;
struct ust_app_channel *ua_chan = NULL;
struct ust_app_session *ua_sess;
struct ust_app *app;
rcu_read_lock();
cds_lfht_for_each_entry(ust_app_ht, &iter, app, node) {
+ struct cds_lfht_iter uiter;
+
ua_sess = lookup_session_by_app(usess, app);
if (ua_sess == NULL) {
continue;
{
int ret = 0;
struct cds_lfht_node *ua_chan_node, *ua_event_node;
- struct cds_lfht_iter iter, uiter;
+ struct cds_lfht_iter iter;
struct ust_app_session *ua_sess;
struct ust_app_event *ua_event;
struct ust_app_channel *ua_chan = NULL;
rcu_read_lock();
cds_lfht_for_each_entry(ust_app_ht, &iter, app, node) {
+ struct cds_lfht_iter uiter;
+
ua_sess = lookup_session_by_app(usess, app);
if (ua_sess == NULL) {
continue;