Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 1690 → Rev 1689

/demos/trunk/base/Makefile
File deleted
/demos/trunk/base/mdemo.c
70,7 → 70,7
task_activate((PID)a);
}
 
TASK J1()
TASK j1()
{
cprintf("J1: before locking m0\n");
mutex_lock(&m0);
142,7 → 142,7
hard_task_def_mit(m,10000000);
PC_res_default_model(r,0);
SRP_res_default_model(srp,3);
p0 = task_createn("J1", J1, (TASK_MODEL *)&m, &r, &srp, SRP_usemutex(&m0), NULL);
p0 = task_createn("J1", j1, (TASK_MODEL *)&m, &r, &srp, SRP_usemutex(&m0), NULL);
if (p0 == NIL)
{ cprintf("Can't create J1 task...\n"); return 1; }
 
/demos/trunk/base/makefile
0,0 → 1,92
#
#
#
 
ifndef BASE
BASE=../..
endif
include $(BASE)/config/config.mk
 
PROGS = sig time preempt
PROGS += aster aster1 aster2 aster3 aster4 aster5 aster6 aster7 aster8
PROGS += pcidemo
PROGS += jointest condtest intsem semdemo pidemo pcdemo srpdemo mdemo
PROGS += ego fly cabs
 
include $(BASE)/config/example.mk
 
# Text applications
time:
make -f $(SUBMAKE) APP=time INIT= OTHEROBJS="ihello.o" OTHERINCL= SHARKOPT=
 
sig:
make -f $(SUBMAKE) APP=sig INIT= OTHEROBJS="ihello.o" OTHERINCL= SHARKOPT=
 
preempt:
make -f $(SUBMAKE) APP=preempt INIT= OTHEROBJS="initfile.o" OTHERINCL= SHARKOPT="__LINUXC26__ __INPUT__"
 
semdemo:
make -f $(SUBMAKE) APP=semdemo INIT= OTHEROBJS="isemdemo.o" OTHERINCL= SHARKOPT=
 
pidemo:
make -f $(SUBMAKE) APP=pidemo INIT= OTHEROBJS="imdemo.o" OTHERINCL= SHARKOPT=
 
pcdemo:
make -f $(SUBMAKE) APP=pcdemo INIT= OTHEROBJS="imdemo.o" OTHERINCL= SHARKOPT=
 
srpdemo:
make -f $(SUBMAKE) APP=srpdemo INIT= OTHEROBJS="imdemo.o" OTHERINCL= SHARKOPT=
 
mdemo:
make -f $(SUBMAKE) APP=mdemo INIT= OTHEROBJS="imdemo.o" OTHERINCL= SHARKOPT=
 
aster:
make -f $(SUBMAKE) APP=aster INIT= OTHEROBJS="initfile.o" OTHERINCL= SHARKOPT="__LINUXC26__ __INPUT__"
 
aster1:
make -f $(SUBMAKE) APP=aster1 INIT= OTHEROBJS="iaster1.o" OTHERINCL= SHARKOPT=
 
aster2:
make -f $(SUBMAKE) APP=aster2 INIT= OTHEROBJS="iaster1.o" OTHERINCL= SHARKOPT=
 
aster3:
make -f $(SUBMAKE) APP=aster3 INIT= OTHEROBJS="iaster3.o" OTHERINCL= SHARKOPT=
 
aster4:
make -f $(SUBMAKE) APP=aster4 INIT= OTHEROBJS="iaster4.o" OTHERINCL= SHARKOPT="__LINUXC26__ __INPUT__"
 
aster5:
make -f $(SUBMAKE) APP=aster5 INIT= OTHEROBJS="initfile.o" OTHERINCL= SHARKOPT="__LINUXC26__ __INPUT__"
 
aster6:
make -f $(SUBMAKE) APP=aster6 INIT= OTHEROBJS="iaster6.o" OTHERINCL= SHARKOPT="__LINUXC26__ __INPUT__"
 
aster7:
make -f $(SUBMAKE) APP=aster7 INIT= OTHEROBJS="iaster7.o" OTHERINCL= SHARKOPT="__LINUXC26__ __INPUT__"
 
aster8:
make -f $(SUBMAKE) APP=aster8 INIT= OTHEROBJS="iaster8.o" OTHERINCL= SHARKOPT="__LINUXC26__ __INPUT__"
 
pcidemo:
make -f $(SUBMAKE) APP=pcidemo INIT= OTHEROBJS="ipcidemo.o" OTHERINCL= SHARKOPT="__LINUXC26__ __PCI__"
 
jointest:
make -f $(SUBMAKE) APP=jointest INIT= OTHEROBJS="imdemo.o" OTHERINCL= SHARKOPT=
 
condtest:
make -f $(SUBMAKE) APP=condtest INIT= OTHEROBJS="imdemo.o" OTHERINCL= SHARKOPT=
 
intsem:
make -f $(SUBMAKE) APP=intsem INIT= OTHEROBJS="imdemo.o" OTHERINCL= SHARKOPT=
 
# Graphical applications
 
ego:
make -f $(SUBMAKE) APP=ego INIT= OTHEROBJS="initgraph.o" OTHERINCL= SHARKOPT="__LINUXC26__ __PCI__ __INPUT__ __FB__"
 
fly:
make -f $(SUBMAKE) APP=fly INIT= OTHEROBJS="initgraph.o" OTHERINCL= SHARKOPT="__LINUXC26__ __PCI__ __INPUT__ __FB__"
 
cabs:
make -f $(SUBMAKE) APP=cabs INIT= OTHEROBJS="initgraph.o" OTHERINCL= SHARKOPT="__LINUXC26__ __PCI__ __INPUT__ __FB__"
 
/demos/trunk/base/pcdemo.c
71,7 → 71,7
task_activate((PID)a);
}
 
