X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=genevent%2Fgenevent.c;h=fb564597ed78ef4b707c32dcfe788a738861ca84;hb=f9a599edf6aee5d165159f89c5c120a1792cc100;hp=8f898e7f93df3c0a338d1d12fc508933ab42803d;hpb=0bdf8e980b73c9cf21a75da882f521958abff5ae;p=lttv.git

diff --git a/genevent/genevent.c b/genevent/genevent.c
index 8f898e7f..fb564597 100644
--- a/genevent/genevent.c
+++ b/genevent/genevent.c
@@ -723,7 +723,7 @@ int print_type_write(type_descriptor_t * td, FILE *fd, unsigned int tabs,
 			fprintf(fd, ";\n");
 			fprintf(fd, "\n");
 			print_tabs(tabs, fd);
-			fprintf(fd, "if(*len == 0) {\n");
+			fprintf(fd, "if (*len == 0) {\n");
 			print_tabs(tabs+1, fd);
 			fprintf(fd, "*to += ltt_align(*to, align); /* align output */\n");
 			print_tabs(tabs, fd);
@@ -1161,9 +1161,9 @@ int print_type_write_fct(type_descriptor_t * td, FILE *fd, unsigned int tabs,
 			print_tabs(1, fd);
 			fprintf(fd, "/* Flush pending memcpy */\n");
 			print_tabs(1, fd);
-			fprintf(fd, "if(*len != 0) {\n");
+			fprintf(fd, "if (*len != 0) {\n");
 			print_tabs(2, fd);
-			fprintf(fd, "if(buffer != NULL)\n");
+			fprintf(fd, "if (buffer != NULL)\n");
 			print_tabs(3, fd);
 			fprintf(fd, "memcpy(buffer+*to_base+*to, *from, *len);\n");
 			print_tabs(1, fd);
@@ -1189,7 +1189,7 @@ int print_type_write_fct(type_descriptor_t * td, FILE *fd, unsigned int tabs,
 	fprintf(fd, ";\n");
 	fprintf(fd, "\n");
 	print_tabs(1, fd);
-	fprintf(fd, "if(*len == 0) {\n");
+	fprintf(fd, "if (*len == 0) {\n");
 	print_tabs(2, fd);
 	fprintf(fd, "*to += ltt_align(*to, align); /* align output */\n");
 	print_tabs(1, fd);
@@ -1230,7 +1230,7 @@ int print_type_write_fct(type_descriptor_t * td, FILE *fd, unsigned int tabs,
 //				print_tabs(1, fd);
 //				fprintf(fd, "*to += ltt_align(*to, size);\n");
 				print_tabs(1, fd);
-				fprintf(fd, "if(buffer != NULL)\n");
+				fprintf(fd, "if (buffer != NULL)\n");
 				print_tabs(2, fd);
 				fprintf(fd, "memcpy(buffer+*to_base+*to, &obj->len, *len);\n");
 				print_tabs(1, fd);
@@ -1256,7 +1256,7 @@ int print_type_write_fct(type_descriptor_t * td, FILE *fd, unsigned int tabs,
 					print_tabs(1, fd);
 					fprintf(fd, "*len = obj->len * (*len);\n");
 					print_tabs(1, fd);
-					fprintf(fd, "if(buffer != NULL)\n");
+					fprintf(fd, "if (buffer != NULL)\n");
 					print_tabs(2, fd);
 					fprintf(fd, "memcpy(buffer+*to_base+*to, obj->array, *len);\n");
 					print_tabs(1, fd);
@@ -1268,7 +1268,7 @@ int print_type_write_fct(type_descriptor_t * td, FILE *fd, unsigned int tabs,
 					print_tabs(1, fd);
 					fprintf(fd, "/* Variable length child : iter. */\n");
 					print_tabs(1, fd);
-					fprintf(fd, "for(unsigned int i=0; i<obj->len; i++) {\n");
+					fprintf(fd, "for (unsigned int i = 0; i < obj->len; i++) {\n");
 					if(print_type_write(((field_t*)td->fields.array[1])->type,
 							fd, 2, basename, "array[i]", "obj->", 1)) return 1;
 					print_tabs(1, fd);
@@ -1293,7 +1293,7 @@ int print_type_write_fct(type_descriptor_t * td, FILE *fd, unsigned int tabs,
 				print_tabs(1, fd);
 				fprintf(fd, "size = strlen(obj) + 1; /* Include final NULL char. */\n");
 				print_tabs(1, fd);
-				fprintf(fd, "if(buffer != NULL)\n");
+				fprintf(fd, "if (buffer != NULL)\n");
 				print_tabs(2, fd);
 				fprintf(fd, "memcpy(buffer+*to_base+*to, obj, size);\n");
 				print_tabs(1, fd);
@@ -1336,7 +1336,7 @@ int print_type_write_fct(type_descriptor_t * td, FILE *fd, unsigned int tabs,
 					print_tabs(1, fd);
 					fprintf(fd, "/* Variable length child : iter. */\n");
 					print_tabs(1, fd);
-					fprintf(fd, "for(unsigned int i=0; i<LTTNG_ARRAY_SIZE_%s; i++) {\n", basename);
+					fprintf(fd, "for (unsigned int i = 0; i < LTTNG_ARRAY_SIZE_%s; i++) {\n", basename);
 					if(print_type_write(((field_t*)td->fields.array[0])->type,
 							fd, 2, basename, "", "obj->array[i]", 1)) return 1;
 					print_tabs(1, fd);
@@ -1401,12 +1401,14 @@ int print_event_logging_function(char *basename, facility_t *fac,
 		fprintf(fd, "void");
 	}
 	fprintf(fd,")\n");
+#if 0
 	fprintf(fd, 
-			"#if (!defined(CONFIG_LTT) || !defined(CONFIG_LTT_FACILITY_%s))\n",
-			fac->capname);
+			"#if (!defined(CONFIG_LTT) || (!defined(CONFIG_LTT_FACILITY_%s) && !defined(CONFIG_LTT_FACILITY_%s_MODULE)))\n",
+			fac->capname, fac->capname);
 	fprintf(fd, "{\n");
 	fprintf(fd, "}\n");
 	fprintf(fd,"#else\n");
+#endif //0
 	fprintf(fd, "{\n");
 	/* Print the function variables */
 	print_tabs(1, fd);
@@ -1463,7 +1465,9 @@ int print_event_logging_function(char *basename, facility_t *fac,
 	fprintf(fd, "\n");
 	
 	print_tabs(1, fd);
-	fprintf(fd, "if(ltt_traces.num_active_traces == 0) return;\n");
+	fprintf(fd, "if (ltt_traces.num_active_traces == 0)\n");
+	print_tabs(2, fd);
+	fprintf(fd, "return;\n");
 	fprintf(fd, "\n");
 
 	/* Calculate event variable len + event data alignment offset.
@@ -1521,9 +1525,9 @@ int print_event_logging_function(char *basename, facility_t *fac,
 	} else {
 		print_tabs(1, fd);
 		fprintf(fd, 
-			"index = ltt_get_index_from_facility(ltt_facility_%s_%X,\n"\
+			"index = ltt_get_index_from_facility_%s(" \
 					"\t\t\t\t\t\tevent_%s_%s);\n",
-				fac->name, fac->checksum, fac->name, event->name);
+				fac->name, fac->name, event->name);
 	}
 	fprintf(fd,"\n");
 
@@ -1532,11 +1536,15 @@ int print_event_logging_function(char *basename, facility_t *fac,
 	print_tabs(1, fd);
 	fprintf(fd, "list_for_each_entry_rcu(trace, &ltt_traces.head, list) {\n");
 	print_tabs(2, fd);
-	fprintf(fd, "if(!trace->active) continue;\n\n");
+	fprintf(fd, "if (!trace->active)\n");
+	print_tabs(3, fd);
+	fprintf(fd, "continue;\n\n");
 
 	if(event->per_trace) {
 		print_tabs(2, fd);
-		fprintf(fd, "if(dest_trace != trace) continue;\n\n");
+		fprintf(fd, "if (dest_trace != trace)\n");
+		print_tabs(3, fd);
+		fprintf(fd, "continue;\n\n");
 	}
  
 	print_tabs(2, fd);
@@ -1557,7 +1565,9 @@ int print_event_logging_function(char *basename, facility_t *fac,
 	fprintf(fd, "&before_hdr_pad, &after_hdr_pad, &header_size);\n");
 	/* If error, return */
 	print_tabs(2, fd);
-	fprintf(fd, "if(!buffer) continue; /* buffer full */\n\n");
+	fprintf(fd, "if (!buffer)\n");
+	print_tabs(3, fd);
+	fprintf(fd, "continue; /* buffer full */\n\n");
 	//print_tabs(2, fd);
 	// for DEBUG only 
 	// fprintf(fd, "goto commit; /* DEBUG : never actually write. */\n\n");
@@ -1607,7 +1617,7 @@ int print_event_logging_function(char *basename, facility_t *fac,
 		print_tabs(2, fd);
 		fprintf(fd, "/* Flush pending memcpy */\n");
 		print_tabs(2, fd);
-		fprintf(fd, "if(*len != 0) {\n");
+		fprintf(fd, "if (*len != 0) {\n");
 		print_tabs(3, fd);
 		fprintf(fd, "memcpy(buffer+*to_base+*to, *from, *len);\n");
 		print_tabs(3, fd);
@@ -1635,11 +1645,13 @@ int print_event_logging_function(char *basename, facility_t *fac,
 	print_tabs(1, fd);
 	fprintf(fd, "ltt_nesting[smp_processor_id()]--;\n");
 	print_tabs(1, fd);
-	fprintf(fd, "preempt_enable_no_resched();\n");
+	fprintf(fd, "preempt_enable();\n");
 
 	fprintf(fd, "}\n");
-	fprintf(fd, "#endif //(!defined(CONFIG_LTT) || !defined(CONFIG_LTT_FACILITY_%s))\n\n",
-			fac->capname);
+#if 0
+	fprintf(fd, "#endif //(!defined(CONFIG_LTT) || (!defined(CONFIG_LTT_FACILITY_%s) && !defined(CONFIG_LTT_FACILITY_%s_MODULE)))\n\n",
+			fac->capname, fac->capname);
+#endif //0
 	return 0;
 }
 
@@ -1851,7 +1863,7 @@ int print_event_logging_function_user_generic(char *basename, facility_t *fac,
 		print_tabs(2, fd);
 		fprintf(fd, "/* Flush pending memcpy */\n");
 		print_tabs(2, fd);
-		fprintf(fd, "if(*len != 0) {\n");
+		fprintf(fd, "if (*len != 0) {\n");
 		print_tabs(3, fd);
 		fprintf(fd, "memcpy(buffer+*to_base+*to, *from, *len);\n");
 		print_tabs(3, fd);
@@ -1867,7 +1879,7 @@ int print_event_logging_function_user_generic(char *basename, facility_t *fac,
 
 do_syscall:
 	print_tabs(2, fd);
-	fprintf(fd, "ret = ltt_trace_generic(ltt_facility_%s_%X, event_%s_%s, buffer, reserve_size, LTT_BLOCKING);\n", fac->name, fac->checksum, fac->name, event->name);
+	fprintf(fd, "ret = ltt_trace_generic(ltt_facility_%s_%X, event_%s_%s, buffer, reserve_size, LTT_BLOCKING, %u);\n", fac->name, fac->checksum, fac->name, event->name, event->high_priority);
 
 	print_tabs(1, fd);
 	fprintf(fd, "}\n\n");
@@ -1978,7 +1990,7 @@ int print_event_logging_function_user_fast(char *basename, facility_t *fac,
 	fprintf(fd, "\n");
 	
 	print_tabs(1, fd);
-	fprintf(fd, "if(!trace) {\n");
+	fprintf(fd, "if (!trace) {\n");
 	print_tabs(2, fd);
 	fprintf(fd, "ltt_thread_init();\n");
 	print_tabs(2, fd);
@@ -2045,7 +2057,7 @@ int print_event_logging_function_user_fast(char *basename, facility_t *fac,
 
 	if(event->per_trace) {
 		print_tabs(2, fd);
-		fprintf(fd, "if(dest_trace != trace) continue;\n\n");
+		fprintf(fd, "if (dest_trace != trace) continue;\n\n");
 	}
  
 	print_tabs(2, fd);
@@ -2066,7 +2078,9 @@ int print_event_logging_function_user_fast(char *basename, facility_t *fac,
 	fprintf(fd, "&before_hdr_pad, &after_hdr_pad, &header_size);\n");
 	/* If error, return */
 	print_tabs(2, fd);
-	fprintf(fd, "if(!buffer) goto end; /* buffer full */\n\n");
+	fprintf(fd, "if (!buffer)\n");
+	print_tabs(3, fd);
+	fprintf(fd, "goto end; /* buffer full */\n\n");
 	//print_tabs(2, fd);
 	// for DEBUG only 
 	// fprintf(fd, "goto commit; /* DEBUG : never actually write. */\n\n");
@@ -2116,7 +2130,7 @@ int print_event_logging_function_user_fast(char *basename, facility_t *fac,
 		print_tabs(2, fd);
 		fprintf(fd, "/* Flush pending memcpy */\n");
 		print_tabs(2, fd);
-		fprintf(fd, "if(*len != 0) {\n");
+		fprintf(fd, "if (*len != 0) {\n");
 		print_tabs(3, fd);
 		fprintf(fd, "memcpy(buffer+*to_base+*to, *from, *len);\n");
 		print_tabs(3, fd);
@@ -2167,12 +2181,12 @@ void print_log_header_head(facility_t *fac, FILE *fd)
 	fprintf(fd, "#define _LTT_FACILITY_%s_H_\n\n", fac->capname);
 	fprintf(fd, "#include <linux/types.h>\n");
 	if(!fac->arch)
-		fprintf(fd, "#include <linux/ltt/ltt-facility-id-%s.h>\n", fac->name);
+		fprintf(fd, "#include <ltt/ltt-facility-id-%s.h>\n", fac->name);
 	else
-		fprintf(fd, "#include <asm/ltt/ltt-facility-id-%s_%s.h>\n",
+		fprintf(fd, "#include <ltt/ltt-facility-id-%s_%s.h>\n",
 				fac->name,
 				fac->arch);
-	fprintf(fd, "#include <linux/ltt-core.h>\n");
+	fprintf(fd, "#include <ltt/ltt-tracer.h>\n");
 	fprintf(fd, "\n");
 }
 
@@ -2496,10 +2510,10 @@ int print_loader_header(facility_t *fac)
   fprintf(fd, "#ifdef CONFIG_LTT\n\n");
   fprintf(fd,"#include <linux/ltt-facilities.h>\n");
 	if(!fac->arch)
-	  fprintf(fd,"#include <linux/ltt/ltt-facility-id-%s.h>\n\n",
+	  fprintf(fd,"#include <ltt/ltt-facility-id-%s.h>\n\n",
 				fac->name);
 	else
-	  fprintf(fd,"#include <asm/ltt/ltt-facility-id-%s_%s.h>\n\n",
+	  fprintf(fd,"#include <ltt/ltt-facility-id-%s_%s.h>\n\n",
 				fac->name,
 				fac->arch);
   fprintf(fd,"ltt_facility_t\tltt_facility_%s;\n", fac->name);
@@ -2561,7 +2575,7 @@ int print_loader_header_user(facility_t *fac)
 	  fprintf(fd,"#include <ltt/ltt-facility-id-%s.h>\n\n",
 				fac->name);
 	else
-	  fprintf(fd,"#include <asm/ltt/ltt-facility-id-%s_%s.h>\n\n",
+	  fprintf(fd,"#include <ltt/ltt-facility-id-%s_%s.h>\n\n",
 				fac->name,
 				fac->arch);
   fprintf(fd,"ltt_facility_t\tltt_facility_%s;\n", fac->name);
@@ -2636,7 +2650,6 @@ int print_loader_c(facility_t *fac)
   fprintf(fd, "#include <linux/ltt-facilities.h>\n");
   fprintf(fd, "#include <linux/module.h>\n");
   fprintf(fd, "#include <linux/init.h>\n");
-  fprintf(fd, "#include <linux/config.h>\n");
 	if(!fac->arch)
   	fprintf(fd, "#include \"ltt-facility-loader-%s.h\"\n", fac->name);
 	else
@@ -2679,7 +2692,7 @@ int print_loader_c(facility_t *fac)
   fprintf(fd, "\tint err;\n");
   fprintf(fd, "\n");
   fprintf(fd, "\terr = ltt_facility_unregister(LTT_FACILITY_SYMBOL);\n");
-  fprintf(fd, "\tif(err != 0)\n");
+  fprintf(fd, "\tif (err != 0)\n");
   fprintf(fd, "\t\tprintk(KERN_ERR \"LTT : Error in unregistering facility.\\n\");\n");
   fprintf(fd, "\n");
   fprintf(fd, "}\n");
@@ -2779,7 +2792,7 @@ int print_loader_c_user(facility_t *fac)
   fprintf(fd, "\terr = ltt_register_generic(&LTT_FACILITY_SYMBOL, &facility);\n");
   fprintf(fd, "\tLTT_FACILITY_CHECKSUM_SYMBOL = LTT_FACILITY_SYMBOL;\n");
   fprintf(fd, "\t\n");
-  fprintf(fd, "\tif(err) {\n");
+  fprintf(fd, "\tif (err) {\n");
 	fprintf(fd, "#ifdef LTT_SHOW_DEBUG\n");
   fprintf(fd, "\t\tperror(\"Error in ltt_register_generic\");\n");
 	fprintf(fd, "#endif //LTT_SHOW_DEBUG\n");