X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon.c;h=7c67264ebba1fdc652a1890c82aaee3266260a89;hb=ceb3a2216fed5f405aa77c358328f71f44ed3303;hp=d9ec95b33281f07628cece74325414109647fac5;hpb=1dec520a9e8e0654fa7fab2310a0191b2836d424;p=lttngtop.git

diff --git a/src/common.c b/src/common.c
index d9ec95b..7c67264 100644
--- a/src/common.c
+++ b/src/common.c
@@ -10,20 +10,20 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- * MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #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);
@@ -36,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);
@@ -52,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);
@@ -68,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);
@@ -84,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);
@@ -126,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;
@@ -288,6 +287,11 @@ 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;
 			}
 		}
 	}
@@ -321,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->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);