Reactivate header counters

[lttngtop.git] / src / common.c

diff --git a/src/common.c b/src/common.c
index ad190c918c753b5cace0ccb5d8bf7475bbc01426..c01aee273aae54f3113a6a44ee6a1894bb9c311d 100644 (file)
--- a/src/common.c
+++ b/src/common.c
@@ -17,12 +17,13 @@
 
 #include <babeltrace/ctf/events.h>
 #include <stdlib.h>
+#include <linux/unistd.h>
 #include <string.h>
 #include "common.h"
 
-uint64_t get_cpu_id(struct bt_ctf_event *event)
+uint64_t get_cpu_id(const struct bt_ctf_event *event)
 {
-       struct definition *scope;
+       const struct definition *scope;
        uint64_t cpu_id;
 
        scope = bt_ctf_get_top_level_scope(event, BT_STREAM_PACKET_CONTEXT);
@@ -35,9 +36,9 @@ uint64_t get_cpu_id(struct bt_ctf_event *event)
        return cpu_id;
 }
 
-uint64_t get_context_tid(struct bt_ctf_event *event)
+uint64_t get_context_tid(const struct bt_ctf_event *event)
 {
-       struct definition *scope;
+       const struct definition *scope;
        uint64_t tid;
 
        scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT);
@@ -51,9 +52,9 @@ uint64_t get_context_tid(struct bt_ctf_event *event)
        return tid;
 }
 
-uint64_t get_context_pid(struct bt_ctf_event *event)
+uint64_t get_context_pid(const struct bt_ctf_event *event)
 {
-       struct definition *scope;
+       const struct definition *scope;
        uint64_t pid;
 
        scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT);
@@ -67,9 +68,9 @@ uint64_t get_context_pid(struct bt_ctf_event *event)
        return pid;
 }
 
-uint64_t get_context_ppid(struct bt_ctf_event *event)
+uint64_t get_context_ppid(const struct bt_ctf_event *event)
 {
-       struct definition *scope;
+       const struct definition *scope;
        uint64_t ppid;
 
        scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT);
@@ -83,9 +84,9 @@ uint64_t get_context_ppid(struct bt_ctf_event *event)
        return ppid;
 }
 
-char *get_context_comm(struct bt_ctf_event *event)
+char *get_context_comm(const struct bt_ctf_event *event)
 {
-       struct definition *scope;
+       const struct definition *scope;
        char *comm;
 
        scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT);
@@ -125,8 +126,7 @@ struct processtop* add_proc(struct lttngtop *ctx, int tid, char *comm,
                newproc->tid = tid;
                newproc->birth = timestamp;
                newproc->process_files_table = g_ptr_array_new();
-               newproc->files_history = g_new0(struct file_history, 1);
-               newproc->files_history->next = NULL;
+               newproc->files_history = NULL;
                newproc->totalfileread = 0;
                newproc->totalfilewrite = 0;
                newproc->fileread = 0;
@@ -135,6 +135,9 @@ struct processtop* add_proc(struct lttngtop *ctx, int tid, char *comm,
                newproc->threads = g_ptr_array_new();
                newproc->perf = g_hash_table_new(g_str_hash, g_str_equal);
                g_ptr_array_add(ctx->process_table, newproc);
+
+               ctx->nbnewthreads++;
+               ctx->nbthreads++;
        }
        newproc->comm = strdup(comm);
 
@@ -165,8 +168,11 @@ void death_proc(struct lttngtop *ctx, int tid, char *comm,
 {
        struct processtop *tmp;
        tmp = find_process_tid(ctx, tid, comm);
-       if (tmp && strcmp(tmp->comm, comm) == 0)
+       if (tmp && strcmp(tmp->comm, comm) == 0) {
                tmp->death = timestamp;
+               ctx->nbdeadthreads++;
+               ctx->nbthreads--;
+       }
 }
 
 struct processtop* get_proc(struct lttngtop *ctx, int tid, char *comm,
@@ -287,11 +293,40 @@ void cleanup_processtop()
                        if (tmpf != NULL) {
                                tmpf->read = 0;
                                tmpf->write = 0;
+
+                               if (tmpf->flag == __NR_close)
+                                       g_ptr_array_index(
+                                               tmp->process_files_table, j
+                                       ) = NULL;
                        }
                }
        }
 }
 
+void reset_global_counters()
+{
+       lttngtop.nbnewproc = 0;
+       lttngtop.nbdeadproc = 0;
+       lttngtop.nbnewthreads = 0;
+       lttngtop.nbdeadthreads = 0;
+       lttngtop.nbnewfiles = 0;
+       lttngtop.nbclosedfiles = 0;
+}
+
+void copy_global_counters(struct lttngtop *dst)
+{
+       dst->nbproc = lttngtop.nbproc;
+       dst->nbnewproc = lttngtop.nbnewproc;
+       dst->nbdeadproc = lttngtop.nbdeadproc;
+       dst->nbthreads = lttngtop.nbthreads;
+       dst->nbnewthreads = lttngtop.nbnewthreads;
+       dst->nbdeadthreads = lttngtop.nbdeadthreads;
+       dst->nbfiles = lttngtop.nbfiles;
+       dst->nbnewfiles = lttngtop.nbnewfiles;
+       dst->nbclosedfiles = lttngtop.nbclosedfiles;
+       reset_global_counters();
+}
+
 struct lttngtop* get_copy_lttngtop(unsigned long start, unsigned long end)
 {
        gint i, j;
@@ -304,6 +339,7 @@ struct lttngtop* get_copy_lttngtop(unsigned long start, unsigned long end)
        dst = g_new0(struct lttngtop, 1);
        dst->start = start;
        dst->end = end;
+       copy_global_counters(dst);
        dst->process_table = g_ptr_array_new();
        dst->files_table = g_ptr_array_new();
        dst->cpu_table = g_ptr_array_new();
@@ -320,6 +356,7 @@ struct lttngtop* get_copy_lttngtop(unsigned long start, unsigned long end)
                new->threads = g_ptr_array_new();
                new->comm = strdup(tmp->comm);
                new->process_files_table = g_ptr_array_new();
+               new->files_history = tmp->files_history;
                new->perf = g_hash_table_new(g_str_hash, g_str_equal);
                g_hash_table_foreach(tmp->perf, copy_perf_counter, new->perf);
 
@@ -351,6 +388,7 @@ struct lttngtop* get_copy_lttngtop(unsigned long start, unsigned long end)
                         * files associated with if after the copy
                         */
                        if (tmp->death > 0 && tmp->death < end) {
+                               /* FIXME : close the files before */
                                g_ptr_array_remove(tmp->process_files_table, tmpfile);
                                g_free(tmpfile);
                        }
@@ -362,6 +400,7 @@ struct lttngtop* get_copy_lttngtop(unsigned long start, unsigned long end)
                 * the current process list after the copy
                 */
                if (tmp->death > 0 && tmp->death < end) {
+                       fprintf(stderr, "removing : %ld : %d %s\n", end, tmp->tid, tmp->comm);
                        g_ptr_array_remove(lttngtop.process_table, tmp);
                        /* FIXME : TRUE does not mean clears the object in it */
                        g_ptr_array_free(tmp->threads, TRUE);