#define dprintf(...)
#endif
+
+enum user_fct_types { USER_FCT_PROTO, USER_FCT_DECLARATION } ;
+
/* Code printing */
void print_tabs(unsigned int tabs, FILE *fd)
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);
}
print_tabs(2, fd);
- fprintf(fd, "void *buffer,\n");
+ fprintf(fd, "char *buffer,\n");
print_tabs(2, fd);
fprintf(fd, "size_t *to_base,\n");
print_tabs(2, fd);
fprintf(fd, "size_t *to,\n");
print_tabs(2, fd);
- fprintf(fd, "const void **from,\n");
+ fprintf(fd, "const char **from,\n");
print_tabs(2, fd);
fprintf(fd, "size_t *len,\n");
print_tabs(2, fd);
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);
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);
// 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);
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);
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);
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);
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);
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);
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);
print_tabs(1, fd);
fprintf(fd, "void *transport_data;\n");
print_tabs(1, fd);
- fprintf(fd, "void *buffer = NULL;\n");
+ fprintf(fd, "char *buffer = NULL;\n");
print_tabs(1, fd);
fprintf(fd, "size_t real_to_base = 0; /* The buffer is allocated on arch_size alignment */\n");
print_tabs(1, fd);
print_tabs(1, fd);
}
- fprintf(fd, "const void *real_from;\n");
+ fprintf(fd, "const char *real_from;\n");
print_tabs(1, fd);
- fprintf(fd, "const void **from = &real_from;\n");
+ fprintf(fd, "const char **from = &real_from;\n");
print_tabs(1, fd);
}
fprintf(fd, "u64 tsc;\n");
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.
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 = <tng_param_%s;\n", field->name);
+ fprintf(fd, "*from = (const char*)<tng_param_%s;\n", field->name);
break;
}
} 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");
print_tabs(1, fd);
fprintf(fd, "list_for_each_entry_rcu(trace, <t_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);
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");
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 = <tng_param_%s;\n", field->name);
+ fprintf(fd, "*from = (const char*)<tng_param_%s;\n", field->name);
break;
}
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);
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 = "";
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) {
fprintf(fd, "\n");
}
print_tabs(2, fd);
- fprintf(fd, "void *buffer");
+ fprintf(fd, "char *buffer");
has_argument = 1;
fprintf(fd, ",");
fprintf(fd, "\n");
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");
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;
}
print_tabs(1, fd);
- fprintf(fd, "void *buffer = NULL;\n");
+ fprintf(fd, "char *buffer = NULL;\n");
print_tabs(1, fd);
fprintf(fd, "size_t real_to_base = 0; /* The buffer is allocated on arch_size alignment */\n");
print_tabs(1, fd);
print_tabs(1, fd);
}
- fprintf(fd, "const void *real_from;\n");
+ fprintf(fd, "const char *real_from;\n");
print_tabs(1, fd);
- fprintf(fd, "const void **from = &real_from;\n");
+ fprintf(fd, "const char **from = &real_from;\n");
print_tabs(1, fd);
}
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 = <tng_param_%s;\n", field->name);
+ fprintf(fd, "*from = (const char*)<tng_param_%s;\n", field->name);
break;
}
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 = <tng_param_%s;\n", field->name);
+ fprintf(fd, "*from = (const char*)<tng_param_%s;\n", field->name);
break;
}
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);
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");
print_tabs(1, fd);
fprintf(fd, "struct ltt_buf *ltt_buf;\n");
print_tabs(1, fd);
- fprintf(fd, "void *buffer = NULL;\n");
+ fprintf(fd, "char *buffer = NULL;\n");
print_tabs(1, fd);
fprintf(fd, "size_t real_to_base = 0; /* The buffer is allocated on arch_size alignment */\n");
print_tabs(1, fd);
print_tabs(1, fd);
}
- fprintf(fd, "const void *real_from;\n");
+ fprintf(fd, "const char *real_from;\n");
print_tabs(1, fd);
- fprintf(fd, "const void **from = &real_from;\n");
+ fprintf(fd, "const char **from = &real_from;\n");
print_tabs(1, fd);
}
fprintf(fd, "uint64_t tsc;\n");
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);
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 = <tng_param_%s;\n", field->name);
+ fprintf(fd, "*from = (const char*)<tng_param_%s;\n", field->name);
break;
}
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);
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);
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");
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 = <tng_param_%s;\n", field->name);
+ fprintf(fd, "*from = (const char*)<tng_param_%s;\n", field->name);
break;
}
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);
// 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");
{
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");
}
{
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");
}
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);
}
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);
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);
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");
fprintf(fd, "\terr = ltt_register_generic(<T_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");
projects / lttv.git / blobdiff