Skip to contentSkip to conversation

perf session env: Rename exit method

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Jul 31, 2015 perf events

lore
Share & tools
lore
#0 lore raw
Commit-ID:  4c7de49a2977aa2a0f556c803afbb24848372e7a
Gitweb:     http://git.kernel.org/tip/4c7de49a2977aa2a0f556c803afbb24848372e7a
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Wed, 29 Jul 2015 12:18:24 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Wed, 29 Jul 2015 12:59:03 -0300

perf session env: Rename exit method

The semantic associated in tools/perf/ with foo__delete(instance) is to release all resources referenced by 'instance' members and then release the memory for 'instance' itself.

The perf_session_env__delete() function isn't doing this, it just does the first part, but the space used by 'instance' itself isn't freed, as it is embedded in a larger structure, that will be freed at other stage.

For these cases we se foo__exit(), i.e. the usage is:

void foo__delete(foo)

 {
         if (foo) {
                 foo__exit(foo);
                 free(foo);
         }

}

But when we have something like:

 struct bar {
         struct foo foo;
         . . .

}

Then we can't really call foo__delete(&bar.foo), we must have this instead:

void bar__exit(bar)

 {
         foo__exit(&bar.foo);
         /* free other bar-> resources */

}

void bar__delete(bar)

 {
         if (bar) {
		bar__exit(bar);
                free(bar);
         }

}

So just rename perf_session_env__delete() to perf_session_env__exit().

Cc Adrian Hunter <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc David Ahern <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Kan Liang <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Stephane Eranian <[email protected]>
---
 tools/perf/util/session.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/util/session.c +2 -2
index 2d95747..f51eb54 100644
@@ -170,7 +170,7 @@ static void perf_session__delete_threads(struct perf_session *session)
 	machine__delete_threads(&session->machines.host);
 }
 
-static void perf_session_env__delete(struct perf_session_env *env)
+static void perf_session_env__exit(struct perf_session_env *env)
 {
 	zfree(&env->hostname);
 	zfree(&env->os_release);
@@ -193,7 +193,7 @@ void perf_session__delete(struct perf_session *session)
 	auxtrace_index__free(&session->auxtrace_index);
 	perf_session__destroy_kernel_maps(session);
 	perf_session__delete_threads(session);
-	perf_session_env__delete(&session->header.env);
+	perf_session_env__exit(&session->header.env);
 	machines__exit(&session->machines);
 	if (session->file)
 		perf_data_file__close(session->file);