#include "parser.h"
#include "genevent.h"
+#define max(a,b) ((a)<(b))?(b):(a)
+
/* Named types may be referenced from anywhere */
facility * fac;
+unsigned alignment = 0;
+
int main(int argc, char** argv)
{
char *token;
if(argc < 2){
printf("At least one event definition file is needed\n");
+ printf("You may specify the default alignment for a facility with\n");
+ printf(" -a x , where x is the desired alignment in bytes.\n");
+ printf("The alignment value will affect all the following xml files.\n");
+ printf("i.e. genevent -a 8 core.xml -a 4 kernel.xml is valid.\n");
exit(1);
}
in.error = error_callback;
for(i = 1 ; i < argc ; i++) {
- in.lineno = 0;
- in.name = allocAndCopy(argv[i]);
-
- in.fp = fopen(in.name, "r");
- if(!in.fp ){
- in.error(&in,"cannot open facility input file");
- }
- while(1){
- token = getToken(&in);
- if(in.type == ENDFILE) break;
+ if(strcmp("-a", argv[i])==0) {
+ if(i >= argc-1) {
+ printf("Error : missing argument to -a\n");
+ exit(1);
+ } else i++;
+ alignment = atoi(argv[i]);
+ } else {
+
+ in.lineno = 0;
+ in.name = allocAndCopy(argv[i]);
- if(strcmp(token, "<")) in.error(&in,"not a facility file");
- token = getName(&in);
-
- if(strcmp("facility",token) == 0) {
- fac = memAlloc(sizeof(facility));
- fac->name = NULL;
- fac->description = NULL;
- sequence_init(&(fac->events));
- table_init(&(fac->named_types));
- sequence_init(&(fac->unnamed_types));
-
- parseFacility(&in, fac);
-
- //check if any namedType is not defined
- checkNamedTypesImplemented(&fac->named_types);
- }
- else in.error(&in,"facility token was expected");
-
- generateFile(argv[i]);
-
- free(fac->name);
- free(fac->description);
- freeEvents(&fac->events);
- sequence_dispose(&fac->events);
- freeNamedType(&fac->named_types);
- table_dispose(&fac->named_types);
- freeTypes(&fac->unnamed_types);
- sequence_dispose(&fac->unnamed_types);
- free(fac);
- }
+ in.fp = fopen(in.name, "r");
+ if(!in.fp ){
+ in.error(&in,"cannot open facility input file");
+ }
- free(in.name);
- fclose(in.fp);
+ while(1){
+ token = getToken(&in);
+ if(in.type == ENDFILE) break;
+
+ if(strcmp(token, "<")) in.error(&in,"not a facility file");
+ token = getName(&in);
+
+ if(strcmp("facility",token) == 0) {
+ fac = memAlloc(sizeof(facility));
+ fac->name = NULL;
+ fac->description = NULL;
+ sequence_init(&(fac->events));
+ table_init(&(fac->named_types));
+ sequence_init(&(fac->unnamed_types));
+
+ parseFacility(&in, fac);
+
+ //check if any namedType is not defined
+ checkNamedTypesImplemented(&fac->named_types);
+ }
+ else in.error(&in,"facility token was expected");
+
+ generateFile(argv[i]);
+
+ free(fac->name);
+ free(fac->description);
+ freeEvents(&fac->events);
+ sequence_dispose(&fac->events);
+ freeNamedType(&fac->named_types);
+ table_dispose(&fac->named_types);
+ freeTypes(&fac->unnamed_types);
+ sequence_dispose(&fac->unnamed_types);
+ free(fac);
+ }
+ free(in.name);
+ fclose(in.fp);
+ }
}
return 0;
}
}
if(flag) {
- if(type->alignment == 0)
+ unsigned align = max(alignment, type->alignment);
+
+ if(align == 0)
fprintf(fp,"} __attribute__ ((packed));\n\n");
else {
- if(type->alignment != 1 && type->alignment != 2
- && type->alignment != 4 && type->alignment != 8) {
- printf("Wrong alignment %i, using packed.\n", type->alignment);
+ if(align != 1 && align != 2
+ && align != 4 && align != 8) {
+ printf("Wrong alignment %i, using packed.\n", align);
fprintf(fp,"} __attribute__ ((packed));\n\n");
} else
- fprintf(fp,"} __attribute__ ((aligned(%i)));\n\n", type->alignment);
+ fprintf(fp,"} __attribute__ ((aligned(%i)));\n\n", align);
}
}
}
//allocate buffer
// MD no more need. fprintf(fp,"\tchar buff[buflength];\n");
// write directly to the channel
- fprintf(fp, "\tint length;\n");
fprintf(fp, "\tunsigned int index;\n");
fprintf(fp, "\tstruct ltt_channel_struct *channel;\n");
fprintf(fp, "\tstruct ltt_trace_struct *trace;\n");
fprintf(fp, "\tunsigned long _flags;\n");
fprintf(fp, "\tvoid *buff;\n");
- fprintf(fp, "\tvoid *old_address;\n");
+ fprintf(fp, "\tunsigned old_offset;\n");
fprintf(fp, "\tunsigned int header_length;\n");
- fprintf(fp, "\tunsigned int event_length;\n");
+ fprintf(fp, "\tunsigned int event_length;\n"); // total size (incl hdr)
+ fprintf(fp, "\tunsigned int length;\n"); // Size of the event var data.
fprintf(fp, "\tunsigned char _offset;\n");
- fprintf(fp, "\tunsigned char length_offset;\n");
fprintf(fp, "\tstruct rchan_buf *buf;\n");
fprintf(fp, "\tstruct timeval delta;\n");
fprintf(fp, "\tu64 tsc;\n");
+ fprintf(fp, "\tchar *ptr;\n");
if(ev->type != 0)
fprintf(fp, "\tstruct %s_%s_1* __1;\n\n", ev->name, facName);
fprintf(fp, "\t\tif(!trace->active) continue;\n\n");
//length of buffer : length of all structures
- fprintf(fp,"\t\tlength = 0;\n");
- fprintf(fp,"\t\tlength_offset = 0;\n");
// if(ev->type == 0) fprintf(fp, "0");
fprintf(fp, "\t\tchannel = ltt_get_channel_from_index(trace, index);\n");
* address for alignment */
/* NOTE : using cmpxchg in reserve with repeat for atomicity */
// Replaces _offset
+ /* NOTE2 : as the read old address from memory must come before any
+ * protected event, let's add a memory barrier() to make sure the compiler
+ * will not reorder this read. */
fprintf(fp, "\t\tdo {\n");
- fprintf(fp, "\t\t\told_address = buf->data + buf->offset;\n");
+ fprintf(fp, "\t\t\told_offset = buf->offset;\n");
+ fprintf(fp, "\t\t\tbarrier();\n");
+ fprintf(fp, "\t\t\tptr = (char*)buf->data + old_offset;\n");
+
+
fprintf(fp, "\t\t\theader_length = ltt_get_event_header_data(trace, "
"channel,\n"
- "\t\t\t\t\t\t\t\t\t\told_address, &_offset, &delta, &tsc);\n");
+ "\t\t\t\t\t\t\t\t\t\tptr, &_offset, &delta, &tsc);\n");
- if(ev->type != 0)
- fprintf(fp, "\t\t\tchar *ptr = (char*)old_address + "
- "_offset + header_length;\n");
+ fprintf(fp, "\t\t\tptr += _offset + header_length;\n");
for(pos1=0;pos1<structCount;pos1++){
- if(ev->type->alignment > 1) {
- fprintf(fp,"\t\t\tlength_offset+=(%u - ((unsigned int)ptr&(%u-1)))&(%u-1) ;\n",
- ev->type->alignment, ev->type->alignment, ev->type->alignment);
+ unsigned align = max(alignment, ev->type->alignment);
+ if(align > 1) {
+ fprintf(fp,"\t\t\tptr += (%u - ((unsigned int)ptr&(%u-1)))&(%u-1) ;\n",
+ align, align, align);
}
- fprintf(fp,"\t\t\tlength+=sizeof(struct %s_%s_%d);\n",ev->name,
+ fprintf(fp,"\t\t\tptr += sizeof(struct %s_%s_%d);\n",ev->name,
facName,pos1+1);
// if(pos1 != structCount-1) fprintf(fp," + ");
}
td = fld->type;
if(td->type == SEQUENCE || td->type==STRING || td->type==ARRAY){
if(td->type == SEQUENCE) {
- if(td->alignment > 1) {
- fprintf(fp,"\t\t\tlength_offset+=(%u - ((unsigned int)ptr&(%u-1)))&(%u-1)) ;\n",
- td->alignment, td->alignment, td->alignment);
- }
- fprintf(fp,
- "\t\t\tlength+=sizeof(%s) + (sizeof(%s) * seqlength_%d);\n",
- uintOutputTypes[td->size], getTypeStr(td), ++seqCount);
+
+ unsigned align = max(alignment, td->alignment);
+ if(align > 1) {
+ fprintf(fp,"\t\tptr+=(%u - ((unsigned int)ptr&(%u-1)))&(%u-1);\n",
+ align, align, align);
+ }
+ fprintf(fp,"\t\tptr += sizeof(%s);\n",uintOutputTypes[td->size]);
+ if(align > 1) {
+ fprintf(fp,"\t\tptr+=(%u - ((unsigned int)ptr&(%u-1)))&(%u-1);\n",
+ align, align, align);
+ }
+ fprintf(fp,"\t\tptr += sizeof(%s) * seqlength_%d;\n\n",
+ getTypeStr(td), seqCount);
+
} else if(td->type==STRING) {
- if(td->alignment > 1) {
- fprintf(fp,"\t\t\tlength_offset+=(%u - ((unsigned int)ptr&(%u-1)))&(%u-1)) ;\n",
- td->alignment, td->alignment, td->alignment);
+ unsigned align = max(alignment, td->alignment);
+ if(align > 1) {
+ fprintf(fp,"\t\t\tptr += (%u - ((unsigned int)ptr&(%u-1)))&(%u-1)) ;\n",
+ align, align, align);
}
- fprintf(fp,"length+=strlength_%d + 1;\n",
+ fprintf(fp,"ptr += strlength_%d + 1;\n",
++strCount);
}
else if(td->type==ARRAY) {
- if(td->alignment > 1) {
- fprintf(fp,"\t\t\tlength_offset+=(%u - ((unsigned int)ptr&(%u-1)))&(%u-1);\n",
- td->alignment, td->alignment, td->alignment);
+ unsigned align = max(alignment, td->alignment);
+ if(align > 1) {
+ fprintf(fp,"\t\t\tptr += (%u - ((unsigned int)ptr&(%u-1)))&(%u-1);\n",
+ align, align, align);
}
- fprintf(fp,"\t\t\tlength+=sizeof(%s) * %d;\n",
+ fprintf(fp,"\t\t\tptr += sizeof(%s) * %d;\n",
getTypeStr(td),td->size);
if(structCount == 0) flag = 1;
}
}
}
- fprintf(fp,";\n");
-
- fprintf(fp, "\t\t\tevent_length = _offset + header_length + "
- "length_offset + length;\n");
-
+ fprintf(fp, "\t\t\tevent_length = (unsigned long)ptr -"
+ "(unsigned long)(buf->data + old_offset);\n");
+
+ /* let's put some protection before the cmpxchg : the space reservation and
+ * the get TSC are not dependant from each other. I don't want the compiler
+ * to reorder those in the wrong order. And relay_reserve is inline, so
+ * _yes_, the compiler could mess it up. */
+ fprintf(fp, "\t\t\tbarrier();\n");
fprintf(fp, "\t\t\tbuff = relay_reserve(channel->rchan, event_length, "
- "old_address);\n");
+ "old_offset);\n");
fprintf(fp, "\n");
fprintf(fp, "\t\t} while(PTR_ERR(buff) == -EAGAIN);\n");
fprintf(fp, "\n");
//fprintf(fp, "\t\t}\n");
/* Write the header */
+ fprintf(fp, "\n");
+ fprintf(fp,"\t\tlength = event_length - _offset - header_length;\n");
fprintf(fp, "\n");
fprintf(fp, "\t\tltt_write_event_header(trace, channel, buff, \n"
- "\t\t\t\tltt_facility_%s_%X, event_%s, length, _offset);\n",
+ "\t\t\t\tltt_facility_%s_%X, event_%s, length, _offset,\n"
+ "\t\t\t\t&delta, &tsc);\n",
facName, checksum, ev->name);
fprintf(fp, "\n");
// Declare an alias pointer of the struct type to the beginning
// of the reserved area, just after the event header.
if(ev->type != 0) {
- if(ev->type->alignment > 1) {
+ unsigned align = max(alignment, td->alignment);
+ if(align > 1) {
fprintf(fp,"\t\tptr+=(%u - ((unsigned int)ptr&(%u-1)))&(%u-1);\n",
- ev->type->alignment, ev->type->alignment, ev->type->alignment);
+ align, align, align);
}
fprintf(fp, "\t\t__1 = (struct %s_%s_1 *)(ptr);\n",
flag = 0;
fprintf(fp,"\t\t//copy sequence length and sequence to buffer\n");
- if(td->alignment > 1) {
+ unsigned align = max(alignment, td->alignment);
+ if(align > 1) {
fprintf(fp,"\t\tptr+=(%u - ((unsigned int)ptr&(%u-1)))&(%u-1);\n",
- td->alignment, td->alignment, td->alignment);
+ align, align, align);
}
fprintf(fp,"\t\t*ptr = seqlength_%d;\n",++seqCount);
fprintf(fp,"\t\tptr += sizeof(%s);\n",uintOutputTypes[td->size]);
- if(td->alignment > 1) {
+ if(align > 1) {
fprintf(fp,"\t\tptr+=(%u - ((unsigned int)ptr&(%u-1)))&(%u-1);\n",
- td->alignment, td->alignment, td->alignment);
+ align, align, align);
}
fprintf(fp,"\t\tmemcpy(ptr, %s, sizeof(%s) * seqlength_%d);\n",
fld->name, getTypeStr(td), seqCount);
flag = 0;
fprintf(fp,"\t\t//copy string to buffer\n");
fprintf(fp,"\t\tif(strlength_%d > 0){\n",++strCount);
- if(td->alignment > 1) {
+ unsigned align = max(alignment, td->alignment);
+ if(align > 1) {
fprintf(fp,"\t\tptr+=(%u - ((unsigned int)ptr&(%u-1)))&(%u-1);\n",
- td->alignment, td->alignment, td->alignment);
+ align, align, align);
}
fprintf(fp,"\t\t\tmemcpy(ptr, %s, strlength_%d + 1);\n",
fld->name, strCount);
}else if(td->type==ARRAY){
flag = 0;
fprintf(fp,"\t//copy array to buffer\n");
- if(td->alignment > 1) {
+ unsigned align = max(alignment, td->alignment);
+ if(align > 1) {
fprintf(fp,"\t\tptr+=(%u - ((unsigned int)ptr&(%u-1)))&(%u-1);\n",
- td->alignment, td->alignment, td->alignment);
+ align, align, align);
}
fprintf(fp,"\tmemcpy(ptr, %s, sizeof(%s) * %d);\n",
fld->name, getTypeStr(td), td->size);
fprintf(fp, "\t.name = ltt_facility_name,\n");
fprintf(fp, "\t.num_events = LTT_FACILITY_NUM_EVENTS,\n");
fprintf(fp, "\t.checksum = LTT_FACILITY_CHECKSUM,\n");
- fprintf(fp, "\t.symbol = SYMBOL_STRING(LTT_FACILITY_SYMBOL)\n");
+ fprintf(fp, "\t.symbol = SYMBOL_STRING(LTT_FACILITY_SYMBOL),\n");
+ fprintf(fp, "\t.alignment = %u\n", alignment); /* default alignment */
fprintf(fp, "};\n");
fprintf(fp, "\n");
fprintf(fp, "#ifndef MODULE\n");
projects / lttv.git / blobdiff