char basename[PATH_MAX];
unsigned int basename_len = 0;
+ if(td->custom_write) return 0; /* Does print custom type */
+
strncpy(basename, nest_name, PATH_MAX);
basename_len = strlen(basename);
fprintf(fd, " {\n");
for(unsigned int i=0;i<td->labels.position;i++){
print_tabs(1, fd);
- fprintf(fd, "LTTNG_%s", ((char*)(td->labels.array[i])));
+ fprintf(fd, "LTTNG_%s = %d", ((char*)td->labels.array[i]),
+ (*(int*)td->labels_values.array[i]));
fprintf(fd, ",\n");
}
fprintf(fd, "};\n");
char basename[PATH_MAX];
unsigned int basename_len = 0;
char get_ptr_char[2] = "";
+ char custom[PATH_MAX] = "";
strncpy(basename, nest_name, PATH_MAX);
basename_len = strlen(basename);
strcpy(get_ptr_char, "&");
}
+ if(td->custom_write) {
+ strcpy(custom, "_custom");
+ }
+
switch(td->type) {
case INT_FIXED:
case UINT_FIXED:
case STRING:
print_tabs(tabs, fd);
fprintf(fd,
- "lttng_write_string_%s(buffer, to_base, to, from, len, %s%s);\n",
- basename, obj_prefix, field_name);
+ "lttng_write%s_string_%s(buffer, to_base, to, from, len, %s%s);\n",
+ custom, basename, obj_prefix, field_name);
break;
case SEQUENCE:
print_tabs(tabs, fd);
fprintf(fd,
- "lttng_write_sequence_%s(buffer, to_base, to, from, len, %s%s%s);",
- basename, get_ptr_char, obj_prefix, field_name);
+ "lttng_write%s_sequence_%s(buffer, to_base, to, from, len, %s%s%s);",
+ custom, basename, get_ptr_char, obj_prefix, field_name);
break;
case STRUCT:
print_tabs(tabs, fd);
fprintf(fd,
- "lttng_write_struct_%s(buffer, to_base, to, from, len, %s%s%s);",
- basename, get_ptr_char, obj_prefix, field_name);
+ "lttng_write%s_struct_%s(buffer, to_base, to, from, len, %s%s%s);",
+ custom, basename, get_ptr_char, obj_prefix, field_name);
break;
case UNION:
print_tabs(tabs, fd);
fprintf(fd,
- "lttng_write_union_%s(buffer, to_base, to, from, len, %s%s%s);",
- basename, get_ptr_char, obj_prefix, field_name);
+ "lttng_write%s_union_%s(buffer, to_base, to, from, len, %s%s%s);",
+ custom, basename, get_ptr_char, obj_prefix, field_name);
break;
case ARRAY:
print_tabs(tabs, fd);
fprintf(fd,
- "lttng_write_array_%s(buffer, to_base, to, from, len, %s%s);",
- basename, obj_prefix, field_name);
+ "lttng_write%s_array_%s(buffer, to_base, to, from, len, %s%s);",
+ custom, basename, obj_prefix, field_name);
break;
case NONE:
printf("Error : type NONE unexpected\n");
char basename[PATH_MAX];
unsigned int basename_len = 0;
+ if(td->custom_write) return 0; /* Does print custom type */
+
strncpy(basename, nest_name, PATH_MAX);
basename_len = strlen(basename);
char basename[PATH_MAX];
unsigned int basename_len = 0;
+ if(td->custom_write) return 0; /* Does print custom type */
+
strncpy(basename, nest_name, PATH_MAX);
basename_len = strlen(basename);
fprintf(fd, "{\n");
- print_tabs(1, fd);
- fprintf(fd, "size_t size;\n");
+ switch(td->type) {
+ case STRING:
+ print_tabs(1, fd);
+ fprintf(fd, "size_t size;\n");
+ break;
+ default:
+ break;
+ }
+
print_tabs(1, fd);
fprintf(fd, "size_t align;\n");
fprintf(fd, "\n");
fprintf(fd, "/* Contains only fixed size fields : use compiler sizeof() */\n");
fprintf(fd, "\n");
print_tabs(1, fd);
- fprintf(fd, "size = sizeof(");
+ fprintf(fd, "*len += sizeof(");
if(print_type(td, fd, 0, basename, field_name)) return 1;
fprintf(fd, ");\n");
- print_tabs(1, fd);
- fprintf(fd, "*len += size;\n");
} else {
/* The type contains nested variable size subtypes :
* we must write field by field. */
fprintf(fd, "const void **from = &real_from;\n");
print_tabs(1, fd);
}
- fprintf(fd, "cycles_t tsc;\n");
+ 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");
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/ltt/ltt-facility-id-%s.h>\n", fac->name);
+ if(!fac->arch)
+ fprintf(fd, "#include <linux/ltt/ltt-facility-id-%s.h>\n", fac->name);
+ else
+ fprintf(fd, "#include <asm/ltt/ltt-facility-id-%s_%s.h>\n",
+ fac->name,
+ fac->arch);
fprintf(fd, "#include <linux/ltt-core.h>\n");
fprintf(fd, "\n");
}
strncat(filename, fac->name, PATH_MAX - filename_size);
filename_size = strlen(filename);
+ if(fac->arch) {
+ strncat(filename, "_", PATH_MAX - filename_size);
+ filename_size = strlen(filename);
+
+ strncat(filename, fac->arch, PATH_MAX - filename_size);
+ filename_size = strlen(filename);
+ }
+
strncat(filename, ".h", PATH_MAX - filename_size);
filename_size = strlen(filename);
strncat(filename, fac->name, PATH_MAX - filename_size);
filename_size = strlen(filename);
+ if(fac->arch) {
+ strncat(filename, "_", PATH_MAX - filename_size);
+ filename_size = strlen(filename);
+
+ strncat(filename, fac->arch, PATH_MAX - filename_size);
+ filename_size = strlen(filename);
+ }
+
strncat(filename, ".h", PATH_MAX - filename_size);
filename_size = strlen(filename);
strncat(filename, fac->name, PATH_MAX - filename_size);
filename_size = strlen(filename);
+ if(fac->arch) {
+ strncat(filename, "_", PATH_MAX - filename_size);
+ filename_size = strlen(filename);
+
+ strncat(filename, fac->arch, PATH_MAX - filename_size);
+ filename_size = strlen(filename);
+ }
+
strncat(filename, ".h", PATH_MAX - filename_size);
filename_size = strlen(filename);
fprintf(fd, "#define _LTT_FACILITY_LOADER_%s_H_\n\n", fac->capname);
fprintf(fd, "#ifdef CONFIG_LTT\n\n");
fprintf(fd,"#include <linux/ltt-facilities.h>\n");
- fprintf(fd,"#include <linux/ltt/ltt-facility-id-%s.h>\n\n",
- fac->name);
+ if(!fac->arch)
+ fprintf(fd,"#include <linux/ltt/ltt-facility-id-%s.h>\n\n",
+ fac->name);
+ else
+ fprintf(fd,"#include <asm/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,"ltt_facility_t\tltt_facility_%s_%X;\n\n",
fac->name, fac->checksum);
strncat(filename, fac->name, PATH_MAX - filename_size);
filename_size = strlen(filename);
+ if(fac->arch) {
+ strncat(filename, "_", PATH_MAX - filename_size);
+ filename_size = strlen(filename);
+
+ strncat(filename, fac->arch, PATH_MAX - filename_size);
+ filename_size = strlen(filename);
+ }
+
strncat(filename, ".c", PATH_MAX - filename_size);
filename_size = strlen(filename);
}
fprintf(fd, "/*\n");
- fprintf(fd, " * ltt-facility-loader-%s.c\n", fac->name);
+ if(!fac->arch)
+ fprintf(fd, " * ltt-facility-loader-%s.c\n", fac->name);
+ else
+ fprintf(fd, " * ltt-facility-loader-%s_%s.c\n", fac->name, fac->arch);
fprintf(fd, " *\n");
fprintf(fd, " * (C) Copyright 2005 - \n");
fprintf(fd, " * Mathieu Desnoyers (mathieu.desnoyers@polymtl.ca)\n");
fprintf(fd, "#include <linux/module.h>\n");
fprintf(fd, "#include <linux/init.h>\n");
fprintf(fd, "#include <linux/config.h>\n");
- fprintf(fd, "#include \"ltt-facility-loader-%s.h\"\n", fac->name);
+ if(!fac->arch)
+ fprintf(fd, "#include \"ltt-facility-loader-%s.h\"\n", fac->name);
+ else
+ fprintf(fd, "#include \"ltt-facility-loader-%s_%s.h\"\n",
+ fac->name, fac->arch);
fprintf(fd, "\n");
fprintf(fd, "\n");
fprintf(fd, "#ifdef CONFIG_LTT\n");