src: rename internal types following coding conventions

src/top/starpu_top.c

@@ -27,7 +27,7 @@
 #include <pthread.h>
 #include <common/timing.h>
 
-extern struct starpu_top_message_queue*  starpu_top_mt;
+extern struct _starpu_top_message_queue*  _starpu_top_mt;
 int starpu_top = 0;
 int starpu_top_debug_on = 0;
 unsigned int starpu_top_data_cpt = 0;
@@ -105,7 +105,7 @@ static void starpu_top_send_devices_info()
 {
 	char* message=(char *)malloc(5*sizeof(char));
 	snprintf(message,5,"DEV\n");
-	starpu_top_message_add(starpu_top_mt,message);
+	_starpu_top_message_add(_starpu_top_mt,message);
 
 	unsigned int i;
 	for(i=0;i<starpu_worker_get_count();i++)
@@ -116,12 +116,12 @@ static void starpu_top_send_devices_info()
 		starpu_top_get_device_type(i,dev_type);
 		starpu_worker_get_name(i, dev_name,64);
 		snprintf(message, 128, "%u;%s;%s\n", i, dev_type, dev_name);
-		starpu_top_message_add(starpu_top_mt,message);
+		_starpu_top_message_add(_starpu_top_mt,message);
 	}
 
 	message=(char*)malloc(6*sizeof(char));
 	snprintf(message,6,"/DEV\n");
-	starpu_top_message_add(starpu_top_mt,message);
+	_starpu_top_message_add(_starpu_top_mt,message);
 }
 
 
@@ -135,56 +135,56 @@ void starpu_top_init_and_wait(const char* server_name){
 	starpu_profiling_status_set(STARPU_PROFILING_ENABLE);
 
 	//init locked queue before adding the first message
-	starpu_top_mt = starpu_top_message_queue_new();
-	STARPU_ASSERT(starpu_top_mt);
+	_starpu_top_mt = _starpu_top_message_queue_new();
+	STARPU_ASSERT(_starpu_top_mt);
 
 	//waiting for UI to connect
 	printf("%s:%d launching network threads\n", __FILE__, __LINE__);
-	starpu_top_communications_threads_launcher();
+	_starpu_top_communications_threads_launcher();
 
 	//sending server information (report to protocol)
 	char* message = (char *) malloc(strlen("SERVERINFO\n")+1);
 	sprintf(message, "%s", "SERVERINFO\n");
-	starpu_top_message_add(starpu_top_mt,message);
+	_starpu_top_message_add(_starpu_top_mt,message);
 	message = (char *) malloc(strlen(server_name)+2);
 	sprintf(message, "%s\n", server_name);
-	starpu_top_message_add(starpu_top_mt,message);
+	_starpu_top_message_add(_starpu_top_mt,message);
 	message = (char *) malloc(25);
 	sprintf(message, "%lld\n", current_timestamp());
-	starpu_top_message_add(starpu_top_mt,message);
+	_starpu_top_message_add(_starpu_top_mt,message);
 	message = (char *) malloc(strlen("/SERVERINFO\n")+1);
 	sprintf(message,"%s", "/SERVERINFO\n");
-	starpu_top_message_add(starpu_top_mt,message);
+	_starpu_top_message_add(_starpu_top_mt,message);
 
 
 	//sending data list
 	message = (char *) malloc(strlen("DATA\n")+1);
 	sprintf(message, "%s", "DATA\n");
-	starpu_top_message_add(starpu_top_mt,message);
+	_starpu_top_message_add(_starpu_top_mt,message);
 	struct starpu_top_data * cur_data = starpu_top_first_data;
 	while(cur_data != NULL)
 	{
-		starpu_top_message_add(starpu_top_mt,message_for_topdata_init(cur_data));
+		_starpu_top_message_add(_starpu_top_mt,message_for_topdata_init(cur_data));
 		cur_data = cur_data->next;
 	}
 	message = (char *) malloc(strlen("/DATA\n")+1);
 	sprintf(message, "%s", "/DATA\n");
-	starpu_top_message_add(starpu_top_mt,message);
+	_starpu_top_message_add(_starpu_top_mt,message);
 
 	//sending parameter list
 	message = (char *) malloc(strlen("PARAMS\n")+1);
 	sprintf(message, "%s", "PARAMS\n");
-	starpu_top_message_add(starpu_top_mt,message);
+	_starpu_top_message_add(_starpu_top_mt,message);
 	struct starpu_top_param * cur_param = starpu_top_first_param;
 	printf("%s:%d sending parameters\n", __FILE__, __LINE__);
 	while(cur_param != NULL){
-	  starpu_top_message_add(starpu_top_mt,message_for_topparam_init(cur_param));
+	  _starpu_top_message_add(_starpu_top_mt,message_for_topparam_init(cur_param));
 	  cur_param = cur_param->next;
 	}
 	printf("%s:%d parameters sended\n", __FILE__, __LINE__);
 	message = (char *) malloc(strlen("/PARAMS\n")+1);
 	sprintf(message, "%s", "/PARAMS\n");
-	starpu_top_message_add(starpu_top_mt,message);
+	_starpu_top_message_add(_starpu_top_mt,message);
 
 
 	//sending DEVICE list
@@ -197,7 +197,7 @@ void starpu_top_init_and_wait(const char* server_name){
 	//sending READY message
 	message = (char *) malloc(strlen("READY\n")+1);
 	sprintf(message, "%s", "READY\n");
-	starpu_top_message_add(starpu_top_mt,message);
+	_starpu_top_message_add(_starpu_top_mt,message);
 
 	//This threads keeps locked while we don't receive an GO message from UI
 	printf("%s:%d waiting for GO message\n", __FILE__, __LINE__);
@@ -484,7 +484,7 @@ void starpu_top_update_data_boolean(const struct starpu_top_data* data, int valu
 				data->id,
 				(value?1:0),
 				current_timestamp());
-		starpu_top_message_add(starpu_top_mt,message);
+		_starpu_top_message_add(_starpu_top_mt,message);
 	}
 }
 
