Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 549 → Rev 550

/shark/trunk/tracer/include/FTrace_OSD.h
26,7 → 26,7
int FTrace_OSD_compress_chunk(int number, void *temp_data, int *data_size);
 
/* OSD Send Chunk out */
int FTrace_OSD_send_chunk(int number, int osd_flags);
int FTrace_OSD_send_chunk(FTrace_Chunk_Ptr c, int osd_flags);
 
/* OSD Chunk Dump */
int FTrace_OSD_chunk_dump(FTrace_Chunk_Ptr c);
/shark/trunk/tracer/newtrace/FTrace.c
534,7 → 534,7
 
FTrace_unlock();
 
err = FTrace_OSD_send_chunk(number, osd_flags);
err = FTrace_OSD_send_chunk(FT_temp, osd_flags);
if (err != 0) {
#ifdef FTRACE_DEBUG
FTrace_printf("FTrace Error: Cannot send the chunk\n");
/shark/trunk/tracer/newtrace/FTrace_OSD.c
2,6 → 2,8
#include <FTrace_OSD.h>
#include <FTrace_types.h>
 
#include <FTrace_udp.h>
 
#include <kernel/kern.h>
#include <stdlib.h>
 
107,9 → 109,22
 
}
 
int FTrace_OSD_send_chunk(int number, int osd_flag)
int FTrace_OSD_send_chunk(FTrace_Chunk_Ptr c, int osd_flag)
{
 
DWORD total_size = (DWORD)(c->size) + (DWORD)(c->emergency_size);
DWORD start = (DWORD)(c->osd + FTRACE_OSD_CHUNK_HEAD);
DWORD current = start;
 
while (current+16 <= start+total_size) {
 
if (*(DWORD *)(current) != 0)
send_udp_event((void *)(current), 16);
 
current += 16;
 
}
 
return 0;
 
}
/shark/trunk/tracer/makefile
16,7 → 16,8
# Object files
 
ifeq ($(findstring NEW,$(TRACER)) , NEW)
OBJS = newtrace/FTrace.o newtrace/FTrace_OSD.o newtrace/FTrace_OSD_ll.o
OBJS = newtrace/FTrace.o newtrace/FTrace_OSD.o newtrace/FTrace_OSD_ll.o\
newtrace/FTrace_udp.o
CFG_OPT += -D__NEW_TRACER__
endif
ifeq ($(findstring OLD,$(TRACER)) , OLD)