tracing: Simplify creation and deletion of synthetic events (faacb361) · Commits · 戴 / test

kernel/trace/trace_events_hist.c

+18 −35

Original line number	Original line	Diff line number	Diff line
	@@ -1008,18 +1008,6 @@ struct hist_var_data {
	struct hist_trigger_data *hist_data;		struct hist_trigger_data *hist_data;
	};		};

	static void add_or_delete_synth_event(struct synth_event *event, int delete)
	{
	if (delete)
	free_synth_event(event);
	else {
	if (!find_synth_event(event->name))
	list_add(&event->list, &synth_event_list);
	else
	free_synth_event(event);
	}
	}

	static int create_synth_event(int argc, char **argv)		static int create_synth_event(int argc, char **argv)
	{		{
	struct synth_field field, fields[SYNTH_FIELDS_MAX];		struct synth_field field, fields[SYNTH_FIELDS_MAX];
	@@ -1052,14 +1040,15 @@ static int create_synth_event(int argc, char **argv)
	if (event) {		if (event) {
	if (delete_event) {		if (delete_event) {
	if (event->ref) {		if (event->ref) {
	event = NULL;
	ret = -EBUSY;		ret = -EBUSY;
	goto out;		goto out;
	}		}
			ret = unregister_synth_event(event);
			if (!ret) {
	list_del(&event->list);		list_del(&event->list);
	goto out;		free_synth_event(event);
	}		}
	event = NULL;		} else
	ret = -EEXIST;		ret = -EEXIST;
	goto out;		goto out;
	} else if (delete_event) {		} else if (delete_event) {
	@@ -1100,29 +1089,21 @@ static int create_synth_event(int argc, char **argv)
	event = NULL;		event = NULL;
	goto err;		goto err;
	}		}
	out:
	if (event) {
	if (delete_event) {
	ret = unregister_synth_event(event);
	add_or_delete_synth_event(event, !ret);
	} else {
	ret = register_synth_event(event);		ret = register_synth_event(event);
	add_or_delete_synth_event(event, ret);		if (!ret)
	}		list_add(&event->list, &synth_event_list);
	}		else
			free_synth_event(event);
			out:
	mutex_unlock(&synth_event_mutex);		mutex_unlock(&synth_event_mutex);
	mutex_unlock(&event_mutex);		mutex_unlock(&event_mutex);

	return ret;		return ret;
	err:		err:
	mutex_unlock(&synth_event_mutex);
	mutex_unlock(&event_mutex);

	for (i = 0; i < n_fields; i++)		for (i = 0; i < n_fields; i++)
	free_synth_field(fields[i]);		free_synth_field(fields[i]);
	free_synth_event(event);

	return ret;		goto out;
	}		}

	static int release_all_synth_events(void)		static int release_all_synth_events(void)
	@@ -1141,10 +1122,12 @@ static int release_all_synth_events(void)
	}		}

	list_for_each_entry_safe(event, e, &synth_event_list, list) {		list_for_each_entry_safe(event, e, &synth_event_list, list) {
	list_del(&event->list);

	ret = unregister_synth_event(event);		ret = unregister_synth_event(event);
	add_or_delete_synth_event(event, !ret);		if (!ret) {
			list_del(&event->list);
			free_synth_event(event);
			} else
			break;
	}		}
	mutex_unlock(&synth_event_mutex);		mutex_unlock(&synth_event_mutex);
	mutex_unlock(&event_mutex);		mutex_unlock(&event_mutex);

Admin message