Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 364 → Rev 363

/shark/trunk/tracer/include/tracer.h
63,9 → 63,6
#include <ll/i386/hw-instr.h>
#include "FTrace.h"
 
#define TRACER_NO_OUTPUT 0
#define TRACER_UDP_OUTPUT 1
 
#define TRACER_LOGEVENT fast_logevent
 
int tracer_initialize(int OutputType, int MemorySize);
93,7 → 90,6
 
extern int TracerActive;
extern unsigned long long TracerEventsRecorded;
extern unsigned int TracerEventsSaved;
 
SYS_FLAGS f;
 
124,14 → 120,12
if (flag & 3) size += 4;
 
// Adjust FirstTracerBuffer
if (FirstTracerBuffer >= CurrentTracerBuffer && TracerEventsSaved != 0) {
if (FirstTracerBuffer != StartTracerBuffer) {
while ((CurrentTracerBuffer + size - 1) >= FirstTracerBuffer &&
FirstTracerBuffer != StartTracerBuffer) {
FirstTracerBuffer += *(BYTE *)(FirstTracerBuffer + 9);
if (FirstTracerBuffer >= LastBeforeEndTracerBuffer) FirstTracerBuffer = StartTracerBuffer;
}
} else {
TracerEventsSaved++;
}
 
// Check if we overcome EndTracerBuffer
/shark/trunk/tracer/newtrace/udp.c
File deleted
/shark/trunk/tracer/newtrace/tracer.c
8,9 → 8,7
void *FirstTracerBuffer; //The First Valid Event
 
int TracerActive = 0;
int TracerOutputType = TRACER_NO_OUTPUT;
unsigned long long TracerEventsRecorded;
unsigned int TracerEventsSaved;
extern unsigned int clk_per_msec;
 
/* Initialize the tracer
38,10 → 36,7
 
TracerActive = 0;
TracerEventsRecorded = 0;
TracerEventsSaved = 0;
 
TracerOutputType = OutputType;
 
ll_frestore(f);
return 0;
 
71,60 → 66,6
}
 
int send_udp_event(void *p, int size);
 
/* Send NumberOfEvents out of the system
* If NumberOfEvents = -1 all the events will be sent */
int send_logged_data(unsigned int NumberOfEvents) {
 
void *p;
int s,err;
SYS_FLAGS f;
 
f = ll_fsave();
 
if (NumberOfEvents == 0 || TracerEventsSaved == 0) {
ll_frestore(f);
return 0;
}
 
p = FirstTracerBuffer;
s = 0;
while(((p == CurrentTracerBuffer && s == 0) || p != CurrentTracerBuffer) && s != NumberOfEvents) {
 
switch (TracerOutputType) {
case TRACER_NO_OUTPUT:
break;
case TRACER_UDP_OUTPUT:
err = send_udp_event(p,*(BYTE *)(p + 9));
if (err != 0) {
ll_frestore(f);
return s;
}
break;
default:
cprintf("Error: Tracer Output Not Defined\n");
ll_frestore(f);
return -1;
break;
}
 
p += *(BYTE *)(p + 9);
if (p >= LastBeforeEndTracerBuffer) p = StartTracerBuffer;
 
FirstTracerBuffer = p;
TracerEventsSaved--;
 
s++;
 
}
 
ll_frestore(f);
return s;
 
}
 
void tracer_print_statistics() {
 
SYS_FLAGS f;
140,7 → 81,6
cprintf("Last Before End Tracer Buffer: %08x\n\n",(int)LastBeforeEndTracerBuffer);
 
cprintf("Total Events: %d\n",(int)TracerEventsRecorded);
cprintf("Total Saved Events: %d\n",TracerEventsSaved);
 
for (i=0; i<0xFF; i++) {
p = FirstTracerBuffer;
156,6 → 96,8
cprintf("Event type %02x => %d\n",i,t);
}
 
cprintf("Total Saved Events: %d\n",s);
 
ll_frestore(f);
 
}
/shark/trunk/tracer/makefile
16,7 → 16,7
# Object files
 
ifeq ($(findstring NEW,$(TRACER)) , NEW)
OBJS = newtrace/tracer.o newtrace/udp.o
OBJS = newtrace/tracer.o
CFG_OPT += -D__NEW_TRACER__
endif
ifeq ($(findstring OLD,$(TRACER)) , OLD)