@@ -499,7 +499,7 @@ void starpu_top_update_data_integer(const struct starpu_top_data* data, int valu
 				data->id,
 				value,
 				current_timestamp());
-		starpu_top_message_add(starpu_top_mt,message);
+		_starpu_top_message_add(_starpu_top_mt,message);
 	}
 }
 
@@ -513,7 +513,7 @@ void starpu_top_update_data_float(const struct starpu_top_data* data, double val
 				"U;%d;%f;%lld\n",
 				data->id, value,
 				current_timestamp());
-		starpu_top_message_add(starpu_top_mt,message);
+		_starpu_top_message_add(_starpu_top_mt,message);
 	}
 }
 
@@ -543,7 +543,7 @@ void starpu_top_update_parameter(const struct starpu_top_param* param){
 			break;
 	}
 
-	starpu_top_message_add(starpu_top_mt,message);
+	_starpu_top_message_add(_starpu_top_mt,message);
 }
 
 /*********************************************
@@ -575,7 +575,7 @@ void starpu_top_debug_log(const char* debug_message)
 		cur++;
 		*cur='\0';
 
-		starpu_top_message_add(starpu_top_mt,message);
+		_starpu_top_message_add(_starpu_top_mt,message);
 	}
 }
 
@@ -600,7 +600,7 @@ void starpu_top_debug_lock(const char* debug_message)
 		*cur='\n';
 		*(cur+1)='\0';
 
-		starpu_top_message_add(starpu_top_mt,message);
+		_starpu_top_message_add(_starpu_top_mt,message);
 
 		//This threads keeps locked while we don't receive an STEP message
 		pthread_mutex_lock(&starpu_top_wait_for_continue_mutex);
@@ -713,7 +713,7 @@ void starpu_top_change_debug_mode(const char*message)
 
 	char * m = (char *) malloc(strlen(message)+1);
 	sprintf(m,"%s",message);
-	starpu_top_message_add(starpu_top_mt,m);
+	_starpu_top_message_add(_starpu_top_mt,m);
 }
 
 /*

src/top/starpu_top_connection.c

@@ -40,7 +40,7 @@
 const char *STARPU_TOP_PORT = "2011";
 const int STARPU_TOP_BUFFER_SIZE=1024;
 
-extern struct starpu_top_message_queue*  starpu_top_mt;
+extern struct _starpu_top_message_queue*  _starpu_top_mt;
 
 //client socket after fopen
 FILE* starpu_top_socket_fd_read;
@@ -80,7 +80,7 @@ void * message_to_ui(void * p)
 	(void) p;
 	while(1)
 	{
-		char* message = starpu_top_message_remove(starpu_top_mt);
+		char* message = _starpu_top_message_remove(_starpu_top_mt);
 		int len=strlen(message);
 		int check=fwrite(message, sizeof(char), len, starpu_top_socket_fd_write);
 		int check2=fflush(starpu_top_socket_fd_write);
@@ -90,7 +90,7 @@ void * message_to_ui(void * p)
 			fprintf(stderr,"Connection dropped : message no longer send\n");
 			while(1)
 			{
-				message=starpu_top_message_remove(starpu_top_mt);
+				message=_starpu_top_message_remove(_starpu_top_mt);
 				free(message);
 			}
 		}
@@ -98,7 +98,7 @@ void * message_to_ui(void * p)
 	return NULL;
 }
 
-void starpu_top_communications_threads_launcher()
+void _starpu_top_communications_threads_launcher()
 {
 	pthread_t from_ui;
 	pthread_t to_ui;

src/top/starpu_top_connection.h

@@ -26,7 +26,7 @@
 extern "C" {
 #endif
 
-extern struct starpu_top_message_queue*  starpu_top_mt;
+extern struct _starpu_top_message_queue* _starpu_top_mt;
 
 /*
  * This function initialize the two communications threads.
@@ -35,7 +35,7 @@ extern struct starpu_top_message_queue*  starpu_top_mt;
  * About mt : mt MUST be allocated before call.
  * All messages in the queue are freed after used.
  */
