traced_tid with gettid

[lttv.git] / genevent-new / genevent.c

diff --git a/genevent-new/genevent.c b/genevent-new/genevent.c
index f3768ce7ce378007898c8e242280438c09c836aa..b912104609e135ac9e5e7cad1c907e8078d74ee1 100644 (file)
--- a/genevent-new/genevent.c
+++ b/genevent-new/genevent.c
@@ -1588,20 +1588,44 @@ int print_event_logging_function(char *basename, facility_t *fac,
 int print_event_logging_function_user(char *basename, facility_t *fac,
                event_t *event, FILE *fd)
 {
-       fprintf(fd, "static inline int trace_%s(\n", basename);
+       char *attrib;
+       if(event->no_instrument_function) {
+               attrib = "__attribute__((no_instrument_function)) ";
+       } else {
+               attrib = "";
+       }
+       if(event->param_buffer) {
+               fprintf(fd, "static inline %sint trace_%s_param_buffer(\n", attrib, basename);
+       } else {
+               fprintf(fd, "static inline %sint trace_%s(\n",attrib, basename);
+       }
        int     has_argument = 0;
        int has_type_fixed = 0;
 
-       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(event->param_buffer) {
                if(has_argument) {
-                       fprintf(fd, ",");
-                       fprintf(fd, "\n");
+                               fprintf(fd, ",");
+                               fprintf(fd, "\n");
                }
-               if(print_arg(t, fd, 2, basename, f->name)) return 1;
+               print_tabs(2, fd);
+               fprintf(fd, "void *buffer");
                has_argument = 1;
+               fprintf(fd, ",");
+               fprintf(fd, "\n");
+               print_tabs(2, fd);
+               fprintf(fd, "size_t reserve_size");
+       } else {
+               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(has_argument) {
+                               fprintf(fd, ",");
+                               fprintf(fd, "\n");
+                       }
+                       if(print_arg(t, fd, 2, basename, f->name)) return 1;
+                       has_argument = 1;
+               }
        }
        if(!has_argument) {
                print_tabs(2, fd);
@@ -1616,6 +1640,15 @@ int print_event_logging_function_user(char *basename, facility_t *fac,
        fprintf(fd, "{\n");
        /* Print the function variables */
        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");
+               print_tabs(1, fd);
+               fprintf(fd, "{\n");
+               goto do_syscall;
+       }
+       print_tabs(1, fd);
        fprintf(fd, "void *buffer = NULL;\n");
        print_tabs(1, fd);
        fprintf(fd, "size_t real_to_base = 0; /* The buffer is allocated on arch_size alignment */\n");
@@ -1634,8 +1667,6 @@ int print_event_logging_function_user(char *basename, facility_t *fac,
        print_tabs(1, fd);
        fprintf(fd, "size_t slot_size;\n");
        print_tabs(1, fd);
-       fprintf(fd, "int ret = 0;\n");
-       print_tabs(1, fd);
 
        if(event->fields.position > 0) {
                for(unsigned int i=0;i<event->fields.position;i++){
@@ -1758,9 +1789,9 @@ int print_event_logging_function_user(char *basename, facility_t *fac,
                fprintf(fd, "\n");
        }
 
-       
+do_syscall:
        print_tabs(2, fd);
-       fprintf(fd, "ret = ltt_trace_generic(ltt_facility_%s_%X, event_%s_%s, stack_buffer, sizeof(stack_buffer));\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);\n", fac->name, fac->checksum, fac->name, event->name);
 
        print_tabs(1, fd);
        fprintf(fd, "}\n\n");
@@ -2380,13 +2411,17 @@ int print_loader_c_user(facility_t *fac)
   fprintf(fd, "static void __attribute__((constructor)) __ltt_user_init(void)\n");
   fprintf(fd, "{\n");
   fprintf(fd, "\tint err;\n");
+       fprintf(fd, "#ifdef LTT_SHOW_DEBUG\n");
   fprintf(fd, "\tprintf(\"LTT : ltt-facility-%s init in userspace\\n\");\n", fac->name);
+       fprintf(fd, "#endif //LTT_SHOW_DEBUG\n");
   fprintf(fd, "\n");
   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, "#ifdef LTT_SHOW_DEBUG\n");
   fprintf(fd, "\t\tperror(\"Error in ltt_register_generic\");\n");
+       fprintf(fd, "#endif //LTT_SHOW_DEBUG\n");
   fprintf(fd, "\t}\n");
   fprintf(fd, "}\n");
   fprintf(fd, "\n");