Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 441 → Rev 445

/shark/trunk/tracer/include/FTrace.h
39,6 → 39,8
#define FTrace_EVT_task_schedule 0x82
#define FTrace_EVT_task_timer 0x92
#define FTrace_EVT_task_disable 0xA2
#define FTrace_EVT_task_deadline_miss 0xB2
#define FTrace_EVT_task_wcet_violation 0xC2
 
// interrupt events, even more lightweight than ipoints
#define FTrace_EVT_interrupt_start 0x03
/shark/trunk/tracer/newtrace/tracer.c
1,16 → 1,18
#include <stdlib.h>
#include <tracer.h>
 
void *StartTracerBuffer; // Buffer Start
void *EndTracerBuffer; // Buffer End
void *LastBeforeEndTracerBuffer;
void *CurrentTracerBuffer; //The Actual Write Point For The Next Event
void *FirstTracerBuffer; //The First Valid Event
void *StartTracerBuffer; // Buffer Start 0
void *EndTracerBuffer; // Buffer End 4
void *LastBeforeEndTracerBuffer; //8
void *CurrentTracerBuffer; //The Actual Write Point For The Next Event 12
void *FirstTracerBuffer; //The First Valid Event 16
 
int TracerActive = 0;
int TracerOutputType = TRACER_NO_OUTPUT;
unsigned long long TracerEventsRecorded;
unsigned int TracerEventsPresent;
 
int TracerActive = 0; //20
int TracerOutputType = TRACER_NO_OUTPUT; //24
unsigned long long TracerEventsRecorded; //28
unsigned int TracerEventsPresent; //36
 
extern unsigned int clk_per_msec;
 
#define TRACER_DEBUG
92,7 → 94,9
 
p = FirstTracerBuffer;
s = 0;
while(((p == CurrentTracerBuffer && s == 0) || p != CurrentTracerBuffer) && s != NumberOfEvents) {
while(((p == CurrentTracerBuffer && s == 0) || p != CurrentTracerBuffer) &&
s != NumberOfEvents &&
TracerEventsPresent != 0) {
 
switch (TracerOutputType) {
case TRACER_NO_OUTPUT:
/shark/trunk/tracer/newtrace/udp.c
74,29 → 74,19
//Init UDP, if flag = 1 init the network driver
int tracer_init_udp(int flag, char *l_ip, char *t_ip) {
 
#ifndef __NO_NET__
 
SYS_FLAGS f;
 
struct net_model m = net_base;
 
f = ll_fsave();
 
strcpy(local_ip,l_ip);
strcpy(target_ip,t_ip);
 
if (flag) {
 
net_setmode(m, TXTASK);
net_setudpip(m, local_ip, "255.255.255.255");
 
if (net_init(&m) != 1) {
ll_frestore(f);
return -1;
}
 
sleep(1);
 
}
 
ip_str2addr(local_ip,&(local.s_addr));
111,10 → 101,6
TracerOutputType = TRACER_UDP_OUTPUT;
TracerUDPInit = 1;
 
ll_frestore(f);
 
#endif
 
return 0;
 
}
121,8 → 107,6
 
int send_udp_event(void *p, int size) {
 
#ifndef __NO_NET__
 
static BYTE *current = pkt;
static int events_number = 0;
static int packet_number = 0;
182,8 → 166,6
 
}
 
#endif
 
return -1;
 
}
190,8 → 172,6
 
void send_remaining_udp_buffer() {
 
#ifndef __NO_NET__
 
int i;
 
if (TracerUDPInit == 1 && total_pkt_size != 0) {
202,8 → 182,6
for (i=0;i<DELAY_LOOP;i++);
}
 
#endif
 
}
 
//Sender Task