-void starpu_top_communications_threads_launcher();
+void _starpu_top_communications_threads_launcher();
 
 #ifdef __cplusplus
 }

src/top/starpu_top_message_queue.c

@@ -21,14 +21,14 @@
 #include  <stdlib.h>
 
 //this global queue is used both by API and by network threads
-struct starpu_top_message_queue*  starpu_top_mt = NULL;
+struct _starpu_top_message_queue*  _starpu_top_mt = NULL;
 
 
 /* Will always return the pointer to starpu_top_message_queue */
-struct starpu_top_message_queue* starpu_top_message_add(struct starpu_top_message_queue* s,
+struct _starpu_top_message_queue* _starpu_top_message_add(struct _starpu_top_message_queue* s,
 							char* msg)
 {
-	struct starpu_top_message_queue_item* p = (struct starpu_top_message_queue_item *) malloc( 1 * sizeof(*p) );
+	struct _starpu_top_message_queue_item* p = (struct _starpu_top_message_queue_item *) malloc( 1 * sizeof(*p) );
 	pthread_mutex_lock(&(s->mutex));
 	if( NULL == p )
 	{
@@ -66,11 +66,11 @@ struct starpu_top_message_queue* starpu_top_message_add(struct starpu_top_messag
 }
 
 //this is a queue and it is FIFO, so we will always remove the first element
-char* starpu_top_message_remove(struct starpu_top_message_queue* s)
+char* _starpu_top_message_remove(struct _starpu_top_message_queue* s)
 {
 	sem_wait(&(s->semaphore));
-	struct starpu_top_message_queue_item* h = NULL;
-	struct starpu_top_message_queue_item* p = NULL;
+	struct _starpu_top_message_queue_item* h = NULL;
+	struct _starpu_top_message_queue_item* p = NULL;
 
 	if( NULL == s )
 	{
@@ -93,9 +93,9 @@ char* starpu_top_message_remove(struct starpu_top_message_queue* s)
 }
 
 
-struct starpu_top_message_queue* starpu_top_message_queue_new(void)
+struct _starpu_top_message_queue* _starpu_top_message_queue_new(void)
 {
-	struct starpu_top_message_queue* p = (struct starpu_top_message_queue *) malloc( 1 * sizeof(*p));
+	struct _starpu_top_message_queue* p = (struct _starpu_top_message_queue *) malloc( 1 * sizeof(*p));
 	if( NULL == p )
 	{
 		fprintf(stderr, "LINE: %d, malloc() failed\n", __LINE__);

src/top/starpu_top_message_queue.h

@@ -22,27 +22,27 @@
 #ifndef __STARPU_TOP_MESSAGE_QUEUE_H__
 #define __STARPU_TOP_MESSAGE_QUEUE_H__
 
-struct starpu_top_message_queue_item
+struct _starpu_top_message_queue_item
 {
 	char *message;
-	struct starpu_top_message_queue_item* next;
+	struct _starpu_top_message_queue_item* next;
 };
 
-struct starpu_top_message_queue
+struct _starpu_top_message_queue
 {
-	struct starpu_top_message_queue_item* head;
-	struct starpu_top_message_queue_item* tail;
+	struct _starpu_top_message_queue_item* head;
+	struct _starpu_top_message_queue_item* tail;
 	sem_t semaphore;
 	pthread_mutex_t mutex;
 };
 
 
-struct starpu_top_message_queue *starpu_top_message_add(struct starpu_top_message_queue*,
+struct _starpu_top_message_queue *_starpu_top_message_add(struct _starpu_top_message_queue*,
 							char*);
 
-char* starpu_top_message_remove(struct starpu_top_message_queue*);
+char* _starpu_top_message_remove(struct _starpu_top_message_queue*);
 
-struct starpu_top_message_queue* starpu_top_message_queue_new();
-struct starpu_top_message_queue* starpu_top_message_queue_free(struct starpu_top_message_queue*);
+struct _starpu_top_message_queue* _starpu_top_message_queue_new();
+struct _starpu_top_message_queue* _starpu_top_message_queue_free(struct _starpu_top_message_queue*);
 
 #endif

src/top/starpu_top_task.c

@@ -43,7 +43,7 @@ void starpu_top_task_started(
 				devid, 
 				_starpu_top_timing_timespec_to_ms(ts));
 
-	starpu_top_message_add(starpu_top_mt, str);
+	_starpu_top_message_add(_starpu_top_mt, str);
 }
 
 void starpu_top_task_ended(
@@ -60,7 +60,7 @@ void starpu_top_task_ended(
 				taskid, 
 				_starpu_top_timing_timespec_to_ms(ts));
 
-	starpu_top_message_add(starpu_top_mt, str);
+	_starpu_top_message_add(_starpu_top_mt, str);
 }
 
 void starpu_top_task_prevision_timespec(
@@ -94,5 +94,5 @@ void starpu_top_task_prevision(
 				start,
 				end);
 
-	starpu_top_message_add(starpu_top_mt, str);
+	_starpu_top_message_add(_starpu_top_mt, str);
 }