X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=genevent%2Fgenevent.c;h=8aaabbe61477b1b2fec8404bc8763534a6544d0b;hb=aaa1804290af1f945f0da70cdfe54548b8a72b32;hp=2932a47d94f59faf135f7239a99354c75094d3c7;hpb=59a957df53a055e84f09b5eb32e81212b6770ec7;p=lttv.git

diff --git a/genevent/genevent.c b/genevent/genevent.c
index 2932a47d..8aaabbe6 100644
--- a/genevent/genevent.c
+++ b/genevent/genevent.c
@@ -86,6 +86,9 @@
 #define dprintf(...)
 #endif
 
+
+enum user_fct_types { USER_FCT_PROTO, USER_FCT_DECLARATION } ;
+
 /* Code printing */
 
 void print_tabs(unsigned int tabs, FILE *fd)
@@ -1284,7 +1287,7 @@ int print_type_write_fct(type_descriptor_t * td, FILE *fd, unsigned int tabs,
 				print_tabs(1, fd);
 				fprintf(fd, "/* Put source *from just after the C sequence */\n");
 				print_tabs(1, fd);
-				fprintf(fd, "*from = obj+1;\n");
+				fprintf(fd, "*from = (const char*)(obj+1);\n");
 				break;
 			case STRING:
 				print_tabs(1, fd);
@@ -1398,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);
@@ -1489,10 +1494,10 @@ int print_event_logging_function(char *basename, facility_t *fac,
 			case ARRAY:
 			case STRUCT:
 			case STRING:
-				fprintf(fd, "*from = lttng_param_%s;\n", field->name);
+				fprintf(fd, "*from = (const char*)lttng_param_%s;\n", field->name);
 				break;
 			default:
-				fprintf(fd, "*from = &lttng_param_%s;\n", field->name);
+				fprintf(fd, "*from = (const char*)&lttng_param_%s;\n", field->name);
 				break;
 		}
 
@@ -1518,9 +1523,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");
 
@@ -1588,10 +1593,10 @@ int print_event_logging_function(char *basename, facility_t *fac,
 			case ARRAY:
 			case STRUCT:
 			case STRING:
-				fprintf(fd, "*from = lttng_param_%s;\n", field->name);
+				fprintf(fd, "*from = (const char*)lttng_param_%s;\n", field->name);
 				break;
 			default:
-				fprintf(fd, "*from = &lttng_param_%s;\n", field->name);
+				fprintf(fd, "*from = (const char*)&lttng_param_%s;\n", field->name);
 				break;
 		}
 
