Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 352 → Rev 353

/shark/trunk/kernel/kern.c
18,11 → 18,11
 
/**
------------
CVS : $Id: kern.c,v 1.5 2003-05-01 19:40:53 pj Exp $
CVS : $Id: kern.c,v 1.6 2003-12-10 16:54:59 giacomo Exp $
 
File: $File$
Revision: $Revision: 1.5 $
Last update: $Date: 2003-05-01 19:40:53 $
Revision: $Revision: 1.6 $
Last update: $Date: 2003-12-10 16:54:59 $
------------
 
This file contains:
71,8 → 71,9
#include <errno.h>
#include <kernel/var.h>
#include <kernel/func.h>
#include <kernel/trace.h>
 
#include <tracer.h>
 
/*----------------------------------------------------------------------*/
/* Kernel System variables */
/*----------------------------------------------------------------------*/
279,9 → 280,6
 
// kern_printf("]");
 
/* tracer stuff */
//trc_logevent(exec,TRC_SCHEDULE,NULL,0);
 
/* we follow the shadow chain */
old_exec_shadow=exec_shadow;
exec_shadow = exec = p;
289,9 → 287,8
exec_shadow = proc_table[exec_shadow].shadow;
 
/* tracer stuff */
//trc_logevent(exec_shadow,TRC_DISPATCH,NULL,0);
if (old_exec_shadow!=exec_shadow)
trc_logevent(TRC_SCHEDULE,&exec_shadow);
TRACER_LOGEVENT(FTrace_EVT_task_schedule,1,exec_shadow,0);
// kern_printf("[%i->%i]",old_exec_shadow,exec_shadow);
 
/* we control the correctness of the shadows when we kill */
374,8 → 371,6
/* Kernel main system functions */
/*----------------------------------------------------------------------*/
 
extern int trc_systemevents(trc_event_t *evt, int event, void *ptr);
 
/*+
This function initialize
- the virtual machine (timer, interrupt, mem)
485,13 → 480,6
 
sys_tick = __kernel_register_levels__(multiboot);
 
/* tracer stuff */
/*
trc_register_eventclass(TRC_CLASS_SYSTEM,
TRC_SYSTEMNUMBER,
trc_systemevents);
*/
/* test on system tick */
if (sys_tick>=55000) {
printk("The system tick must be less than 55 mSec!");
538,7 → 526,9
// sys_atexit((void(*)(void *))C8042_restore,NULL,AFTER_EXIT);
 
/* tracer stuff */
trc_resume();
#ifdef __OLD_TRACER__
trc_resume();
#endif
/* exec and exec_shadow are already = -1 */
kern_gettime(&schedule_time);
565,7 → 555,9
 
// ll_abort(666);
/* tracer stuff */
trc_suspend();
#ifdef __OLD_TRACER__
trc_suspend();
#endif
 
runlevel = RUNLEVEL_SHUTDOWN;