X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=genevent-new%2Fgenevent.c;h=4151c64a8de746ed9bfda84ab225f868e0e1618d;hb=caabcb432b5b0a4a4955562cfc0bebb0d32ca5df;hp=7f06edaa70fe8d0e5ed962ba4fcfedde72228cc2;hpb=d428224cad4b5c21a9d28d3bd174f1a6097051fa;p=lttv.git

diff --git a/genevent-new/genevent.c b/genevent-new/genevent.c
index 7f06edaa..4151c64a 100644
--- a/genevent-new/genevent.c
+++ b/genevent-new/genevent.c
@@ -169,7 +169,7 @@ int print_type(type_descriptor_t * td, FILE *fd, unsigned int tabs,
 			fprintf(fd, "off_t");
 			break;
 		case STRING:
-			fprintf(fd, "char *");
+			fprintf(fd, "const char *");
 			break;
 		case ENUM:
 			fprintf(fd, "enum lttng_%s", basename);
@@ -283,7 +283,7 @@ int print_arg(type_descriptor_t * td, FILE *fd, unsigned int tabs,
 			fprintf(fd, " %s", field_name);
 			break;
 		case STRING:
-			fprintf(fd, "char *");
+			fprintf(fd, "const char *");
 			fprintf(fd, " %s", field_name);
 			break;
 		case ENUM:
@@ -451,7 +451,7 @@ int print_type_declaration(type_descriptor_t * td, FILE *fd, unsigned int tabs,
 			print_tabs(1, fd);
 			if(print_type(((field_t*)td->fields.array[0])->type,
 						fd, tabs, basename, "")) return 1;
-			fprintf(fd, "len;\n");
+			fprintf(fd, " len;\n");
 			print_tabs(1, fd);
 			if(print_type(((field_t*)td->fields.array[1])->type,
 						fd, tabs, basename, "")) return 1;
@@ -552,52 +552,75 @@ int print_type_alignment(type_descriptor_t * td, FILE *fd, unsigned int tabs,
 			strncat(basename, field_name, PATH_MAX - basename_len);
 	}
 	
-	switch(td->type) {
-		case INT_FIXED:
-		case UINT_FIXED:
-		case CHAR:
-		case UCHAR:
-		case SHORT:
-		case USHORT:
-		case INT:
-		case UINT:
-		case FLOAT:
-		case POINTER:
-		case LONG:
-		case ULONG:
-		case SIZE_T:
-		case SSIZE_T:
-		case OFF_T:
-		case ENUM:
-			fprintf(fd, "sizeof(");
-			if(print_type(td, fd, 0, basename, "")) return 1;
-			fprintf(fd, ")");
-			break;
-		case STRING:
-			fprintf(fd, "sizeof(char)");
-			break;
-		case SEQUENCE:
-			fprintf(fd, "lttng_get_alignment_sequence_%s(&obj->%s)", basename,
-					field_name);
-			break;
-		case STRUCT:
-			fprintf(fd, "lttng_get_alignment_struct_%s(&obj->%s)", basename,
-					field_name);
-			break;
-		case UNION:
-			fprintf(fd, "lttng_get_alignment_union_%s(&obj->%s)", basename,
-					field_name);
-			break;
-		case ARRAY:
-			fprintf(fd, "lttng_get_alignment_array_%s(obj->%s)", basename,
-					field_name);
-			break;
-		case NONE:
-			printf("error : type NONE unexpected\n");
-			return 1;
-			break;
+	if(field_name[0] == '\0') {
+		/* We are in a write function : it's the obj that we must align. */
+		switch(td->type) {
+			case SEQUENCE:
+				fprintf(fd, "lttng_get_alignment_sequence_%s(obj)", basename);
+				break;
+			case STRUCT:
+				fprintf(fd, "lttng_get_alignment_struct_%s(obj)", basename);
+				break;
+			case UNION:
+				fprintf(fd, "lttng_get_alignment_union_%s(obj)", basename);
+				break;
+			case ARRAY:
+				fprintf(fd, "lttng_get_alignment_array_%s(obj)", basename);
+				break;
+			default:
+				printf("error : type unexpected\n");
+				return 1;
+				break;
+		}
+	} else {
+		
+		switch(td->type) {
+			case INT_FIXED:
+			case UINT_FIXED:
+			case CHAR:
+			case UCHAR:
+			case SHORT:
+			case USHORT:
+			case INT:
+			case UINT:
+			case FLOAT:
+			case POINTER:
+			case LONG:
+			case ULONG:
+			case SIZE_T:
+			case SSIZE_T:
+			case OFF_T:
+			case ENUM:
+				fprintf(fd, "sizeof(");
+				if(print_type(td, fd, 0, basename, "")) return 1;
+				fprintf(fd, ")");
+				break;
+			case STRING:
+				fprintf(fd, "sizeof(char)");
+				break;
+			case SEQUENCE:
+				fprintf(fd, "lttng_get_alignment_sequence_%s(&obj->%s)", basename,
+						field_name);
+				break;
+			case STRUCT:
+				fprintf(fd, "lttng_get_alignment_struct_%s(&obj->%s)", basename,
+						field_name);
+				break;
+			case UNION:
+				fprintf(fd, "lttng_get_alignment_union_%s(&obj->%s)", basename,
+						field_name);
+				break;
+			case ARRAY:
+				fprintf(fd, "lttng_get_alignment_array_%s(obj->%s)", basename,
+						field_name);
+				break;
+			case NONE:
+				printf("error : type NONE unexpected\n");
+				return 1;
+				break;
+		}
 	}
-
+	
 	return 0;
 }
 
@@ -826,7 +849,7 @@ int print_type_alignment_fct(type_descriptor_t * td, FILE *fd,
 			fprintf(fd, ";\n");
 			break;
 		default:
-			printf("print_type_alignment_fct : type has no alignment function.\n");
+			dprintf("print_type_alignment_fct : type has no alignment function.\n");
 			return 0;
 			break;
 	}
@@ -878,7 +901,7 @@ int print_type_write_fct(type_descriptor_t * td, FILE *fd, unsigned int tabs,
 		case ARRAY:
 			break;
 		default:
-			printf("print_type_write_fct : type has no write function.\n");
+			dprintf("print_type_write_fct : type has no write function.\n");
 			return 0;
 			break;
 	}
@@ -991,9 +1014,11 @@ int print_type_write_fct(type_descriptor_t * td, FILE *fd, unsigned int tabs,
 		fprintf(fd, "/* Contains only fixed size fields : use compiler sizeof() */\n");
 		fprintf(fd, "\n");
 		print_tabs(1, fd);
-		fprintf(fd, "*len += sizeof(");
+		fprintf(fd, "size = sizeof(");
 		if(print_type(td, fd, 0, basename, field_name)) return 1;
 		fprintf(fd, ");\n");
+		print_tabs(1, fd);
+		fprintf(fd, "*len += size;\n");
 	} else {
 		/* The type contains nested variable size subtypes :
 		 * we must write field by field. */
@@ -1064,7 +1089,7 @@ int print_type_write_fct(type_descriptor_t * td, FILE *fd, unsigned int tabs,
 				fprintf(fd, "*from = obj+1;\n");
 				break;
 			case STRING:
-				fprintf(fd, "size = strlen(obj);\n");
+				fprintf(fd, "size = strlen(obj) + 1; /* Include final NULL char. */\n");
 				print_tabs(1, fd);
 				fprintf(fd, "if(buffer != NULL)\n");
 				print_tabs(2, fd);
@@ -1137,22 +1162,44 @@ int print_event_logging_function(char *basename, facility_t *fac,
 		event_t *event, FILE *fd)
 {
 	fprintf(fd, "static inline void trace_%s(\n", basename);
+	int	has_argument = 0;
+
+  /* Does it support per trace tracing ? */
+  if(event->per_trace) {
+		print_tabs(2, fd);
+    fprintf(fd, "struct ltt_trace_struct *dest_trace");
+		has_argument = 1;
+  }
+  
+  /* Does it support per tracefile tracing ? */
+  if(event->per_tracefile) {
+		if(has_argument) {
+			fprintf(fd, ",");
+			fprintf(fd, "\n");
+		}
+    fprintf(fd, "unsigned int tracefile_index");
+		has_argument = 1;
+  }
+
 	for(unsigned int j = 0; j < event->fields.position; j++) {
 		/* For each field, print the function argument */
 		field_t *f = (field_t*)event->fields.array[j];
 		type_descriptor_t *t = f->type;
-		if(print_arg(t, fd, 2, basename, f->name)) return 1;
-		if(j < event->fields.position-1) {
+		if(has_argument) {
 			fprintf(fd, ",");
 			fprintf(fd, "\n");
 		}
+		if(print_arg(t, fd, 2, basename, f->name)) return 1;
+		has_argument = 1;
 	}
-	if(event->fields.position == 0) {
+	if(!has_argument) {
 		print_tabs(2, fd);
 		fprintf(fd, "void");
 	}
 	fprintf(fd,")\n");
-	fprintf(fd, "#ifndef CONFIG_LTT\n");
+	fprintf(fd, 
+			"#if (!defined(CONFIG_LTT) || !defined(CONFIG_LTT_FACILITY_%s))\n",
+			fac->capname);
 	fprintf(fd, "{\n");
 	fprintf(fd, "}\n");
 	fprintf(fd,"#else\n");
@@ -1332,7 +1379,8 @@ int print_event_logging_function(char *basename, facility_t *fac,
 	fprintf(fd, "preempt_enable_no_resched();\n");
 
 	fprintf(fd, "}\n");
-	fprintf(fd, "#endif //CONFIG_LTT\n\n");
+	fprintf(fd, "#endif //(!defined(CONFIG_LTT) || !defined(CONFIG_LTT_FACILITY_%s))\n\n",
+			fac->capname);
 	return 0;
 }
 
@@ -1344,9 +1392,10 @@ 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/ltt/ltt-facility-id-%s.h>\n", fac->name);
+  fprintf(fd, "#include <linux/ltt-core.h>\n");
 	fprintf(fd, "\n");
-	fprintf(fd, "/* Facility activation at compile time. */\n");
-	fprintf(fd, "#ifdef CONFIG_LTT_FACILITY_%s\n\n", fac->capname);
 }
 
 
@@ -1418,7 +1467,6 @@ int print_log_header_events(facility_t *fac, FILE *fd)
 
 void print_log_header_tail(facility_t *fac, FILE *fd)
 {
-	fprintf(fd, "#endif //CONFIG_LTT_FACILITY_%s\n\n", fac->capname);
 	fprintf(fd, "#endif //_LTT_FACILITY_%s_H_\n",fac->capname);
 }
 	
@@ -1472,6 +1520,9 @@ int print_id_header(facility_t *fac)
 	char filename[PATH_MAX];
 	unsigned int filename_size = 0;
 	FILE *fd;
+	char basename[PATH_MAX];
+	char basename_len = 0;
+
 	dprintf("%s\n", fac->name);
 
 	strcpy(filename, "ltt-facility-id-");
@@ -1491,6 +1542,41 @@ int print_id_header(facility_t *fac)
 		return errno;
 	}
 
+  fprintf(fd, "#ifndef _LTT_FACILITY_ID_%s_H_\n",fac->capname);
+  fprintf(fd, "#define _LTT_FACILITY_ID_%s_H_\n\n",fac->capname);
+  fprintf(fd, "#ifdef CONFIG_LTT\n");
+
+  fprintf(fd,"#include <linux/ltt-facilities.h>\n\n");
+
+  fprintf(fd,"/****  facility handle  ****/\n\n");
+  fprintf(fd,"extern ltt_facility_t ltt_facility_%s_%X;\n",
+			fac->name, fac->checksum);
+  fprintf(fd,"extern ltt_facility_t ltt_facility_%s;\n\n\n",fac->name);
+
+	strncpy(basename, fac->name, PATH_MAX);
+	basename_len = strlen(basename);
+	strncat(basename, "_", PATH_MAX - basename_len);
+	basename_len++;
+	
+	fprintf(fd,"/****  event index  ****/\n\n");
+	fprintf(fd,"enum %s_event {\n",fac->name);
+	
+	for(unsigned int i = 0; i < fac->events.position; i++) {
+		event_t *event = (event_t*)fac->events.array[i];
+		strncpy(basename+basename_len, event->name, PATH_MAX-basename_len);
+		print_tabs(1, fd);
+		fprintf(fd, "event_%s,\n", basename);
+	}
+	print_tabs(1, fd);
+	fprintf(fd, "facility_%s_num_events\n", fac->name);
+	fprintf(fd, "};\n");
+	fprintf(fd, "\n");
+
+
+  fprintf(fd, "#endif //CONFIG_LTT\n");
+  fprintf(fd, "#endif //_LTT_FACILITY_ID_%s_H_\n",fac->capname);
+
+
 	fclose(fd);
 
 	return 0;
@@ -1523,6 +1609,27 @@ int print_loader_header(facility_t *fac)
 		return errno;
 	}
 
+  fprintf(fd, "#ifndef _LTT_FACILITY_LOADER_%s_H_\n", fac->capname);
+  fprintf(fd, "#define _LTT_FACILITY_LOADER_%s_H_\n\n", fac->capname);
+  fprintf(fd, "#ifdef CONFIG_LTT\n\n");
+  fprintf(fd,"#include <linux/ltt-facilities.h>\n");
+  fprintf(fd,"#include <linux/ltt/ltt-facility-id-%s.h>\n\n",
+			fac->name);
+  fprintf(fd,"ltt_facility_t\tltt_facility_%s;\n", fac->name);
+  fprintf(fd,"ltt_facility_t\tltt_facility_%s_%X;\n\n",
+			fac->name, fac->checksum);
+
+  fprintf(fd,"#define LTT_FACILITY_SYMBOL\t\t\t\t\t\t\tltt_facility_%s\n",
+      fac->name);
+  fprintf(fd,"#define LTT_FACILITY_CHECKSUM_SYMBOL\t\tltt_facility_%s_%X\n",
+      fac->name, fac->checksum);
+  fprintf(fd,"#define LTT_FACILITY_CHECKSUM\t\t\t\t\t\t0x%X\n", fac->checksum);
+  fprintf(fd,"#define LTT_FACILITY_NAME\t\t\t\t\t\t\t\t\"%s\"\n", fac->name);
+  fprintf(fd,"#define LTT_FACILITY_NUM_EVENTS\t\t\t\t\tfacility_%s_num_events\n\n",
+			fac->name);
+  fprintf(fd, "#endif //CONFIG_LTT\n\n");
+  fprintf(fd, "#endif //_LTT_FACILITY_LOADER_%s_H_\n", fac->capname);
+
 	fclose(fd);
 
 	return 0;
@@ -1554,6 +1661,92 @@ int print_loader_c(facility_t *fac)
 		return errno;
 	}
 
+  fprintf(fd, "/*\n");
+  fprintf(fd, " * ltt-facility-loader-%s.c\n", fac->name);
+  fprintf(fd, " *\n");
+  fprintf(fd, " * (C) Copyright  2005 - \n");
+  fprintf(fd, " *          Mathieu Desnoyers (mathieu.desnoyers@polymtl.ca)\n");
+  fprintf(fd, " *\n");
+  fprintf(fd, " * Contains the LTT facility loader.\n");
+  fprintf(fd, " *\n");
+  fprintf(fd, " */\n");
+  fprintf(fd, "\n");
+  fprintf(fd, "\n");
+  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");
+  fprintf(fd, "#include \"ltt-facility-loader-%s.h\"\n", fac->name);
+  fprintf(fd, "\n");
+  fprintf(fd, "\n");
+  fprintf(fd, "#ifdef CONFIG_LTT\n");
+  fprintf(fd, "\n");
+  fprintf(fd, "EXPORT_SYMBOL(LTT_FACILITY_SYMBOL);\n");
+  fprintf(fd, "EXPORT_SYMBOL(LTT_FACILITY_CHECKSUM_SYMBOL);\n");
+  fprintf(fd, "\n");
+  fprintf(fd, "static const char ltt_facility_name[] = LTT_FACILITY_NAME;\n");
+  fprintf(fd, "\n");
+  fprintf(fd, "#define SYMBOL_STRING(sym) #sym\n");
+  fprintf(fd, "\n");
+  fprintf(fd, "static struct ltt_facility facility = {\n");
+  fprintf(fd, "\t.name = ltt_facility_name,\n");
+  fprintf(fd, "\t.num_events = LTT_FACILITY_NUM_EVENTS,\n");
+  fprintf(fd, "\t.checksum = LTT_FACILITY_CHECKSUM,\n");
+  fprintf(fd, "\t.symbol = SYMBOL_STRING(LTT_FACILITY_SYMBOL),\n");
+  fprintf(fd, "};\n");
+  fprintf(fd, "\n");
+  fprintf(fd, "#ifndef MODULE\n");
+  fprintf(fd, "\n");
+  fprintf(fd, "/* Built-in facility. */\n");
+  fprintf(fd, "\n");
+  fprintf(fd, "static int __init facility_init(void)\n");
+  fprintf(fd, "{\n");
+  fprintf(fd, "\tprintk(KERN_INFO \"LTT : ltt-facility-%s init in kernel\\n\");\n", fac->name);
+  fprintf(fd, "\n");
+  fprintf(fd, "\tLTT_FACILITY_SYMBOL = ltt_facility_builtin_register(&facility);\n");
+  fprintf(fd, "\tLTT_FACILITY_CHECKSUM_SYMBOL = LTT_FACILITY_SYMBOL;\n");
+  fprintf(fd, "\t\n");
+  fprintf(fd, "\treturn LTT_FACILITY_SYMBOL;\n");
+  fprintf(fd, "}\n");
+  fprintf(fd, "__initcall(facility_init);\n");
+  fprintf(fd, "\n");
+  fprintf(fd, "\n");
+  fprintf(fd, "\n");
+  fprintf(fd, "#else \n");
+  fprintf(fd, "\n");
+  fprintf(fd, "/* Dynamic facility. */\n");
+  fprintf(fd, "\n");
+  fprintf(fd, "static int __init facility_init(void)\n");
+  fprintf(fd, "{\n");
+  fprintf(fd, "\tprintk(KERN_INFO \"LTT : ltt-facility-%s init dynamic\\n\");\n", fac->name);
+  fprintf(fd, "\n");
+  fprintf(fd, "\tLTT_FACILITY_SYMBOL = ltt_facility_dynamic_register(&facility);\n");
+  fprintf(fd, "\tLTT_FACILITY_CHECKSUM_SYMBOL = LTT_FACILITY_SYMBOL;\n");
+  fprintf(fd, "\n");
+  fprintf(fd, "\treturn LTT_FACILITY_SYMBOL;\n");
+  fprintf(fd, "}\n");
+  fprintf(fd, "\n");
+  fprintf(fd, "static void __exit facility_exit(void)\n");
+  fprintf(fd, "{\n");
+  fprintf(fd, "\tint err;\n");
+  fprintf(fd, "\n");
+  fprintf(fd, "\terr = ltt_facility_dynamic_unregister(LTT_FACILITY_SYMBOL);\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");
+  fprintf(fd, "\n");
+  fprintf(fd, "module_init(facility_init)\n");
+  fprintf(fd, "module_exit(facility_exit)\n");
+  fprintf(fd, "\n");
+  fprintf(fd, "\n");
+  fprintf(fd, "MODULE_LICENSE(\"GPL\");\n");
+  fprintf(fd, "MODULE_AUTHOR(\"Mathieu Desnoyers\");\n");
+  fprintf(fd, "MODULE_DESCRIPTION(\"Linux Trace Toolkit Facility\");\n");
+  fprintf(fd, "\n");
+  fprintf(fd, "#endif //MODULE\n");
+  fprintf(fd, "\n");
+  fprintf(fd, "#endif //CONFIG_LTT\n");
 
 	fclose(fd);