Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 1210 → Rev 1209

/demos/trunk/loader/loader.c
510,15 → 510,9
if (current->task_type == PAR_TASK_FSF) {
 
if (current->local_scheduler == PAR_POSIX) {
NRT_TASK_MODEL nrt;
pthread_t j;
int err;
 
nrt_task_default_model(nrt);
nrt_task_def_save_arrivals(nrt);
nrt_task_def_ctrl_jet(nrt);
err = fsf_create_thread(current->server,&j,NULL,back_task,(void *)current,&nrt);
err = fsf_create_thread(current->server,&j,NULL,back_task,(void *)current,NULL);
if (err) {
cprintf("Error fsf task creating\n");
sys_end();
531,10 → 525,8
int err;
 
hard_task_default_model(ht);
hard_task_def_ctrl_jet(ht);
hard_task_def_mit(ht,TIMESPEC2USEC(&current->deadline));
hard_task_def_wcet(ht,TIMESPEC2USEC(&current->wcet));
 
err = fsf_create_thread(current->server,&j,NULL,test_task,(void *)current,&ht);
if (err) {
cprintf("Error fsf task creating\n");
551,8 → 543,6
hard_task_default_model(ht);
hard_task_def_mit(ht,TIMESPEC2USEC(&current->deadline));
hard_task_def_wcet(ht,TIMESPEC2USEC(&current->wcet));
hard_task_def_ctrl_jet(ht);
 
err = fsf_create_thread(current->server,&j,NULL,test_task,(void *)current,&ht);
if (err) {
cprintf("Error fsf task creating\n");
/demos/trunk/fsf/test3.c
329,7 → 329,6
 
int err;
HARD_TASK_MODEL ht;
NRT_TASK_MODEL nrt;
struct timespec endtimer;
 
pthread_mutex_init(&mux,NULL);
336,20 → 335,18
 
srand(kern_gettime(NULL));
create();
 
nrt_task_default_model(nrt);
kern_gettime(&endtimer);
endtimer.tv_sec += 20;
kern_event_post(&endtimer, (void (*)(void *))(sys_end), NULL);
 
err = fsf_create_thread(server1,&j1,NULL,star,NULL,&nrt);
err = fsf_create_thread(server1,&j1,NULL,star,NULL,NULL);
kern_printf("(%d)",err);
err = fsf_create_thread(server2,&j2,NULL,star,NULL,&nrt);
err = fsf_create_thread(server2,&j2,NULL,star,NULL,NULL);
kern_printf("(%d)",err);
err = fsf_create_thread(server3,&j3,NULL,star,NULL,&nrt);
err = fsf_create_thread(server3,&j3,NULL,star,NULL,NULL);
kern_printf("(%d)",err);
hard_task_default_model(ht);
364,13 → 361,13
err = fsf_create_thread(server4,&j4,NULL,periodic_star,NULL,&ht);
kern_printf("(%d)",err);
*/
err = fsf_create_thread(server1,&j1,NULL,star,NULL,&nrt);
err = fsf_create_thread(server1,&j1,NULL,star,NULL,NULL);
kern_printf("(%d)",err);
err = fsf_create_thread(server2,&j2,NULL,star,NULL,&nrt);
err = fsf_create_thread(server2,&j2,NULL,star,NULL,NULL);
kern_printf("(%d)",err);
err = fsf_create_thread(server3,&j3,NULL,star,NULL,&nrt);
err = fsf_create_thread(server3,&j3,NULL,star,NULL,NULL);
kern_printf("(%d)",err);
 
return 0;
/demos/trunk/fsf/test2.c
195,12 → 195,11
 
void add_posixstar_thread(fsf_server_id_t server)
{
NRT_TASK_MODEL nrt;
 
pthread_t j = -1;
nrt_task_default_model(nrt);
fsf_create_thread(server, &j, NULL, test_task_variable, NULL, &nrt);
 
fsf_create_thread(server, &j, NULL, test_task_variable, NULL, NULL);
 
}
 
void add_edfstar_thread(fsf_server_id_t server)
/demos/trunk/fsf/test1.c
282,8 → 282,7
 
int main(int argc, char **argv)
{
NRT_TASK_MODEL nrt;
 
char ch = 0;
int err;
 
291,28 → 290,24
 
create();
 
nrt_task_default_model(nrt);
nrt_task_def_save_arrivals(nrt);
nrt_task_def_ctrl_jet(nrt);
 
do {
ch = keyb_getch(BLOCK);
 
switch(ch) {
case '1':
err = fsf_create_thread(server1,&j1,NULL,star,NULL,&nrt);
err = fsf_create_thread(server1,&j1,NULL,star,NULL,NULL);
kern_printf("(%d)",err);
break;
case '2':
err = fsf_create_thread(server2,&j2,NULL,star,NULL,&nrt);
err = fsf_create_thread(server2,&j2,NULL,star,NULL,NULL);
kern_printf("(%d)",err);
break;
case '3':
err = fsf_create_thread(server1,&j3,NULL,star,NULL,&nrt);
err = fsf_create_thread(server1,&j3,NULL,star,NULL,NULL);
kern_printf("(%d)",err);
break;
case '4':
err = fsf_create_thread(server2,&j4,NULL,star,NULL,&nrt);
err = fsf_create_thread(server2,&j4,NULL,star,NULL,NULL);
kern_printf("(%d)",err);
break;
case 'q':