projects
/
lttngtop.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
displaying closed files
[lttngtop.git]
/
src
/
common.c
diff --git
a/src/common.c
b/src/common.c
index ad190c918c753b5cace0ccb5d8bf7475bbc01426..7c67264ebba1fdc652a1890c82aaee3266260a89 100644
(file)
--- a/
src/common.c
+++ b/
src/common.c
@@
-17,12
+17,13
@@
#include <babeltrace/ctf/events.h>
#include <stdlib.h>
#include <babeltrace/ctf/events.h>
#include <stdlib.h>
+#include <linux/unistd.h>
#include <string.h>
#include "common.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);
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;
}
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);
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;
}
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);
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;
}
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);
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;
}
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);
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->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;
newproc->totalfileread = 0;
newproc->totalfilewrite = 0;
newproc->fileread = 0;
@@
-287,6
+287,11
@@
void cleanup_processtop()
if (tmpf != NULL) {
tmpf->read = 0;
tmpf->write = 0;
if (tmpf != NULL) {
tmpf->read = 0;
tmpf->write = 0;
+
+ if (tmpf->flag == __NR_close)
+ g_ptr_array_index(
+ tmp->process_files_table, j
+ ) = NULL;
}
}
}
}
}
}
@@
-320,6
+325,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->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);
new->perf = g_hash_table_new(g_str_hash, g_str_equal);
g_hash_table_foreach(tmp->perf, copy_perf_counter, new->perf);
This page took
0.025961 seconds
and
4
git commands to generate.