TASK J0()
TASK j0()
{
cprintf("J0: before locking m0\n");
mutex_lock(&m0);
87,7 → 87,7
}
 
 
TASK J1()
TASK j1()
{
cprintf("J1: before locking m2\n");
mutex_lock(&m2);
144,7 → 144,7
hard_task_def_mit(m, 1000000);
hard_task_def_wcet(m, 20000);
PC_res_default_model(r,0);
p0 = task_create("J0", J0, &m, &r);
p0 = task_create("J0", j0, &m, &r);
if (p0 == NIL)
{ cprintf("Can't create J0 task...\n"); return 1; }
 
152,7 → 152,7
hard_task_def_mit(m, 2100000);
hard_task_def_wcet(m, 20000);
PC_res_default_model(r,1);
p1 = task_create("J1", J1, &m, &r);
p1 = task_create("J1", j1, &m, &r);
if (p1 == NIL)
{ cprintf("Can't create J1 task...\n"); return 1; }
 
/demos/trunk/base/condtest.c
61,7 → 61,7
 
PID p0,p1,p2,p3;
 
TASK J0()
TASK j0()
{
cprintf("J0: before locking m0\n");
mutex_lock(&m0);
77,7 → 77,7
}
 
 
TASK J1()
TASK j1()
{
cprintf("J1: before locking m0\n");
mutex_lock(&m0);
93,7 → 93,7
}
 
 
TASK J2()
TASK j2()
{
 
cprintf("J2: started, waiting t=0.5 sec\n");
134,7 → 134,7
cprintf("J3: unlocked m0 by the cleanup function\n");
}
 
TASK J3()
TASK j3()
{
cprintf("J3: before locking m0\n");
mutex_lock(&m0);
167,19 → 167,19
 
nrt_task_default_model(m);
nrt_task_def_group(m,1);
p0 = task_create("J0", J0, &m, NULL);
p0 = task_create("J0", j0, &m, NULL);
if (p0 == NIL)
{ cprintf("Can't create J0 task...\n"); return 1; }
 
p1 = task_create("J1", J1, &m, NULL);
p1 = task_create("J1", j1, &m, NULL);
if (p1 == NIL)
{ cprintf("Can't create J1 task...\n"); return 1; }
 
p2 = task_create("J2", J2, &m, NULL);
p2 = task_create("J2", j2, &m, NULL);
if (p2 == NIL)
{ cprintf("Can't create J2 task...\n"); return 1; }
 
p3 = task_create("J3", J3, &m, NULL);
p3 = task_create("J3", j3, &m, NULL);
if (p3 == NIL)
{ cprintf("Can't create J3 task...\n"); return 1; }