X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2FguiControlFlow%2FProcess_List.c;h=f5221394147eb3c7b4071977266942b005c79fd1;hb=1a31868cb394a6b2214965baee974fa3cea927f3;hp=2e416d078352334274cd5d59a426b33746d9ef38;hpb=847b479de75182dfd3f90e4faeefa48c099713ad;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/Process_List.c b/ltt/branches/poly/lttv/modules/guiControlFlow/Process_List.c
index 2e416d07..f5221394 100644
--- a/ltt/branches/poly/lttv/modules/guiControlFlow/Process_List.c
+++ b/ltt/branches/poly/lttv/modules/guiControlFlow/Process_List.c
@@ -8,27 +8,6 @@
  *                       Methods to synchronize process list                 *
  *****************************************************************************/
 
-typedef struct _ProcessInfo {
-	
-	guint pid;
-	LttTime birth;
-
-} ProcessInfo;
-
-
-struct _ProcessList {
-	
-	GtkWidget *Process_List_VC;
-	GtkListStore *Store_M;
-
-	/* A hash table by PID to speed up process position find in the list */
-	GHashTable *Process_Hash;
-	
-	guint Number_Of_Process;
-
-};
-
-
 /* Enumeration of the columns */
 enum
 {
@@ -153,93 +132,6 @@ gint process_sort_func	(	GtkTreeModel *model,
 
 }
 
-void send_test_data(ProcessList *Process_List)
-{
-	guint height;
-	int i;
-	ProcessInfo Process_Info = {10000, 12000, 55600};
-	//ProcessInfo Process_Info = {156, 14000, 55500};
-	GtkTreeRowReference *got_RowRef;
-
-	LttTime birth;
-	birth.tv_sec = 12000;
-	birth.tv_nsec = 55500;
-
-	ProcessList_add(Process_List,
-			1,
-			&birth,
-			&height);
-
-	g_critical("height : %u", height);
-	
-	birth.tv_sec = 14000;
-	birth.tv_nsec = 55500;
-
-	ProcessList_add(Process_List,
-			156,
-			&birth,
-			&height);
-
-	g_critical("height : %u", height);
-
-	birth.tv_sec = 12000;
-	birth.tv_nsec = 55700;
-
-	ProcessList_add(Process_List,
-			10,
-			&birth,
-			&height);
-
-	for(i=0; i<10; i++)
-	{
-		birth.tv_sec = i*12000;
-		birth.tv_nsec = i*55700;
-
-		ProcessList_add(Process_List,
-				i,
-				&birth,
-				&height);
-
-	}
-	g_critical("height : %u", height);
-
-	birth.tv_sec = 12000;
-	birth.tv_nsec = 55600;
-
-	ProcessList_add(Process_List,
-			10,
-			&birth,
-			&height);
-	g_critical("height : %u", height);
-
-	ProcessList_add(Process_List,
-			10000,
-			&birth,
-			&height);
-	g_critical("height : %u", height);
-
-
-	ProcessList_remove( 	Process_List,
-				10000,
-				&birth);
-	
-	if(got_RowRef = 
-		(GtkTreeRowReference*)g_hash_table_lookup(
-					Process_List->Process_Hash,
-					&Process_Info))
-	{
-		g_critical("key found");
-		g_critical("position in the list : %s",
-			gtk_tree_path_to_string (
-			gtk_tree_row_reference_get_path(
-				(GtkTreeRowReference*)got_RowRef)
-			));
-		
-	}
-
-}
-
-
 guint hash_fct(gconstpointer key)
 {
 	return ((ProcessInfo*)key)->pid;
@@ -249,26 +141,26 @@ gboolean equ_fct(gconstpointer a, gconstpointer b)
 {
 	if(((ProcessInfo*)a)->pid != ((ProcessInfo*)b)->pid)
 		return 0;
-	g_critical("compare %u and %u",((ProcessInfo*)a)->pid,((ProcessInfo*)b)->pid);
+//	g_critical("compare %u and %u",((ProcessInfo*)a)->pid,((ProcessInfo*)b)->pid);
 	if(((ProcessInfo*)a)->birth.tv_sec != ((ProcessInfo*)b)->birth.tv_sec)
 		return 0;
-	g_critical("compare %u and %u",((ProcessInfo*)a)->birth.tv_sec,((ProcessInfo*)b)->birth.tv_sec);
+//	g_critical("compare %u and %u",((ProcessInfo*)a)->birth.tv_sec,((ProcessInfo*)b)->birth.tv_sec);
 
 	if(((ProcessInfo*)a)->birth.tv_nsec != ((ProcessInfo*)b)->birth.tv_nsec)
 		return 0;
-	g_critical("compare %u and %u",((ProcessInfo*)a)->birth.tv_nsec,((ProcessInfo*)b)->birth.tv_nsec);
+//	g_critical("compare %u and %u",((ProcessInfo*)a)->birth.tv_nsec,((ProcessInfo*)b)->birth.tv_nsec);
 
 	return 1;
 }
 
-void Destroy_hash_key(gpointer key);
+void destroy_hash_key(gpointer key);
 
-void Destroy_hash_data(gpointer data);
+void destroy_hash_data(gpointer data);
 
 
 
 
-ProcessList *ProcessList_construct(void)
+ProcessList *processlist_construct(void)
 {
 	GtkTreeViewColumn *column;
 	GtkCellRenderer *renderer;
@@ -305,7 +197,7 @@ ProcessList *ProcessList_construct(void)
 	
 	Process_List->Process_Hash = g_hash_table_new_full(
 			hash_fct, equ_fct,
-			Destroy_hash_key, Destroy_hash_data
+			destroy_hash_key, destroy_hash_data
 			);
 	
 	
@@ -359,13 +251,13 @@ ProcessList *ProcessList_construct(void)
 			G_OBJECT(Process_List->Process_List_VC),
 			"Process_List_Data",
 			Process_List,
-			(GDestroyNotify)ProcessList_destroy);
-			
-	send_test_data(Process_List);
+			(GDestroyNotify)processlist_destroy);
 
+	Process_List->Test_Process_Sent = 0;
+	
 	return Process_List;
 }
