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:
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:
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);
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);
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);
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);
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);
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*
/* For each trace */
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)\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);
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");
+ if(strcmp("compact", fac->name) != 0) {
+ 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");
+ } else {
+ print_tabs(2, fd);
+ fprintf(fd, "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, before_hdr_pad, tsc, lttng_param_%s);\n",
+ field->name);
+ } else
+ fprintf(fd, "reserve_size, before_hdr_pad, tsc, 0);\n");
+ }
print_tabs(2, fd);
fprintf(fd, "*to_base += before_hdr_pad + after_hdr_pad + header_size;\n");
fprintf(fd, "\n");
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) {
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
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,
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;
}
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, "#endif //CONFIG_LTT\n\n");
fprintf(fd, "#endif //_LTT_FACILITY_LOADER_%s_H_\n", fac->capname);
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);
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, "};\n");
fprintf(fd, "\n");
fprintf(fd, "static int __init facility_init(void)\n");
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");