projects / lttv.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
userspace markers initial code
[lttv.git] / genevent / genevent.c
diff --git a/genevent/genevent.c b/genevent/genevent.c
index 724dad00f46ec04e6ab1f9b42d1ee9ff2a07451b..fd7b2b73900e73f9f088ebb8ab9fab5f3f2acca6 100644 (file)
--- a/genevent/genevent.c
+++ b/genevent/genevent.c
@@ -489,7 +489,10 @@ int print_type_declaration(type_descriptor_t * td, FILE *fd, unsigned int tabs,
                                fprintf(fd, "%s", field->name);
                                fprintf(fd, ";\n");
                        }
-                       fprintf(fd, "} LTT_ALIGN;\n");
+      if(td->fac->align)
+                         fprintf(fd, "} LTT_ALIGN;\n");
+      else
+                         fprintf(fd, "};\n");
                        fprintf(fd, "\n");
                        break;
        case UNION:
@@ -513,7 +516,10 @@ int print_type_declaration(type_descriptor_t * td, FILE *fd, unsigned int tabs,
                                fprintf(fd, "%s", field->name);
                                fprintf(fd, ";\n");
                        }
-                       fprintf(fd, "} LTT_ALIGN;\n");
+      if(td->fac->align)
+                         fprintf(fd, "} LTT_ALIGN;\n");
+      else
+                         fprintf(fd, "};\n");
                        fprintf(fd, "\n");
                        break;
        default:
@@ -719,11 +725,14 @@ int print_type_write(type_descriptor_t * td, FILE *fd, unsigned int tabs,
                case ENUM:
                        print_tabs(tabs, fd);
                        fprintf(fd, "align = ");
-                       if(print_type_alignment(td, fd, 0, basename, "", "obj")) return 1;
+      if(td->fac->align) {
+                         if(print_type_alignment(td, fd, 0, basename, "", "obj")) return 1;
+      } else
+                         fprintf(fd, "0");
                        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);