-void ProcessList_destroy(ProcessList *Process_List)
+void processlist_destroy(ProcessList *Process_List)
 {
 	g_hash_table_destroy(Process_List->Process_Hash);
 	Process_List->Process_Hash = NULL;
@@ -373,7 +265,7 @@ void ProcessList_destroy(ProcessList *Process_List)
 	g_free(Process_List);
 }
 
-GtkWidget *ProcessList_getWidget(ProcessList *Process_List)
+GtkWidget *processlist_get_widget(ProcessList *Process_List)
 {
 	return Process_List->Process_List_VC;
 }
@@ -388,22 +280,22 @@ gint get_cell_height(GtkTreeView *TreeView)
 	GtkCellRenderer *Renderer = g_list_first(Render_List)->data;
 	
 	gtk_tree_view_column_cell_get_size(Column, NULL, NULL, NULL, NULL, &height);
-	g_critical("cell 0 height : %u",height);
+	//g_critical("cell 0 height : %u",height);
 	
 	return height;
 }
 
-void Destroy_hash_key(gpointer key)
+void destroy_hash_key(gpointer key)
 {
 	g_free(key);
 }
 
-void Destroy_hash_data(gpointer data)
+void destroy_hash_data(gpointer data)
 {
 	g_free(data);
 }
 
-int ProcessList_add(	ProcessList *Process_List,
+int processlist_add(	ProcessList *Process_List,
 			guint pid,
 			LttTime *birth,
 			guint *height)
@@ -417,10 +309,10 @@ int ProcessList_add(	ProcessList *Process_List,
 	
 	/* Add a new row to the model */
 	gtk_list_store_append (	Process_List->Store_M, &iter);
-	g_critical ( "iter before : %s", gtk_tree_path_to_string (
-			gtk_tree_model_get_path (
-					GTK_TREE_MODEL(Process_List->Store_M),
-					&iter)));
+	//g_critical ( "iter before : %s", gtk_tree_path_to_string (
+	//		gtk_tree_model_get_path (
+	//				GTK_TREE_MODEL(Process_List->Store_M),
+	//				&iter)));
 	gtk_list_store_set (	Process_List->Store_M, &iter,
 				PROCESS_COLUMN, "name",
 				PID_COLUMN, pid,
@@ -437,10 +329,10 @@ int ProcessList_add(	ProcessList *Process_List,
 				(gpointer)Process_Info,
 				(gpointer)RowRef);
 	
-	g_critical ( "iter after : %s", gtk_tree_path_to_string (
-			gtk_tree_model_get_path (
-					GTK_TREE_MODEL(Process_List->Store_M),
-					&iter)));
+	//g_critical ( "iter after : %s", gtk_tree_path_to_string (
+	//		gtk_tree_model_get_path (
+	//				GTK_TREE_MODEL(Process_List->Store_M),
+	//				&iter)));
 	Process_List->Number_Of_Process++;
 
 	*height = get_cell_height(GTK_TREE_VIEW(Process_List->Process_List_VC))
@@ -451,7 +343,7 @@ int ProcessList_add(	ProcessList *Process_List,
 	
 }
 
-int ProcessList_remove(	ProcessList *Process_List,
+int processlist_remove(	ProcessList *Process_List,
 			guint pid,
 			LttTime *birth)
 {
@@ -489,16 +381,16 @@ int ProcessList_remove(	ProcessList *Process_List,
 }
 
 
-guint ProcessList_get_height(ProcessList *Process_List)
+guint processlist_get_height(ProcessList *Process_List)
 {
 	return get_cell_height(GTK_TREE_VIEW(Process_List->Process_List_VC))
 				* Process_List->Number_Of_Process ;
 }
 
 
-gint ProcessList_get_process_pixels(	ProcessList *Process_List,
+gint processlist_get_process_pixels(	ProcessList *Process_List,
 					guint pid, LttTime *birth,
-					guint *x,
+					guint *y,
 					guint *height)
 {
 	ProcessInfo Process_Info;
@@ -520,7 +412,7 @@ gint ProcessList_get_process_pixels(	ProcessList *Process_List,
 
 	 	*height = get_cell_height(
 				GTK_TREE_VIEW(Process_List->Process_List_VC));
-		*x = *height * path_indices[0];
+		*y = *height * path_indices[0];
 		
 		return 0;	
 	} else {