| /shark/trunk/oslib/kl/event.c |
|---|
| 44,9 → 44,6 |
| #include <ll/sys/ll/time.h> |
| #include <ll/sys/ll/event.h> |
| #include <tracer.h> |
| extern unsigned short int currCtx; |
| FILE(Event); |
| extern LL_ARCH ll_arch; |
| 100,8 → 97,6 |
| struct event *p; |
| struct event *p1, *t; |
| TRACER_LOGEVENT(FTrace_EVT_timer_post, 0, 0, 0); |
| if (!freeevents) { |
| message("NO FREE EVENTS !\n"); |
| ll_abort(20); |
| 147,8 → 142,6 |
| { |
| struct event *p1, *t; |
| TRACER_LOGEVENT(FTrace_EVT_timer_delete, 0, 0, 0); |
| t = NULL; |
| /* walk through list, finding spot, adjusting ticks parameter */ |
| for (p1 = firstevent; (p1) && (index != p1->index); p1 = t->next) { |
| 177,8 → 170,6 |
| WORD tmp; |
| #endif |
| TRACER_LOGEVENT(FTrace_EVT_timer_wakeup_start, 0, 0, 0); |
| #ifndef __TSC__ |
| tmp = pit_read(frc); |
| ADDPITSPEC((WORD) (lastTime - tmp), &globalCounter); |
| 218,9 → 209,6 |
| evt_epil(); |
| } |
| activeInt--; |
| TRACER_LOGEVENT(FTrace_EVT_timer_wakeup_end, 1, (int)currCtx, 0); |
| } |
| void event_init(struct ll_initparms *l) |
| /shark/trunk/oslib/kl/event1.c |
|---|
| 41,9 → 41,6 |
| #include <ll/sys/ll/time.h> |
| #include <ll/sys/ll/event.h> |
| #include <tracer.h> |
| extern unsigned short int currCtx; |
| FILE(EventOneShot); |
| extern int activeInt; |
| 73,8 → 70,6 |
| int done; |
| DWORD tnext; |
| TRACER_LOGEVENT(FTrace_EVT_timer_post, 0, 0, 0); |
| if (!freeevents) { |
| message("NO FREE EVENTS !\n"); |
| ll_abort(20); |
| 143,8 → 138,6 |
| #endif |
| DWORD tnext; |
| TRACER_LOGEVENT(FTrace_EVT_timer_wakeup_start, 0, 0, 0); |
| #ifndef __TSC__ |
| tmp = pit_read(frc); |
| 224,8 → 217,6 |
| #endif |
| } |
| TRACER_LOGEVENT(FTrace_EVT_timer_wakeup_end, 1, (int)currCtx, 0); |
| } |
| int oneshot_event_delete(int index) |
| 235,8 → 226,6 |
| DWORD tnext; |
| int firstdeleted = FALSE; |
| TRACER_LOGEVENT(FTrace_EVT_timer_delete, 0, 0, 0); |
| t = NULL; |
| /* walk through list, finding spot, adjusting ticks parameter */ |
| /shark/trunk/oslib/kl/makefile |
|---|
| 14,7 → 14,6 |
| C_OPT += -D__VIRCSW__ |
| ASM_OPT += -D__VIRCSW__ |
| INCL += -I$(BASE)/../tracer/include |
| #C_OPT += -DPROFILE |
| #ASM_OPT += -DPROFILE |
| /shark/trunk/oslib/mk/gnu.mk |
|---|
| 29,13 → 29,6 |
| endif |
| endif |
| ifeq ($(findstring NEW,$(TRACER)) , NEW) |
| CFG_OPT += -D__NEW_TRACER__ |
| endif |
| ifeq ($(findstring OLD,$(TRACER)) , OLD) |
| CFG_OPT += -D__OLD_TRACER__ |
| endif |
| C_OPT = -Wall -O -fno-builtin -nostdinc $(CFG_OPT) -D__GNU__ -I$(INCL) -DMAIN=__kernel_init__ |
| ASM_OPT = -x assembler-with-cpp $(CFG_OPT) -D__GNU__ -I$(INCL) |
| LINK_OPT = -T $(BASE)/mk/os.x -Bstatic -Ttext 0x320000 -oformat coff-go32 -s -nostartfiles -nostdlib -L$(LIB_PATH) |
| /shark/trunk/oslib/mk/linux.mk |
|---|
| 9,7 → 9,7 |
| LIB_DIR = $(BASE)/lib |
| ifeq ($(TSC),TRUE) |
| CFG_OPT += -D__TSC__ |
| CFG_OPT = -D__TSC__ |
| ifeq ($(APIC),TRUE) |
| CFG_OPT += -D__APIC__ |
| endif |
| 29,13 → 29,6 |
| endif |
| endif |
| ifeq ($(findstring NEW,$(TRACER)) , NEW) |
| CFG_OPT += -D__NEW_TRACER__ |
| endif |
| ifeq ($(findstring OLD,$(TRACER)) , OLD) |
| CFG_OPT += -D__OLD_TRACER__ |
| endif |
| C_OPT = -Wall -O -fno-builtin -nostdinc -D__LINUX__ $(CFG_OPT) -DMAIN=__kernel_init__ -I$(INCL) |
| ASM_OPT = -x assembler-with-cpp -D__LINUX__ $(CFG_OPT) -I$(INCL) |
| LINK_OPT = -Bstatic -Ttext 0x220000 -s -nostartfiles -nostdlib -L$(LIB_PATH) |
| /shark/trunk/oslib/xlib/ctxsw.c |
|---|
| 25,8 → 25,6 |
| #include <ll/i386/hw-func.h> |
| #include <ll/i386/tss-ctx.h> |
| #include <tracer.h> |
| FILE(Context-Switch); |
| extern unsigned short int currCtx; |
| 41,7 → 39,6 |
| #ifdef __VIRCSW__ |
| currCtx = c; |
| if (activeInt == 0) { |
| TRACER_LOGEVENT(FTrace_EVT_context_switch, 1, (int)c, 0); |
| context_load(c); |
| } |
| #else |
| 66,6 → 63,5 |
| void ll_context_load(CONTEXT c) |
| { |
| currCtx = c; |
| TRACER_LOGEVENT(FTrace_EVT_context_switch, 1, (int)c, 0); |
| context_load(c); |
| } |
| /shark/trunk/oslib/xlib/makefile |
|---|
| 10,7 → 10,6 |
| C_OPT += -D__VIRCSW__ |
| ASM_OPT += -D__VIRCSW__ |
| INCL += -I$(BASE)/../tracer/include |
| #C_OPT += -DPROFILE |
| #ASM_OPT += -DPROFILE |