@@ -1635,22 +1640,19 @@ int print_event_logging_function(char *basename, facility_t *fac,
 	fprintf(fd, "preempt_enable_no_resched();\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;
 }
 
-/* print_event_logging_function_user_generic
- * Print the logging function of an event for userspace tracing. This is the
- * core of genevent */
-int print_event_logging_function_user_generic(char *basename, facility_t *fac,
-		event_t *event, FILE *fd)
+int print_event_logging_function_header_user_generic(char *basename, facility_t *fac,
+		event_t *event, FILE *fd, enum user_fct_types fct_type)
 {
 	char *attrib;
 
-	fprintf(fd, "#ifndef LTT_TRACE_FAST\n");
-	
-	if(event->no_instrument_function) {
+	if(event->no_instrument_function && fct_type == USER_FCT_PROTO) {
 		attrib = "__attribute__((no_instrument_function)) ";
 	} else {
 		attrib = "";
@@ -1661,7 +1663,6 @@ int print_event_logging_function_user_generic(char *basename, facility_t *fac,
 		fprintf(fd, "static inline %sint trace_%s(\n",attrib, basename);
 	}
 	int	has_argument = 0;
-	int has_type_fixed = 0;
 
 	if(event->param_buffer) {
 		if(has_argument) {
@@ -1692,7 +1693,25 @@ int print_event_logging_function_user_generic(char *basename, facility_t *fac,
 		print_tabs(2, fd);
 		fprintf(fd, "void");
 	}
-	fprintf(fd,")\n");
+	fprintf(fd,")");
+	return 0;
+}
+
+
+/* print_event_logging_function_user_generic
+ * Print the logging function of an event for userspace tracing. This is the
+ * core of genevent */
+int print_event_logging_function_user_generic(char *basename, facility_t *fac,
+		event_t *event, FILE *fd)
+{
+	int has_type_fixed = 0;
+
+	if(print_event_logging_function_header_user_generic(basename, fac, event, fd, USER_FCT_PROTO)) return 1;
+	fprintf(fd,";\n");
+	fprintf(fd,"\n");
+	fprintf(fd, "#ifndef LTT_TRACE_FAST\n");
+	if(print_event_logging_function_header_user_generic(basename, fac, event, fd, USER_FCT_DECLARATION)) return 1;
+	fprintf(fd,"\n");
 	fprintf(fd, 
 			"#ifndef LTT_TRACE\n");
 	fprintf(fd, "{\n");
@@ -1703,8 +1722,8 @@ int print_event_logging_function_user_generic(char *basename, facility_t *fac,
 	print_tabs(1, fd);
 	fprintf(fd, "int ret = 0;\n");
 	if(event->param_buffer) {
-		print_tabs(1, fd);
-		fprintf(fd, "reserve_size = ltt_align(reserve_size, sizeof(void *));\n");
+		//FIX print_tabs(1, fd);
+		//fprintf(fd, "reserve_size = ltt_align(reserve_size, sizeof(void *));\n");
 		print_tabs(1, fd);
 		fprintf(fd, "{\n");
 		goto do_syscall;
@@ -1776,10 +1795,10 @@ int print_event_logging_function_user_generic(char *basename, facility_t *fac,
 			case ARRAY:
 			case STRUCT:
 			case STRING:
-				fprintf(fd, "*from = lttng_param_%s;\n", field->name);
+				fprintf(fd, "*from = (const char*)lttng_param_%s;\n", field->name);
 				break;
 			default:
-				fprintf(fd, "*from = &lttng_param_%s;\n", field->name);
+				fprintf(fd, "*from = (const char*)&lttng_param_%s;\n", field->name);
 				break;
 		}
 
@@ -1820,10 +1839,10 @@ int print_event_logging_function_user_generic(char *basename, facility_t *fac,
 			case ARRAY:
 			case STRUCT:
 			case STRING:
-				fprintf(fd, "*from = lttng_param_%s;\n", field->name);
+				fprintf(fd, "*from = (const char*)lttng_param_%s;\n", field->name);
 				break;
 			default:
-				fprintf(fd, "*from = &lttng_param_%s;\n", field->name);
+				fprintf(fd, "*from = (const char*)&lttng_param_%s;\n", field->name);
 				break;
 		}
 
@@ -1852,7 +1871,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");
@@ -1998,10 +2017,10 @@ int print_event_logging_function_user_fast(char *basename, facility_t *fac,
 			case ARRAY:
 			case STRUCT:
 			case STRING:
-				fprintf(fd, "*from = lttng_param_%s;\n", field->name);
+				fprintf(fd, "*from = (const char*)lttng_param_%s;\n", field->name);
 				break;
 			default:
-				fprintf(fd, "*from = &lttng_param_%s;\n", field->name);
+				fprintf(fd, "*from = (const char*)&lttng_param_%s;\n", field->name);
 				break;
 		}
 
@@ -2044,7 +2063,7 @@ int print_event_logging_function_user_fast(char *basename, facility_t *fac,
 	print_tabs(2, fd);
 	fprintf(fd, "slot_size = 0;\n");
 	print_tabs(2, fd);
-	fprintf(fd, "buffer = ltt_reserve_slot(trace, ltt_buf, &transport_data,\n");
+	fprintf(fd, "buffer = ltt_reserve_slot(trace, ltt_buf,\n");
 	print_tabs(3, fd);
 	fprintf(fd, "reserve_size, &slot_size, &tsc,\n");
 	print_tabs(3, fd);
@@ -2085,10 +2104,10 @@ int print_event_logging_function_user_fast(char *basename, facility_t *fac,
 			case ARRAY:
 			case STRUCT:
 			case STRING:
-				fprintf(fd, "*from = lttng_param_%s;\n", field->name);
+				fprintf(fd, "*from = (const char*)lttng_param_%s;\n", field->name);
 				break;
 			default:
-				fprintf(fd, "*from = &lttng_param_%s;\n", field->name);
+				fprintf(fd, "*from = (const char*)&lttng_param_%s;\n", field->name);
 				break;
 		}
 
@@ -2120,7 +2139,7 @@ int print_event_logging_function_user_fast(char *basename, facility_t *fac,
 	// for DEBUG only.
 	//fprintf(fd, "commit:\n"); /* DEBUG! */
 	print_tabs(2, fd);
-	fprintf(fd, "ltt_commit_slot(ltt_buf, &transport_data, buffer, slot_size);\n\n");
+	fprintf(fd, "ltt_commit_slot(ltt_buf, buffer, slot_size);\n\n");
 	
 	fprintf(fd, "}\n\n");
 
@@ -2150,14 +2169,14 @@ void print_log_header_head(facility_t *fac, FILE *fd)
 {
 	fprintf(fd, "#ifndef _LTT_FACILITY_%s_H_\n", fac->capname);
 	fprintf(fd, "#define _LTT_FACILITY_%s_H_\n\n", fac->capname);
-  fprintf(fd, "#include <linux/types.h>\n");
+	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");
 }
 
@@ -2168,14 +2187,18 @@ void print_log_header_head_user(facility_t *fac, FILE *fd)
 {
 	fprintf(fd, "#ifndef _LTT_FACILITY_%s_H_\n", fac->capname);
 	fprintf(fd, "#define _LTT_FACILITY_%s_H_\n\n", fac->capname);
-  fprintf(fd, "#include <sys/types.h>\n");
+	fprintf(fd, "#include <sys/types.h>\n");
 	if(!fac->arch)
-	  fprintf(fd, "#include <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 <asm/ltt/ltt-facility-id-%s_%s.h>\n",
 				fac->name,
 				fac->arch);
-  fprintf(fd, "#include <ltt/ltt-usertrace.h>\n");
+	fprintf(fd, "#include <ltt/ltt-usertrace.h>\n");
+	fprintf(fd, "\n");
+	fprintf(fd, "#ifdef __cplusplus\n");
+	fprintf(fd, "extern \"C\" {\n");
+	fprintf(fd, "#endif\n");
 	fprintf(fd, "\n");
 }
 
@@ -2259,6 +2282,10 @@ void print_log_header_tail(facility_t *fac, FILE *fd)
 
 void print_log_header_tail_user(facility_t *fac, FILE *fd)
 {
+	fprintf(fd, "#ifdef __cplusplus\n");
+	fprintf(fd, "} /* end of extern \"C\" */\n");
+	fprintf(fd, "#endif\n");
+	fprintf(fd, "\n");
 	fprintf(fd, "#endif //_LTT_FACILITY_%s_H_\n",fac->capname);
 }
 	
@@ -2473,10 +2500,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);
@@ -2538,7 +2565,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);