update compat

[lttv.git] / genevent / genevent.c

diff --git a/genevent/genevent.c b/genevent/genevent.c
index 88fbde1576e54d7ba313834f880542407047ff0b..93b6215e3b83bea1df090319e6fbb7f1bdde9000 100644 (file)
--- a/genevent/genevent.c
+++ b/genevent/genevent.c
@@ -224,11 +224,11 @@ int print_arg(type_descriptor_t * td, FILE *fd, unsigned int tabs,
        switch(td->type) {
                case INT_FIXED:
                        fprintf(fd, "%s", intOutputTypes[getSizeindex(td->size)]);
-                       fprintf(fd, "lttng_param_%s", field_name);
+                       fprintf(fd, " lttng_param_%s", field_name);
                        break;
                case UINT_FIXED:
                        fprintf(fd, "%s", uintOutputTypes[getSizeindex(td->size)]);
-                       fprintf(fd, "lttng_param_%s", field_name);
+                       fprintf(fd, " lttng_param_%s", field_name);
                        break;
                case CHAR:
                        fprintf(fd, "signed char");
@@ -1413,7 +1413,7 @@ int print_event_logging_function(char *basename, facility_t *fac,
        print_tabs(1, fd);
        fprintf(fd, "struct ltt_trace_struct *trace;\n");
        print_tabs(1, fd);
-       fprintf(fd, "struct rchan_buf *relayfs_buf;\n");
+       fprintf(fd, "void *transport_data;\n");
        print_tabs(1, fd);
        fprintf(fd, "void *buffer = NULL;\n");
        print_tabs(1, fd);
@@ -1538,8 +1538,6 @@ int print_event_logging_function(char *basename, facility_t *fac,
  
        print_tabs(2, fd);
        fprintf(fd, "channel = ltt_get_channel_from_index(trace, index);\n");
-       print_tabs(2, fd);
-       fprintf(fd, "relayfs_buf = channel->rchan->buf[smp_processor_id()];\n");
        fprintf(fd, "\n");
 
        
@@ -1549,7 +1547,7 @@ int print_event_logging_function(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, relayfs_buf,\n");
+       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);
@@ -1625,7 +1623,7 @@ int print_event_logging_function(char *basename, facility_t *fac,
        // for DEBUG only.
        //fprintf(fd, "commit:\n"); /* DEBUG! */
        print_tabs(2, fd);
-       fprintf(fd, "ltt_commit_slot(relayfs_buf, buffer, slot_size);\n\n");
+       fprintf(fd, "ltt_commit_slot(channel, &transport_data, buffer, slot_size);\n\n");
        
        print_tabs(1, fd);
        fprintf(fd, "}\n\n");
@@ -2046,7 +2044,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,\n");
+       fprintf(fd, "buffer = ltt_reserve_slot(trace, ltt_buf, &transport_data,\n");
        print_tabs(3, fd);
        fprintf(fd, "reserve_size, &slot_size, &tsc,\n");
        print_tabs(3, fd);
@@ -2122,7 +2120,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, buffer, slot_size);\n\n");
+       fprintf(fd, "ltt_commit_slot(ltt_buf, &transport_data, buffer, slot_size);\n\n");
        
        fprintf(fd, "}\n\n");
 
@@ -2485,13 +2483,13 @@ int print_loader_header(facility_t *fac)
   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",
+  fprintf(fd,"#define LTT_FACILITY_SYMBOL\t\tltt_facility_%s\n",
       fac->name);
-  fprintf(fd,"#define LTT_FACILITY_CHECKSUM_SYMBOL\t\tltt_facility_%s_%X\n",
+  fprintf(fd,"#define LTT_FACILITY_CHECKSUM_SYMBOL\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",
+  fprintf(fd,"#define LTT_FACILITY_CHECKSUM\t\t0x%X\n", fac->checksum);
+  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, "#endif //CONFIG_LTT\n\n");
   fprintf(fd, "#endif //_LTT_FACILITY_LOADER_%s_H_\n", fac->capname);