Now an html compiling the generated images is generated.

Change-Id: I45d0b918b781f415c0f9819891eff0a9a52e27b5
Signed-off-by: panacotta <[email protected]>

Author: alejoar

papiplot/.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="101520255990100379" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="94275984162938619" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -16,7 +16,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="101520255990100379" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="94275984162938619" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

papiplot/src/plot.c

@@ -318,22 +318,22 @@ void search_and_plot(char *path) {
 
     while ((pDirent = readdir(pDir)) != NULL) {
     	if(is_papioutput(pDirent->d_name)) {
-    		printf("going for %s\n", pDirent->d_name);
+    		//printf("going for %s\n", pDirent->d_name);
     		path_to_csv = malloc(strlen(path)+strlen(pDirent->d_name)+2);
     		strcpy(path_to_csv, path);
     		strcat(path_to_csv,"/");
     		strcat(path_to_csv,pDirent->d_name);
         	data = process_data(path, path_to_csv, pDirent->d_name, path_to_totals);
         	plot(path, data->proc_file_path, data->actor_name, data->actions_nb, data->actions[0]->events_nb);
         	html_actor(htmlfile, data);
-        	//remove(data->proc_file_path);
+        	remove(data->proc_file_path);
         	free(data);
         }
     }
     plot_overall(path, path_to_totals, actors_nb, get_events_nb(path_to_totals)+1);
 
     html_close(htmlfile);
-    //remove(path_to_totals);
+    remove(path_to_totals);
 
     fclose(htmlfile);
     closedir (pDir);
@@ -366,9 +366,8 @@ event_acum_for_actor* process_data (char* path_todir, char* path_tofile, char* f
 	actor->actions_nb = actions_nb;
 	int i, j;
 
-	printf("has %d actions\n", actions_nb);
 	for(i=0;i<actions_nb*3;i++){
-		actor->actions[i] = malloc(sizeof(event_acum_for_action)*2+sizeof(event_acumulator)*events_nb*3);
+		actor->actions[i] = malloc(sizeof(event_acum_for_action)*2+sizeof(event_acumulator)*events_nb*3);//weird memory is weird..
 		actor->actions[i]->events_nb = events_nb;
 		//actor->actions[i]->action_name
 		for(j=0;j<events_nb;j++){
@@ -412,38 +411,27 @@ event_acum_for_actor* process_data (char* path_todir, char* path_tofile, char* f
 
 	//acumuating structures
 	int result; //borrar
-	int temp = 0; //borrar
 	while(fgets(buf,1500,ofile)!=NULL){
 		token = strtok(buf,";");
 		token = strtok(NULL,";");//read action name
-		printf("%d\n", ++temp);
 
 		for(i=0; i<actor->actions_nb; i++){
-			printf("continuing with %s (action %d)\n", actor->actions[i]->action_name, i);
-			printf(" beg cos found = %d, i = %d, actions_nb = %d\n", found, i, actions_nb);
 			if(actor->actions[i]->action_name==NULL)
 				break;
 			else {
-				printf("comparing %s with %s\n", actor->actions[i]->action_name, token);
-				printf("result = %d\n",strcmp(actor->actions[i]->action_name,token));
 				result = strcmp(actor->actions[i]->action_name,token);
-				printf("ea, result was %d\n", result);
 				if(result==0){
-					printf("action %s already exists\n", actor->actions[i]->action_name);
 					found = i;
 					break;
 				}
 				else {
-					printf("eaea\n");
-					printf("end? cos found = %d, i = %d, actions_nb = %d\n", found, i, actions_nb);
 				}
 			}
 		}
 		if (found == -1){
-			printf("not found, adding action %s\n", token);
+			//printf("not found, adding action %s\n", token);
 			actor->actions[found_actions]->action_name = malloc(strlen(token)+1);
 			strcpy(actor->actions[found_actions]->action_name,token);
-			printf("%s added!\n", actor->actions[i]->action_name);
 		}
 
 		current = (found == -1)? found_actions++ : found;