Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 1257 → Rev 1258

/demos/trunk/loader/time.h
File deleted
/demos/trunk/loader/loadfile.txt
File deleted
/demos/trunk/loader/fsfinit.c
File deleted
/demos/trunk/loader/shark.h
File deleted
/demos/trunk/loader/parser.c
File deleted
/demos/trunk/loader/parser.h
File deleted
/demos/trunk/loader/load.txt
File deleted
/demos/trunk/loader/initfile.c
File deleted
/demos/trunk/loader/lparser.c
File deleted
/demos/trunk/loader/lconst.h
File deleted
/demos/trunk/loader/lparser.h
File deleted
/demos/trunk/loader/lread.c
File deleted
/demos/trunk/loader/func.h
File deleted
/demos/trunk/loader/dosread.c
File deleted
/demos/trunk/loader/loader.c
File deleted
/demos/trunk/loader/lread.h
File deleted
/demos/trunk/loader/nload.c
File deleted
/demos/trunk/loader/dosread.h
File deleted
/demos/trunk/loader/event_gen.c
File deleted
/demos/trunk/loader/nload.h
File deleted
/demos/trunk/loader/shark.c
File deleted
/demos/trunk/loader/loadfile/load.fsf
68,7 → 68,7
BT:[2]:POSIX:[1]:[0][0]:[0][0]:ACT_SINGLE([5][0]):
:EXEC_CONST([0][16000]):NO_CRIT;
 
BT:[3]:POSIX:[1]:[0][0]:[0][0]:ACT_SINGLE([6][0]):
:EXEC_CONST([0][20000]):NO_CRIT;
CT:[3]:POSIX:[1]:[0][0]:[0][0]:ACT_MEAN([1][0],[0][10000],[0][1000]):
:EXEC_MEAN([0][20000],[0][10000]):NO_CRIT;
 
END
/demos/trunk/loader/generators/lparser.c
338,16 → 338,6
} else par_error(line_num);
}
 
if (ld->exec_type != PAR_EXEC_CONST) {
res = find_break(pbuf,PAR_TIME, &time, &val);
if (res == PAR_FOUND) {
#ifdef PARSER_DEBUG
printf(",[%ld][%ld]",time.tv_sec,time.tv_nsec/1000);
#endif
TIMESPEC_ASSIGN(&ld->exec_par_3,&time);
} else par_error(line_num);
}
#ifdef PARSER_DEBUG
printf(")\n");
#endif
/demos/trunk/loader/generators/event_gen.c
277,12 → 277,14
file_exec_header = fopen(ACT_LIST,"a+");
if (file_exec_header == NULL) return 1;
exec_time_usec = TIMESPEC2USEC(&c->exec_par_2) + random() % TIMESPEC2USEC(&c->exec_par_3) - TIMESPEC2USEC(&c->exec_par_3) / 2;
exec_time_usec = TIMESPEC2USEC(&c->exec_par_1)
+ random() % TIMESPEC2USEC(&c->exec_par_2) - TIMESPEC2USEC(&c->exec_par_2) / 2;
fprintf(file_exec_header,"struct timespec exec_%s[] = {{%d,%d},\n",c->name,
exec_time_usec / 1000000, exec_time_usec % 1000000 * 1000);
for (i=0; i< c->act_number-1; i++) {
exec_time_usec = TIMESPEC2USEC(&c->exec_par_2) + random() % TIMESPEC2USEC(&c->exec_par_3) - TIMESPEC2USEC(&c->exec_par_3) / 2;
exec_time_usec = TIMESPEC2USEC(&c->exec_par_1)
+ random() % TIMESPEC2USEC(&c->exec_par_2) - TIMESPEC2USEC(&c->exec_par_2) / 2;
fprintf(file_exec_header," {%d,%d},\n",
exec_time_usec / 1000000, exec_time_usec % 1000000 * 1000);
}
/demos/trunk/loader/generators/lparser.h
19,7 → 19,6
int exec_type;
struct timespec exec_par_1;
struct timespec exec_par_2;
struct timespec exec_par_3;
struct timespec deadline;
struct timespec wcet;