@@ -842,6 +851,7 @@ int print_type_alignment_fct(type_descriptor_t * td, FILE *fd,
        unsigned int basename_len = 0;
        
        if(td->custom_write) return 0;  /* Does print custom type */
+  if(td->fac->align == 0) return 0;
 
        strncpy(basename, nest_name, PATH_MAX);
        basename_len = strlen(basename);
@@ -1185,7 +1195,10 @@ int print_type_write_fct(type_descriptor_t * td, FILE *fd, unsigned int tabs,
        
        print_tabs(1, fd);
        fprintf(fd, "align = ");
-       if(print_type_alignment(td, fd, 0, basename, "", "obj")) return 1;
+  if(td->fac->align) {
+         if(print_type_alignment(td, fd, 0, basename, "", "obj")) return 1;
+  } else
+         fprintf(fd, "0");
        fprintf(fd, ";\n");
        fprintf(fd, "\n");
        print_tabs(1, fd);
@@ -1230,7 +1243,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);
@@ -1278,7 +1291,8 @@ int print_type_write_fct(type_descriptor_t * td, FILE *fd, unsigned int tabs,
                                print_tabs(1, fd);
                                fprintf(fd, "/* Realign the *to_base on arch size, set *to to 0 */\n");
                                print_tabs(1, fd);
-                               fprintf(fd, "*to += ltt_align(*to, sizeof(void *));\n");
+        if(td->fac->align)
+                                 fprintf(fd, "*to += ltt_align(*to, sizeof(void *));\n");
                                print_tabs(1, fd);
                                fprintf(fd, "*to_base = *to_base+*to;\n");
                                print_tabs(1, fd);
@@ -1302,7 +1316,8 @@ int print_type_write_fct(type_descriptor_t * td, FILE *fd, unsigned int tabs,
                                print_tabs(1, fd);
                                fprintf(fd, "/* Realign the *to_base on arch size, set *to to 0 */\n");
                                print_tabs(1, fd);
-                               fprintf(fd, "*to += ltt_align(*to, sizeof(void *));\n");
+        if(td->fac->align)
+                                 fprintf(fd, "*to += ltt_align(*to, sizeof(void *));\n");
                                print_tabs(1, fd);
                                fprintf(fd, "*to_base = *to_base+*to;\n");
                                print_tabs(1, fd);
@@ -1460,15 +1475,15 @@ int print_event_logging_function(char *basename, facility_t *fac,
                print_tabs(1, fd);
        }
        fprintf(fd, "u64 tsc;\n");
-       print_tabs(1, fd);
-       fprintf(fd, "size_t before_hdr_pad, after_hdr_pad, header_size;\n");
        fprintf(fd, "\n");
        
-       print_tabs(1, fd);
-       fprintf(fd, "if (ltt_traces.num_active_traces == 0)\n");
-       print_tabs(2, fd);
-       fprintf(fd, "return;\n");
-       fprintf(fd, "\n");
+       if(!event->force) {
+               print_tabs(1, fd);
+               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.
         * Assume that the padding for alignment starts at a void*
@@ -1535,10 +1550,12 @@ int print_event_logging_function(char *basename, facility_t *fac,
        /* For each trace */
        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)\n");
-       print_tabs(3, fd);
-       fprintf(fd, "continue;\n\n");
+       if(!event->force) {
+               print_tabs(2, fd);
+               fprintf(fd, "if (!trace->active)\n");
+               print_tabs(3, fd);
+               fprintf(fd, "continue;\n\n");
+       }
 
        if(event->per_trace) {
                print_tabs(2, fd);
@@ -1560,12 +1577,10 @@ int print_event_logging_function(char *basename, facility_t *fac,
        print_tabs(2, fd);
        fprintf(fd, "buffer = ltt_reserve_slot(trace, channel, &transport_data,\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");
+       fprintf(fd, "reserve_size, &slot_size, &tsc);\n");
        /* If error, return */
        print_tabs(2, fd);
-       fprintf(fd, "if(!buffer)\n");
+       fprintf(fd, "if (!buffer)\n");
        print_tabs(3, fd);
        fprintf(fd, "continue; /* buffer full */\n\n");
        //print_tabs(2, fd);
@@ -1576,23 +1591,39 @@ int print_event_logging_function(char *basename, facility_t *fac,
        fprintf(fd, "\n");
 
        /* Write event header */
-       print_tabs(2, fd);
-       fprintf(fd, "ltt_write_event_header(trace, channel, buffer,\n");
-       print_tabs(3, fd);
-       fprintf(fd, "ltt_facility_%s_%X, event_%s_%s,\n", fac->name, fac->checksum,
-                                                                       fac->name, event->name);
-       print_tabs(3, fd);
-       fprintf(fd, "reserve_size, before_hdr_pad, tsc);\n");
-       print_tabs(2, fd);
-       fprintf(fd, "*to_base += before_hdr_pad + after_hdr_pad + header_size;\n");
-       fprintf(fd, "\n");
+       if(strcmp("compact", fac->name) != 0) {
+               print_tabs(2, fd);
+               fprintf(fd, "buffer = ltt_write_event_header(trace, channel, buffer,\n");
+               print_tabs(3, fd);
+               fprintf(fd, "ltt_facility_%s_%X, event_%s_%s,\n", fac->name, fac->checksum,
+                                                                               fac->name, event->name);
+               print_tabs(3, fd);
+               fprintf(fd, "reserve_size, tsc);\n");
+       } else {
+               print_tabs(2, fd);
+               fprintf(fd, "buffer = ltt_write_compact_header(trace, channel, buffer,\n");
+               print_tabs(3, fd);
+               fprintf(fd, "ltt_facility_%s_%X, event_%s_%s,\n", fac->name, fac->checksum,
+                                                                               fac->name, event->name);
+               print_tabs(3, fd);
+               if(event->compact_data) {
+                       assert(event->fields.position > 0);
+                       field_t *field = (field_t*)(event->fields.array[0]);
+                       fprintf(fd, "reserve_size, tsc, lttng_param_%s);\n",
+                               field->name);
+               } else
+                       fprintf(fd, "reserve_size, tsc, 0);\n");
+       }
        
        /* write data. */
 
        for(unsigned int i=0;i<event->fields.position;i++){
                field_t *field = (field_t*)(event->fields.array[i]);
                type_descriptor_t *type = field->type;
-       
+
+               /* First param is compacted in the header */
+               if(event->compact_data && i == 0)
+                       continue;
                /* Set from */
                print_tabs(2, fd);
                switch(type->type) {
@@ -1645,7 +1676,7 @@ 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");
 #if 0
@@ -1986,8 +2017,6 @@ int print_event_logging_function_user_fast(char *basename, facility_t *fac,
        }
        fprintf(fd, "uint64_t tsc;\n");
        print_tabs(1, fd);
-       fprintf(fd, "size_t before_hdr_pad, after_hdr_pad, header_size;\n");
-       fprintf(fd, "\n");
        
        print_tabs(1, fd);
        fprintf(fd, "if (!trace) {\n");
@@ -2073,9 +2102,7 @@ int print_event_logging_function_user_fast(char *basename, facility_t *fac,
        print_tabs(2, fd);
        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");
+       fprintf(fd, "reserve_size, &slot_size, &tsc);\n");
        /* If error, return */
        print_tabs(2, fd);
        fprintf(fd, "if (!buffer)\n");
@@ -2090,15 +2117,12 @@ int print_event_logging_function_user_fast(char *basename, facility_t *fac,
 
        /* Write event header */
        print_tabs(2, fd);
-       fprintf(fd, "ltt_write_event_header(trace, ltt_buf, buffer,\n");
+       fprintf(fd, "buffer = ltt_write_event_header(trace, ltt_buf, buffer,\n");
        print_tabs(3, fd);
        fprintf(fd, "ltt_facility_%s_%X, event_%s_%s,\n", fac->name, fac->checksum,
                                                                        fac->name, event->name);
        print_tabs(3, fd);
-       fprintf(fd, "reserve_size, before_hdr_pad, tsc);\n");
-       print_tabs(2, fd);
-       fprintf(fd, "*to_base += before_hdr_pad + after_hdr_pad + header_size;\n");
-       fprintf(fd, "\n");
+       fprintf(fd, "reserve_size, tsc);\n");
        
        /* write data. */
 
@@ -2224,7 +2248,8 @@ int print_log_header_types(facility_t *fac, FILE *fd)
                if(print_type_declaration(types->array[i], fd,
                                                0, "", "")) return 1;
                /* Print also the align function */
-               if(print_type_alignment_fct(types->array[i], fd,
+    if(((type_descriptor_t*)types->array[i])->fac->align)
+                 if(print_type_alignment_fct(types->array[i], fd,
                                                0, "", "")) return 1;
                /* Print also the write function */
                if(print_type_write_fct(types->array[i], fd,
@@ -2258,7 +2283,9 @@ int print_log_header_events(facility_t *fac, FILE *fd)
                        if(t->type_name == NULL) {
                                if((print_type_declaration(t, fd, 0, basename, f->name))) return 1;
                                /* Print also the align function */
-                               if((print_type_alignment_fct(t, fd, 0, basename, f->name))) return 1;
+        if(fac->align) {
+                                 if((print_type_alignment_fct(t, fd, 0, basename, f->name))) return 1;
+        }
                                /* Print also the write function */
                                if((print_type_write_fct(t, fd, 0, basename, f->name))) return 1;
                        }
@@ -2519,6 +2546,8 @@ int print_loader_header(facility_t *fac)
   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,"extern unsigned int ltt_get_channel_index_%s(u8 eID);\n\n",
+                       fac->name);
 
   fprintf(fd,"#define LTT_FACILITY_SYMBOL\t\tltt_facility_%s\n",
       fac->name);
@@ -2528,6 +2557,10 @@ int print_loader_header(facility_t *fac)
   fprintf(fd,"#define LTT_FACILITY_NAME\t\t\"%s\"\n", fac->name);
   fprintf(fd,"#define LTT_FACILITY_NUM_EVENTS\tfacility_%s_num_events\n\n",
                        fac->name);
+  fprintf(fd,"#define LTT_FACILITY_ALIGNMENT\t\t%u\n\n",
+                       fac->align);
+  fprintf(fd,"#define LTT_FACILITY_SELECT\t\tltt_get_channel_index_%s\n\n",
+                       fac->name);
   fprintf(fd, "#endif //CONFIG_LTT\n\n");
   fprintf(fd, "#endif //_LTT_FACILITY_LOADER_%s_H_\n", fac->capname);
 
@@ -2590,6 +2623,8 @@ int print_loader_header_user(facility_t *fac)
   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,"#define LTT_FACILITY_ALIGNMENT\t\t\t\t\t%u\n\n",
+                       fac->align);
   fprintf(fd, "#endif //_LTT_FACILITY_LOADER_%s_H_\n", fac->capname);
 
        fclose(fd);
@@ -2650,7 +2685,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
@@ -2672,6 +2706,8 @@ int print_loader_c(facility_t *fac)
   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, "\t.alignment = LTT_FACILITY_ALIGNMENT,\n");
+  fprintf(fd, "\t.select = LTT_FACILITY_SELECT,\n");
   fprintf(fd, "};\n");
   fprintf(fd, "\n");
   fprintf(fd, "static int __init facility_init(void)\n");
@@ -2772,7 +2808,7 @@ int print_loader_c_user(facility_t *fac)
   fprintf(fd, "\t.name = LTT_FACILITY_NAME,\n");
   fprintf(fd, "\t.num_events = LTT_FACILITY_NUM_EVENTS,\n");
   fprintf(fd, "#ifndef LTT_PACK\n");
-  fprintf(fd, "\t.alignment = sizeof(void*),\n");
+  fprintf(fd, "\t.alignment = LTT_FACILITY_ALIGNMENT?sizeof(void*):0,\n");
   fprintf(fd, "#else\n");
   fprintf(fd, "\t.alignment = 0,\n");
   fprintf(fd, "#endif //LTT_PACK\n");
LTTng 2.x Viewer (LTTV)
This page took 0.029048 seconds and 4 git commands to generate.