switch(td->type) {
case INT_FIXED:
fprintf(fd, "%s", intOutputTypes[getSizeindex(td->size)]);
- fprintf(fd, " %s", field_name);
+ fprintf(fd, "lttng_param_%s", field_name);
break;
case UINT_FIXED:
fprintf(fd, "%s", uintOutputTypes[getSizeindex(td->size)]);
- fprintf(fd, " %s", field_name);
+ fprintf(fd, "lttng_param_%s", field_name);
break;
case CHAR:
fprintf(fd, "signed char");
- fprintf(fd, " %s", field_name);
+ fprintf(fd, " lttng_param_%s", field_name);
break;
case UCHAR:
fprintf(fd, "unsigned char");
- fprintf(fd, " %s", field_name);
+ fprintf(fd, " lttng_param_%s", field_name);
break;
case SHORT:
fprintf(fd, "short");
- fprintf(fd, " %s", field_name);
+ fprintf(fd, " lttng_param_%s", field_name);
break;
case USHORT:
fprintf(fd, "unsigned short");
- fprintf(fd, " %s", field_name);
+ fprintf(fd, " lttng_param_%s", field_name);
break;
case INT:
fprintf(fd, "int");
- fprintf(fd, " %s", field_name);
+ fprintf(fd, " lttng_param_%s", field_name);
break;
case UINT:
fprintf(fd, "unsigned int");
- fprintf(fd, " %s", field_name);
+ fprintf(fd, " lttng_param_%s", field_name);
break;
case FLOAT:
fprintf(fd, "%s", floatOutputTypes[getSizeindex(td->size)]);
- fprintf(fd, " %s", field_name);
+ fprintf(fd, " lttng_param_%s", field_name);
break;
case POINTER:
fprintf(fd, "const void *");
- fprintf(fd, " %s", field_name);
+ fprintf(fd, " lttng_param_%s", field_name);
break;
case LONG:
fprintf(fd, "long");
- fprintf(fd, " %s", field_name);
+ fprintf(fd, " lttng_param_%s", field_name);
break;
case ULONG:
fprintf(fd, "unsigned long");
- fprintf(fd, " %s", field_name);
+ fprintf(fd, " lttng_param_%s", field_name);
break;
case SIZE_T:
fprintf(fd, "size_t");
- fprintf(fd, " %s", field_name);
+ fprintf(fd, " lttng_param_%s", field_name);
break;
case SSIZE_T:
fprintf(fd, "ssize_t");
- fprintf(fd, " %s", field_name);
+ fprintf(fd, " lttng_param_%s", field_name);
break;
case OFF_T:
fprintf(fd, "off_t");
- fprintf(fd, " %s", field_name);
+ fprintf(fd, " lttng_param_%s", field_name);
break;
case STRING:
fprintf(fd, "const char *");
- fprintf(fd, " %s", field_name);
+ fprintf(fd, " lttng_param_%s", field_name);
break;
case ENUM:
fprintf(fd, "enum lttng_%s", basename);
- fprintf(fd, " %s", field_name);
+ fprintf(fd, " lttng_param_%s", field_name);
break;
case ARRAY:
fprintf(fd, "lttng_array_%s", basename);
- fprintf(fd, " %s", field_name);
+ fprintf(fd, " lttng_param_%s", field_name);
break;
case SEQUENCE:
fprintf(fd, "lttng_sequence_%s *", basename);
- fprintf(fd, " %s", field_name);
+ fprintf(fd, " lttng_param_%s", field_name);
break;
case STRUCT:
fprintf(fd, "struct lttng_%s *", basename);
- fprintf(fd, " %s", field_name);
+ fprintf(fd, " lttng_param_%s", field_name);
break;
case UNION:
fprintf(fd, "union lttng_%s *", basename);
- fprintf(fd, " %s", field_name);
+ fprintf(fd, " lttng_param_%s", field_name);
break;
default:
printf("print_type : unknown type\n");
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");
case STRING:
fprintf(fd, "sizeof(char)");
break;
+ case INT_FIXED:
+ case UINT_FIXED:
+ case CHAR:
+ case UCHAR:
+ case SHORT:
+ case USHORT:
+ case INT:
+ case UINT:
+ case FLOAT:
+ case POINTER:
+ case LONG:
+ case ULONG:
+ case SIZE_T:
+ case SSIZE_T:
+ case OFF_T:
+ case ENUM:
+ fprintf(fd, "sizeof(");
+ if(print_type(td, fd, 0, basename, "")) return 1;
+ fprintf(fd, ")");
+ break;
+
default:
printf("error : type unexpected\n");
return 1;
case OFF_T:
case ENUM:
print_tabs(tabs, fd);
- fprintf(fd, "size = ");
+ fprintf(fd, "align = ");
+ if(print_type_alignment(td, fd, 0, basename, "", "obj")) return 1;
+ fprintf(fd, ";\n");
+ fprintf(fd, "\n");
+ print_tabs(tabs, fd);
+ 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);
+ fprintf(fd, "} else {\n");
+ print_tabs(tabs+1, fd);
+ fprintf(fd, "*len += ltt_align(*to+*len, align); /* alignment, ok to do a memcpy of it */\n");
+ print_tabs(tabs, fd);
+ fprintf(fd, "}\n");
+ fprintf(fd, "\n");
+
+ print_tabs(tabs, fd);
+ fprintf(fd, "*len += ");
fprintf(fd, "sizeof(");
if(print_type(td, fd, 0, basename, "")) return 1;
fprintf(fd, ");\n");
- print_tabs(tabs, fd);
- fprintf(fd, "size += ltt_align(*to+*len, size) + size;\n");
- print_tabs(tabs, fd);
- fprintf(fd, "*len += size;");
+
break;
case STRING:
print_tabs(tabs, fd);
return 0;
}
+/* print need local vars ?.
+ *
+ * Copied from print_type_write
+ *
+ * Does the type_write call needs local size and from variables ?
+ * return value : 1 yes, 0 no.
+ */
+
+int has_type_local(type_descriptor_t * td)
+{
+ switch(td->type) {
+ case INT_FIXED:
+ case UINT_FIXED:
+ case CHAR:
+ case UCHAR:
+ case SHORT:
+ case USHORT:
+ case INT:
+ case UINT:
+ case FLOAT:
+ case POINTER:
+ case LONG:
+ case ULONG:
+ case SIZE_T:
+ case SSIZE_T:
+ case OFF_T:
+ case ENUM:
+ return 1;
+ break;
+ case STRING:
+ case SEQUENCE:
+ case STRUCT:
+ case UNION:
+ case ARRAY:
+ return 0;
+ break;
+ case NONE:
+ printf("Error : type NONE unexpected\n");
+ return 1;
+ break;
+ }
+
+ return 0;
+}
+
/* print type alignment function.
}
fprintf(fd, "{\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, size;\n");
+ fprintf(fd, "size_t align;\n");
fprintf(fd, "\n");
switch(td->type) {
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. */
print_tabs(1, fd);
fprintf(fd, "if(buffer != NULL)\n");
print_tabs(2, fd);
- fprintf(fd, "memcpy(buffer+*to_base+*to, &obj->len, size);\n");
+ fprintf(fd, "memcpy(buffer+*to_base+*to, &obj->len, *len);\n");
print_tabs(1, fd);
- fprintf(fd, "*to += size;\n");
+ fprintf(fd, "*to += *len;\n");
+ print_tabs(1, fd);
+ fprintf(fd, "*len = 0;\n");
fprintf(fd, "\n");
-
+
/* Write the child : varlen child or not ? */
if(has_type_fixed_size(((field_t*)td->fields.array[1])->type)) {
/* Fixed size len child : use a multiplication of its size */
// print_tabs(1, fd);
// fprintf(fd, "size = sizeof(\n");
+
+ //print_tabs(1, fd);
+ /* We know that *len does not contain alignment because of the
+ * previous align output. len is always 0 here. */
if(print_type_write(((field_t*)td->fields.array[1])->type,
- fd, 1, basename, "array[0]", "obj->", 1)) return 1;
+ fd, 1, basename, "array[0]", "obj->", 1))
+ return 1;
// fprintf(fd, ");\n");
-// print_tabs(1, fd);
- fprintf(fd, "*to += ltt_align(*to, size);\n");
+ fprintf(fd, "\n");
print_tabs(1, fd);
- fprintf(fd, "size = obj->len * size;\n");
+ fprintf(fd, "*len = obj->len * (*len);\n");
print_tabs(1, fd);
fprintf(fd, "if(buffer != NULL)\n");
print_tabs(2, fd);
- fprintf(fd, "memcpy(buffer+*to_base+*to, obj->array, size);\n");
+ fprintf(fd, "memcpy(buffer+*to_base+*to, obj->array, *len);\n");
print_tabs(1, fd);
- fprintf(fd, "*to += size;\n");
+ fprintf(fd, "*to += *len;\n");
+ print_tabs(1, fd);
+ fprintf(fd, "*len = 0;\n");
fprintf(fd, "\n");
} else {
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");
+ 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");
+ 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, "static inline void trace_%s(\n", basename);
int has_argument = 0;
+ int has_type_fixed = 0;
/* Does it support per trace tracing ? */
if(event->per_trace) {
print_tabs(1, fd);
fprintf(fd, "size_t *to = &real_to;\n");
print_tabs(1, fd);
- fprintf(fd, "const void *real_from;\n");
- print_tabs(1, fd);
- fprintf(fd, "const void **from = &real_from;\n");
- print_tabs(1, fd);
fprintf(fd, "size_t real_len = 0;\n");
print_tabs(1, fd);
fprintf(fd, "size_t *len = &real_len;\n");
print_tabs(1, fd);
fprintf(fd, "size_t slot_size;\n");
print_tabs(1, fd);
- fprintf(fd, "size_t size;\n");
- print_tabs(1, fd);
+
+ if(event->fields.position > 0) {
+ for(unsigned int i=0;i<event->fields.position;i++){
+ /* Search for at least one child with fixed size. It means
+ * we need local variables.*/
+ field_t *field = (field_t*)(event->fields.array[i]);
+ type_descriptor_t *type = field->type;
+ has_type_fixed = has_type_local(type);
+ if(has_type_fixed) break;
+ }
+
+ if(has_type_fixed) {
+ fprintf(fd, "size_t align;\n");
+ print_tabs(1, fd);
+ }
+
+ fprintf(fd, "const void *real_from;\n");
+ print_tabs(1, fd);
+ fprintf(fd, "const void **from = &real_from;\n");
+ print_tabs(1, fd);
+ }
fprintf(fd, "cycles_t tsc;\n");
print_tabs(1, fd);
fprintf(fd, "size_t before_hdr_pad, after_hdr_pad, header_size;\n");
case ARRAY:
case STRUCT:
case STRING:
- fprintf(fd, "*from = %s;\n", field->name);
+ fprintf(fd, "*from = lttng_param_%s;\n", field->name);
break;
default:
- fprintf(fd, "*from = &%s;\n", field->name);
+ fprintf(fd, "*from = <tng_param_%s;\n", field->name);
break;
}
if(print_type_write(type,
- fd, 1, basename, field->name, "", 0)) return 1;
+ fd, 1, basename, field->name, "lttng_param_", 0)) return 1;
fprintf(fd, "\n");
}
print_tabs(1, fd);
fprintf(fd, "reserve_size = *to_base + *to + *len;\n");
- print_tabs(1, fd);
- fprintf(fd, "*to_base = *to = *len = 0;\n");
- fprintf(fd, "\n");
/* Take locks : make sure the trace does not vanish while we write on
* it. A simple preemption disabling is enough (using rcu traces). */
fprintf(fd, "&before_hdr_pad, &after_hdr_pad, &header_size);\n");
/* If error, return */
print_tabs(2, fd);
- fprintf(fd, "if(!buffer) return;\n\n");
+ fprintf(fd, "if(!buffer) continue; /* buffer full */\n\n");
+ //print_tabs(2, fd);
+ // for DEBUG only
+ // fprintf(fd, "goto commit; /* DEBUG : never actually write. */\n\n");
+ print_tabs(2, fd);
+ fprintf(fd, "*to_base = *to = *len = 0;\n");
+ fprintf(fd, "\n");
+
/* Write event header */
print_tabs(2, fd);
fprintf(fd, "ltt_write_event_header(trace, channel, buffer,\n");
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");
- /* write data : assume stack alignment is the same as struct alignment. */
+ /* 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;
-
+
/* Set from */
print_tabs(2, fd);
switch(type->type) {
case ARRAY:
case STRUCT:
case STRING:
- fprintf(fd, "*from = %s;\n", field->name);
+ fprintf(fd, "*from = lttng_param_%s;\n", field->name);
break;
default:
- fprintf(fd, "*from = &%s;\n", field->name);
+ fprintf(fd, "*from = <tng_param_%s;\n", field->name);
break;
}
if(print_type_write(type,
- fd, 2, basename, field->name, "", 0)) return 1;
+ fd, 2, basename, field->name, "lttng_param_", 0)) return 1;
fprintf(fd, "\n");
/* Don't forget to flush pending memcpy */
print_tabs(2, fd);
fprintf(fd, "/* Flush pending memcpy */\n");
print_tabs(2, fd);
- fprintf(fd, "if(len != 0) {\n");
+ fprintf(fd, "if(*len != 0) {\n");
print_tabs(3, fd);
fprintf(fd, "memcpy(buffer+*to_base+*to, *from, *len);\n");
print_tabs(3, fd);
/* commit */
+ // 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, "#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");
projects / lttv.git / blobdiff