Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 1539 → Rev 1540

/demos/trunk/loader/loadfile/loadm.fsf
15,7 → 15,8
# 1 INDETERMINATED
#
# LOCAL SCHEDULER
# POSIX - DEFAULT FOR THE FRAMEWORK
# NONE - DEFAULT FOR THE FRAMEWORK
# POSIX
# EDF
# RM
#
58,10 → 59,10
 
TASK SECTION
 
CT:[0]:EDF:[3]:[1][0]:[0][40000]:ACT_PERIODIC([1][0],[1][0]):
CT:[0]:EDF:[2]:[1][0]:[0][40000]:ACT_PERIODIC([1][0],[1][0]):
:EXEC_CONST([0][16000]):CRIT([0],[0][2000]);
 
CT:[1]:EDF:[7]:[1][0]:[0][40000]:ACT_PERIODIC([2][0],[1][0]):
CT:[1]:EDF:[2]:[1][0]:[0][40000]:ACT_PERIODIC([2][0],[1][0]):
:EXEC_MEAN([0][16000],[0][10000]):CRIT([0],[0][2000]);
 
BT:[2]:POSIX:[2]:[0][0]:[0][0]:ACT_SINGLE([3][0]):
/demos/trunk/loader/loadfile/load.fsf
15,9 → 15,10
# 1 INDETERMINATED
#
# LOCAL SCHEDULER
# POSIX - DEFAULT FOR THE FRAMEWORK
# POSIX
# EDF
# RM
# NONE DEFAULT FROM THE FRAMEWORK
#
# TASK SECTION
#
/demos/trunk/loader/common/lconst.h
32,5 → 32,6
#define PAR_POSIX 30
#define PAR_EDF 31
#define PAR_RM 32
#define PAR_NONE 33
 
#define PAR_FSF_SERVER 33
#define PAR_FSF_SERVER 34
/demos/trunk/loader/common/nload.c
276,7 → 276,7
break;
}
if (err) {
printf("Error fsf task creating\n");
printf("Error fsf task creating %d\n", err);
generic_end_simulation();
}
/demos/trunk/loader/shark/shark.c
86,7 → 86,16
return &ht;
}
 
if (current->local_scheduler == PAR_NONE) {
static DUMMY_TASK_MODEL d;
 
dummy_task_default_model(d);
dummy_task_def_group(d,current->group);
 
return &d;
}
 
 
if (current->local_scheduler == PAR_RM) {
static HARD_TASK_MODEL ht;
172,9 → 181,9
int i;
struct loader_task *l = loader_task_list;
struct timespec end_time;
PI_mutexattr_t a;
PISTAR_mutexattr_t a;
 
PI_mutexattr_default(a);
PISTAR_mutexattr_default(a);
 
i = 0;
 
/demos/trunk/loader/generators/lparser.c
151,6 → 151,13
*val = PAR_RM;
return PAR_FOUND;
}
 
if (!strncmp(*buf,"NONE",2)) {
*buf += 4;
*val = PAR_NONE;
return PAR_FOUND;
}
 
return PAR_ERROR;
break;