projects
/
lttv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
genevent 0.5
[lttv.git]
/
genevent-new
/
genevent.c
diff --git
a/genevent-new/genevent.c
b/genevent-new/genevent.c
index 88cecb69c5d5c821ac971bafee618926c328cf78..aba40e528d204b411c2dcef8c54ec93d245b85e7 100644
(file)
--- a/
genevent-new/genevent.c
+++ b/
genevent-new/genevent.c
@@
-411,7
+411,8
@@
int print_type_declaration(type_descriptor_t * td, FILE *fd, unsigned int tabs,
fprintf(fd, " {\n");
for(unsigned int i=0;i<td->labels.position;i++){
print_tabs(1, fd);
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");
fprintf(fd, ",\n");
}
fprintf(fd, "};\n");
@@
-1067,8
+1068,15
@@
int print_type_write_fct(type_descriptor_t * td, FILE *fd, unsigned int tabs,
fprintf(fd, "{\n");
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");
print_tabs(1, fd);
fprintf(fd, "size_t align;\n");
fprintf(fd, "\n");
@@
-1125,11
+1133,9
@@
int print_type_write_fct(type_descriptor_t * td, FILE *fd, unsigned int tabs,
fprintf(fd, "/* Contains only fixed size fields : use compiler sizeof() */\n");
fprintf(fd, "\n");
print_tabs(1, fd);
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");
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. */
} else {
/* The type contains nested variable size subtypes :
* we must write field by field. */
@@
-1574,7
+1580,12
@@
void print_log_header_head(facility_t *fac, FILE *fd)
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, "#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");
}
fprintf(fd, "#include <linux/ltt-core.h>\n");
fprintf(fd, "\n");
}
@@
-1664,6
+1675,14
@@
int print_log_header(facility_t *fac)
strncat(filename, fac->name, 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, ".h", PATH_MAX - filename_size);
filename_size = strlen(filename);
@@
-1712,6
+1731,14
@@
int print_id_header(facility_t *fac)
strncat(filename, fac->name, 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, ".h", PATH_MAX - filename_size);
filename_size = strlen(filename);
@@
-1779,6
+1806,14
@@
int print_loader_header(facility_t *fac)
strncat(filename, fac->name, 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, ".h", PATH_MAX - filename_size);
filename_size = strlen(filename);
@@
-1794,8
+1829,13
@@
int print_loader_header(facility_t *fac)
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, "#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);
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);
@@
-1831,6
+1871,14
@@
int print_loader_c(facility_t *fac)
strncat(filename, fac->name, 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, ".c", PATH_MAX - filename_size);
filename_size = strlen(filename);
strncat(filename, ".c", PATH_MAX - filename_size);
filename_size = strlen(filename);
@@
-1843,7
+1891,10
@@
int print_loader_c(facility_t *fac)
}
fprintf(fd, "/*\n");
}
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, " *\n");
fprintf(fd, " * (C) Copyright 2005 - \n");
fprintf(fd, " * Mathieu Desnoyers (mathieu.desnoyers@polymtl.ca)\n");
@@
-1857,7
+1908,11
@@
int print_loader_c(facility_t *fac)
fprintf(fd, "#include <linux/module.h>\n");
fprintf(fd, "#include <linux/init.h>\n");
fprintf(fd, "#include <linux/config.h>\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");
fprintf(fd, "\n");
fprintf(fd, "\n");
fprintf(fd, "#ifdef CONFIG_LTT\n");
This page took
0.025242 seconds
and
4
git commands to generate.