X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=genevent%2Fgenevent.c;h=9c96d81f93fdf2b53a9add70f42187a8913ddc5e;hb=d2a3b4b360b6e6d212243edb889fa38c8c349416;hp=3add689828d32a7599f64f645335348640fe0848;hpb=a8f6f123bde50bc59b1146ef99a287baa1cb1730;p=lttv.git diff --git a/genevent/genevent.c b/genevent/genevent.c index 3add6898..9c96d81f 100644 --- a/genevent/genevent.c +++ b/genevent/genevent.c @@ -45,10 +45,14 @@ This program is distributed in the hope that it will be useful, #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; @@ -58,6 +62,10 @@ int main(int argc, char** argv) 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); } @@ -65,52 +73,61 @@ int main(int argc, char** argv) 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; } @@ -191,14 +208,18 @@ void generateFile(char *name){ /* generate .h file, event enumeration then structures and functions */ fprintf(iFp, "#ifndef _LTT_FACILITY_ID_%s_H_\n",fac->capname); fprintf(iFp, "#define _LTT_FACILITY_ID_%s_H_\n\n",fac->capname); + fprintf(iFp, "#ifdef CONFIG_LTT\n"); generateEnumEvent(iFp, fac->name, &nbEvent, checksum); + fprintf(iFp, "#endif //CONFIG_LTT\n"); fprintf(iFp, "#endif //_LTT_FACILITY_ID_%s_H_\n",fac->capname); fprintf(hFp, "#ifndef _LTT_FACILITY_%s_H_\n",fac->capname); fprintf(hFp, "#define _LTT_FACILITY_%s_H_\n\n",fac->capname); + //fprintf(hFp, "#ifdef CONFIG_LTT\n"); generateTypeDefs(hFp, fac->name); generateStructFunc(hFp, fac->name,checksum); + //fprintf(hFp, "#endif //CONFIG_LTT\n"); fprintf(hFp, "#endif //_LTT_FACILITY_%s_H_\n",fac->capname); /* generate .h file, calls to register the facility at init time */ @@ -264,7 +285,8 @@ void generateEnumEvent(FILE *fp, char *facName, int * nbEvent, unsigned long che static void printStruct(FILE * fp, int len, void ** array, char * name, char * facName, - int * whichTypeFirst, int * hasStrSeq, int * structCount) + int * whichTypeFirst, int * hasStrSeq, int * structCount, + type_descriptor *type) { int flag = 0; int pos; @@ -309,7 +331,18 @@ printStruct(FILE * fp, int len, void ** array, char * name, char * facName, } if(flag) { - fprintf(fp,"} __attribute__ ((packed));\n\n"); + unsigned align = max(alignment, type->alignment); + + if(align == 0) + fprintf(fp,"} __attribute__ ((packed));\n\n"); + else { + 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", align); + } } } @@ -330,6 +363,7 @@ generateTypeDefs(FILE * fp, char *facName) fprintf(fp,"#include \n\n", facName); fprintf(fp,"#include \n"); +#if 0 //broken fprintf(fp, "/**** Basic Type Definitions ****/\n\n"); for (pos = 0; pos < fac->named_types.values.position; pos++) { @@ -340,6 +374,7 @@ generateTypeDefs(FILE * fp, char *facName) fprintf(fp, "typedef struct _%s %s;\n\n", type->type_name, type->type_name); } +#endif //0 } @@ -413,11 +448,14 @@ void generateStructFunc(FILE * fp, char * facName, unsigned long checksum){ //structure for kernel if(ev->type != 0) printStruct(fp, ev->type->fields.position, ev->type->fields.array, - ev->name, facName, &whichTypeFirst, &hasStrSeq, &structCount); + ev->name, facName, &whichTypeFirst, &hasStrSeq, &structCount, + ev->type); - //trace function : function name and parameters + + //trace function : function name and parameters : stub function. seqCount = 0; strCount = 0; + fprintf(fp, "#ifndef CONFIG_LTT\n"); fprintf(fp,"static inline void trace_%s_%s(",facName,ev->name); if(ev->type == 0) fprintf(fp, "void"); @@ -437,37 +475,34 @@ void generateStructFunc(FILE * fp, char * facName, unsigned long checksum){ if(pos1 != ev->type->fields.position - 1) fprintf(fp,", "); } fprintf(fp,")\n{\n"); + fprintf(fp,"}\n"); + fprintf(fp,"#else\n"); - //length of buffer : length of all structures - fprintf(fp,"\tint length = "); - if(ev->type == 0) fprintf(fp, "0"); - - for(pos1=0;pos1name, facName,pos1+1); - if(pos1 != structCount-1) fprintf(fp," + "); - } - - //length of buffer : length of all arrays, sequences and strings + //trace function : function name and parameters seqCount = 0; strCount = 0; - flag = 0; - if(ev->type != 0) - for(pos1 = 0; pos1 < ev->type->fields.position; pos1++){ - fld = (field *)ev->type->fields.array[pos1]; - td = fld->type; - if(td->type == SEQUENCE || td->type==STRING || td->type==ARRAY){ - if(structCount || flag > 0) fprintf(fp," + "); - if(td->type == SEQUENCE) - fprintf(fp,"sizeof(%s) + sizeof(%s) * seqlength_%d", - uintOutputTypes[td->size], getTypeStr(td), ++seqCount); - else if(td->type==STRING) fprintf(fp,"strlength_%d + 1", ++strCount); - else if(td->type==ARRAY) - fprintf(fp,"sizeof(%s) * %d", getTypeStr(td),td->size); - if(structCount == 0) flag = 1; - } - } - fprintf(fp,";\n"); + fprintf(fp,"static inline void trace_%s_%s(",facName,ev->name); + if(ev->type == 0) + fprintf(fp, "void"); + else + for(pos1 = 0; pos1 < ev->type->fields.position; pos1++){ + fld = (field *)ev->type->fields.array[pos1]; + td = fld->type; + if(td->type == ARRAY ){ + fprintf(fp,"%s * %s",getTypeStr(td), fld->name); + }else if(td->type == STRING){ + fprintf(fp,"short int strlength_%d, %s * %s", + ++strCount, getTypeStr(td), fld->name); + }else if(td->type == SEQUENCE){ + fprintf(fp,"%s seqlength_%d, %s * %s", + uintOutputTypes[td->size], ++seqCount,getTypeStr(td), fld->name); + }else fprintf(fp,"%s %s",getTypeStr(td), fld->name); + if(pos1 != ev->type->fields.position - 1) fprintf(fp,", "); + } + fprintf(fp,")\n{\n"); + + //allocate buffer // MD no more need. fprintf(fp,"\tchar buff[buflength];\n"); // write directly to the channel @@ -475,66 +510,193 @@ void generateStructFunc(FILE * fp, char * facName, unsigned long checksum){ 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, "\tunsigned old_offset;\n"); + fprintf(fp, "\tunsigned int header_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, "\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, "\tread_lock(<t_traces.traces_rwlock);\n\n"); + /* Warning : this is done prior to taking locks : + * setting this value must be done at the end of the trace activation. + * (we don't care for trace removal, as the list of traces is protected : it + * just won't iterate on any trace). */ fprintf(fp, - "\tif(ltt_traces.num_active_traces == 0) goto unlock_traces;\n\n"); + "\tif(ltt_traces.num_active_traces == 0) return;\n\n"); + + fprintf(fp, "\t/* Disable interrupts. */\n"); + fprintf(fp, "\tlocal_irq_save(_flags);\n"); + fprintf(fp, "\tpreempt_disable();\n\n"); + fprintf(fp, "\tltt_nesting[smp_processor_id()]++;\n"); + fprintf(fp, "\tbarrier();\n"); + fprintf(fp, "\tif(ltt_nesting[smp_processor_id()] > 1) goto unlock;\n"); + fprintf(fp, "\tspin_lock(<t_traces.locks[smp_processor_id()]);\n\n"); + fprintf(fp, "\tindex = ltt_get_index_from_facility(ltt_facility_%s_%X,\n"\ "\t\t\t\tevent_%s);\n", facName, checksum, ev->name); fprintf(fp,"\n"); - fprintf(fp, "\t/* Disable interrupts. */\n"); - fprintf(fp, "\tlocal_irq_save(_flags);\n\n"); - /* For each trace */ fprintf(fp, "\tlist_for_each_entry(trace, <t_traces.head, list) {\n"); fprintf(fp, "\t\tif(!trace->active) continue;\n\n"); - - fprintf(fp, "\t\tunsigned int header_length = " - "ltt_get_event_header_size(trace);\n"); - fprintf(fp, "\t\tunsigned int event_length = header_length + length;\n"); + + //length of buffer : length of all structures + // if(ev->type == 0) fprintf(fp, "0"); - /* Reserve the channel */ fprintf(fp, "\t\tchannel = ltt_get_channel_from_index(trace, index);\n"); - fprintf(fp, - "\t\tvoid *buff = relay_reserve(channel->rchan, event_length);\n"); + fprintf(fp, "\t\tbuf = channel->rchan->buf[smp_processor_id()];\n"); + fprintf(fp, "\n"); + /* Warning : not atomic reservation : event size depends on the current + * 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_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\tptr, &_offset, &delta, &tsc);\n"); + + fprintf(fp, "\t\t\tptr += _offset + header_length;\n"); + + for(pos1=0;pos1type->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\tptr += sizeof(struct %s_%s_%d);\n",ev->name, + facName,pos1+1); +// if(pos1 != structCount-1) fprintf(fp," + "); + } + + //length of buffer : length of all arrays, sequences and strings + seqCount = 0; + strCount = 0; + flag = 0; + if(ev->type != 0) + for(pos1 = 0; pos1 < ev->type->fields.position; pos1++){ + fld = (field *)ev->type->fields.array[pos1]; + td = fld->type; + if(td->type == SEQUENCE || td->type==STRING || td->type==ARRAY){ + if(td->type == SEQUENCE) { + + 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) { + 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,"ptr += strlength_%d + 1;\n", + ++strCount); + } + else if(td->type==ARRAY) { + 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\tptr += sizeof(%s) * %d;\n", + getTypeStr(td),td->size); + if(structCount == 0) flag = 1; + } + } + } + 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_offset);\n"); + fprintf(fp, "\n"); + fprintf(fp, "\t\t} while(PTR_ERR(buff) == -EAGAIN);\n"); + fprintf(fp, "\n"); + + + /* Reserve the channel */ + //fprintf(fp, "\t\tbuff = relay_reserve(channel->rchan, event_length);\n"); fprintf(fp, "\t\tif(buff == NULL) {\n"); fprintf(fp, "\t\t\t/* Buffer is full*/\n"); fprintf(fp, "\t\t\t/* for debug BUG(); */\n"); // DEBUG! fprintf(fp, "\t\t\tchannel->events_lost[smp_processor_id()]++;\n"); - fprintf(fp, "\t\t\tgoto commit_work;\n"); + fprintf(fp, "\t\t\tbreak;\n"); /* don't commit a NULL reservation! */ fprintf(fp, "\t\t}\n"); /* DEBUG */ - fprintf(fp, "/* for debug printk(\"f%%lu e\%%u \", ltt_facility_%s_%X, event_%s); */", - facName, checksum, ev->name); + //fprintf(fp, "\t\tif(resret == 1) {\n"); + //fprintf(fp, "printk(\"f%%lu e\%%u \", ltt_facility_%s_%X, event_%s);", + // facName, checksum, ev->name); + //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);\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"); - + + if(ev->type != 0) + fprintf(fp, "\t\tchar *ptr = (char*)buff + _offset + header_length;\n"); + + //declare a char pointer if needed : starts at the end of the structs. - if(structCount + hasStrSeq > 1) { - fprintf(fp,"\t\tchar * ptr = (char*)buff + header_length"); - for(pos1=0;pos1name, facName,pos1+1); - } - if(structCount + hasStrSeq > 1) fprintf(fp,";\n"); - } + //if(structCount + hasStrSeq > 1) { + // fprintf(fp,"\t\tchar * ptr = (char*)buff + header_length"); + // for(pos1=0;pos1name, facName,pos1+1); + // } + // if(structCount + hasStrSeq > 1) 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) - fprintf(fp, "\t\t__1 = (struct %s_%s_1 *)(buff + header_length);\n", + if(ev->type != 0) { + 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\t__1 = (struct %s_%s_1 *)(ptr);\n", ev->name, facName); + } //allocate memory for new struct and initialize it //if(whichTypeFirst == 1){ //struct first //for(pos1=0;pos1 1){ - fprintf(fp,"\n\t\t//set ptr to the end of the first struct\n"); - fprintf(fp,"\t\tptr += sizeof(struct %s_%s_1);\n\n",ev->name, facName); - } + //if(structCount + hasStrSeq > 1){ + // fprintf(fp,"\n\t\t//set ptr to the end of the first struct\n"); + // fprintf(fp,"\t\tptr += sizeof(struct %s_%s_1);\n\n",ev->name, facName); + //} //copy struct, sequence and string to buffer seqCount = 0; @@ -606,17 +768,32 @@ void generateStructFunc(FILE * fp, char * facName, unsigned long checksum){ if(td->type == SEQUENCE){ flag = 0; fprintf(fp,"\t\t//copy sequence length and sequence to buffer\n"); + + 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\t*ptr = seqlength_%d;\n",++seqCount); 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\tmemcpy(ptr, %s, sizeof(%s) * seqlength_%d);\n", fld->name, getTypeStr(td), seqCount); - fprintf(fp,"\t\tptr += sizeof(%s) * seqlength_%d;\n\n", + fprintf(fp,"\t\tptr += sizeof(%s) * seqlength_%d;\n\n", getTypeStr(td), seqCount); } else if(td->type==STRING){ flag = 0; fprintf(fp,"\t\t//copy string to buffer\n"); fprintf(fp,"\t\tif(strlength_%d > 0){\n",++strCount); + 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\t\tmemcpy(ptr, %s, strlength_%d + 1);\n", fld->name, strCount); fprintf(fp,"\t\t\tptr += strlength_%d + 1;\n",strCount); @@ -627,6 +804,11 @@ void generateStructFunc(FILE * fp, char * facName, unsigned long checksum){ }else if(td->type==ARRAY){ flag = 0; fprintf(fp,"\t//copy array to buffer\n"); + 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,"\tmemcpy(ptr, %s, sizeof(%s) * %d);\n", fld->name, getTypeStr(td), td->size); fprintf(fp,"\tptr += sizeof(%s) * %d;\n\n", getTypeStr(td), td->size); @@ -634,27 +816,35 @@ void generateStructFunc(FILE * fp, char * facName, unsigned long checksum){ } if(structCount + seqCount > 1) fprintf(fp,"\n"); - fprintf(fp,"\n"); - fprintf(fp,"commit_work:\n"); fprintf(fp,"\n"); fprintf(fp, "\t\t/* Commit the work */\n"); fprintf(fp, "\t\trelay_commit(channel->rchan->buf[smp_processor_id()],\n" "\t\t\t\tbuff, event_length);\n"); + fprintf(fp, "\t\tltt_write_commit_counter(" + "channel->rchan->buf[smp_processor_id()],\n" + "\t\t\t\tbuff);\n"); /* End of traces iteration */ fprintf(fp, "\t}\n\n"); + fprintf(fp, "\n"); + // The generated preempt_check_resched is not dangerous because + // interrupts are disabled. + fprintf(fp, "\tspin_unlock(<t_traces.locks[smp_processor_id()]);\n"); + + fprintf(fp, "unlock:\n"); + fprintf(fp, "\tbarrier();\n"); + fprintf(fp, "\tltt_nesting[smp_processor_id()]--;\n"); fprintf(fp, "\t/* Re-enable interrupts */\n"); fprintf(fp, "\tlocal_irq_restore(_flags);\n"); - fprintf(fp, "\tpreempt_check_resched();\n"); + fprintf(fp, "\tpreempt_enable_no_resched();\n"); + //fprintf(fp, "\tpreempt_check_resched();\n"); - fprintf(fp, "\n"); - fprintf(fp, "unlock_traces:\n"); - fprintf(fp, "\tread_unlock(<t_traces.traces_rwlock);\n"); //call trace function //fprintf(fp,"\n\t//call trace function\n"); //fprintf(fp,"\tltt_log_event(ltt_facility_%s_%X, %s, bufLength, buff);\n",facName,checksum,ev->name); - fprintf(fp,"}\n\n\n"); + fprintf(fp,"}\n"); + fprintf(fp, "#endif //CONFIG_LTT\n\n"); } } @@ -793,7 +983,8 @@ void generateCfile(FILE * fp, char * filefacname){ 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");