Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 1490 → Rev 1489

/demos/trunk/newtrace/instr/instr.c
25,8 → 25,6
#include <kernel/kern.h>
#include <tracer.h>
 
#define IPOINT(a) TRACER_LOGEVENT(FTrace_EVT_ipoint,(a),0);
 
int num_aster = 0;
#define ASTER_LIM 67
#define ASTER_MAX 90
36,18 → 34,17
int i = 1;
int y = 0;
 
IPOINT(1000);
FAST_TRACER_LOGEVENT(FTrace_EVT_ipoint,1000,0);
 
y = rand() % 20 + 1;
 
while (i < ASTER_LIM) {
 
IPOINT(1001);
FAST_TRACER_LOGEVENT(FTrace_EVT_ipoint,1001,0);
 
puts_xy(i,y,WHITE,"*");
 
IPOINT(1002);
task_testcancel();
FAST_TRACER_LOGEVENT(FTrace_EVT_ipoint,1002,0);
task_endcycle();
 
puts_xy(i,y,WHITE," ");
54,10 → 51,10
i++;
}
 
IPOINT(1003);
FAST_TRACER_LOGEVENT(FTrace_EVT_ipoint,1003,0);
num_aster--;
 
IPOINT(1004);
FAST_TRACER_LOGEVENT(FTrace_EVT_ipoint,1004,0);
return 0;
 
}
71,19 → 68,18
HARD_TASK_MODEL m;
int r;
 
IPOINT(2000);
FAST_TRACER_LOGEVENT(FTrace_EVT_ipoint,2000,0);
 
hard_task_default_model(m);
hard_task_def_wcet(m,500);
hard_task_def_group(m,3);
 
while (1) {
IPOINT(2001);
FAST_TRACER_LOGEVENT(FTrace_EVT_ipoint,2001,0);
 
if (num_aster < ASTER_MAX) {
 
IPOINT(2002);
FAST_TRACER_LOGEVENT(FTrace_EVT_ipoint,2002,0);
 
r = (rand() % 50) - 25;
 
95,13 → 91,12
num_aster++;
}
 
IPOINT(2003);
task_testcancel();
FAST_TRACER_LOGEVENT(FTrace_EVT_ipoint,2003,0);
task_endcycle();
 
}
 
IPOINT(2004);
FAST_TRACER_LOGEVENT(FTrace_EVT_ipoint,2004,0);
 
}
 
109,32 → 104,32
{
int s = 0, m = 0;
 
IPOINT(3000);
FAST_TRACER_LOGEVENT(FTrace_EVT_ipoint,3000,0);
 
while(1) {
 
IPOINT(3001);
FAST_TRACER_LOGEVENT(FTrace_EVT_ipoint,3001,0);
 
printf_xy(70,1,WHITE,"%2d : %2d",m,s);
IPOINT(3002);
FAST_TRACER_LOGEVENT(FTrace_EVT_ipoint,3002,0);
task_endcycle();
 
if (++s > 59) {
 
IPOINT(3003);
FAST_TRACER_LOGEVENT(FTrace_EVT_ipoint,3003,0);
s = 0;
m++;
 
}
IPOINT(3004);
FAST_TRACER_LOGEVENT(FTrace_EVT_ipoint,3004,0);
 
printf_xy(70,1,WHITE,"%2d : %2d",m,s);
 
IPOINT(3005);
FAST_TRACER_LOGEVENT(FTrace_EVT_ipoint,3005,0);
task_endcycle();
 
}
IPOINT(3006);
FAST_TRACER_LOGEVENT(FTrace_EVT_ipoint,3006,0);
 
}
 
151,7 → 146,7
hard_task_default_model(m);
hard_task_def_mit(m,10000);
hard_task_def_wcet(m,2000);
hard_task_def_group(m,2);
hard_task_def_group(m,1);
 
p1 = task_create("Aster",aster,&m,NULL);
if (p1 == -1) {
166,7 → 161,7
sys_end();
}
 
group_activate(2);
group_activate(1);
 
do {
sys_gettime(&t);
207,13 → 202,6
 
printf_xy(1,21,WHITE,"Logged Time %d s %d us",(int)diff.tv_sec,(int)diff.tv_nsec/1000);
 
group_kill(2);
group_kill(3);
 
FTrace_OSD_init_udp(1, "192.168.82.43", "192.168.82.20");
FTrace_send_chunk(a, 0, FTRACE_CHUNK_FLAG_FREE | FTRACE_CHUNK_FLAG_CYC);
 
sys_end();
 
return 0;