Subversion Repositories shark

Compare Revisions

Regard whitespace Rev 1530 → Rev 1531

/demos/trunk/loader/loadfile/loadm.fsf
50,23 → 50,22
 
CONTRACT SECTION
 
[0]:[0][3000]:[0][10000]:[0][3000]:[0][10000]:[0]:[0][0]:POSIX;
[1]:[0][6000]:[0][30000]:[0][6000]:[0][30000]:[0]:[0][0]:EDF;
[2]:[0][6000]:[0][60000]:[0][6000]:[0][60000]:[0]:[0][0]:EDF;
[0]:[0][6000]:[0][30000]:[0][6000]:[0][30000]:[0]:[0][0]:EDF;
[1]:[0][6000]:[0][60000]:[0][6000]:[0][60000]:[0]:[0][0]:EDF;
[2]:[0][12000]:[0][60000]:[0][12000]:[0][60000]:[0]:[0][0]:POSIX;
 
 
END
 
TASK SECTION
 
BT:[0]:POSIX:[3]:[0][0]:[0][0]:ACT_SINGLE([2][0]):
:EXEC_CONST([0][25000]):NO_CRIT;
CT:[0]:EDF:[3]:[1][0]:[0][40000]:ACT_PERIODIC([0][0],[1][0]):
:EXEC_CONST([0][16000]):CRIT([0],[0][1000]);
 
CT:[1]:EDF:[3]:[1][0]:[0][40000]:ACT_PERIODIC([0][0],[1][0]):
:EXEC_CONST([0][16000]):NO_CRIT;
CT:[1]:EDF:[7]:[1][0]:[0][40000]:ACT_PERIODIC([1][0],[1][0]):
:EXEC_CONST([0][16000]):CRIT([0],[0][1000]);
 
CT:[2]:EDF:[7]:[1][0]:[0][40000]:ACT_PERIODIC([1][0],[1][0]):
:EXEC_CONST([0][16000]):NO_CRIT;
BT:[2]:POSIX:[2]:[0][0]:[0][0]:ACT_SINGLE([2][0]):
:EXEC_CONST([0][10000]):CRIT([0],[0][1000]);
 
END
 
/demos/trunk/loader/shark/shark.c
174,6 → 174,7
int i, object;
struct loader_task *l = loader_task_list;
struct timespec end_time;
int res;
 
i = 0;
object = 0;
200,13 → 201,14
while (i < total_loader_task) {
if (l->muxstatus == 1) {
fsf_init_shared_object(&(mutex_table[l->resource]).object,object);
res = fsf_init_shared_object(&(mutex_table[l->resource]).object,l->resource);
if (res != -1) {
mutex_table[l->resource].operation.op_id=1;
mutex_table[l->resource].operation.wcet.tv_sec=l->block[i].tv_sec;
mutex_table[l->resource].operation.wcet.tv_nsec=l->block[i].tv_nsec;
mutex_table[l->resource].operation.wcet.tv_sec=l->block[0].tv_sec;
mutex_table[l->resource].operation.wcet.tv_nsec=l->block[0].tv_nsec;
fsf_declare_shared_object_operation(&mutex_table[l->resource].object,
&mutex_table[l->resource].operation);
 
}
l->muxstatus = 2;
}