[Linux-hls-cvs] hls/simul Makefile,1.11,1.12 sim.c,1.9,1.10 sim_events.c,1.13,1.14 sim_os.c,1.8,1.9

[<lu...@us...>]

Update of /cvsroot/linux-hls/hls/simul
In directory sc8-pr-cvs1:/tmp/cvs-serv14351/simul

Modified Files:
	Makefile sim.c sim_events.c sim_os.c 
Log Message:
- Some cleanup & code reorganization
- Fix the simulator's compilation
- Better logging macros for the simulator backend


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-hls/hls/simul/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Makefile	25 Feb 2003 09:18:55 -0000	1.11
--- Makefile	29 Nov 2003 09:11:35 -0000	1.12
***************
*** 8,12 ****
  #CPPFLAGS += -DVERBOSE
  
! #DEBUG = -lefence
  CFLAGS += -g
  CPPFLAGS += -DHLS_DEBUG=10
--- 8,12 ----
  #CPPFLAGS += -DVERBOSE
  
! DEBUG = -lefence
  CFLAGS += -g
  CPPFLAGS += -DHLS_DEBUG=10

Index: sim.c
===================================================================
RCS file: /cvsroot/linux-hls/hls/simul/sim.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** sim.c	25 Feb 2003 09:18:57 -0000	1.9
--- sim.c	29 Nov 2003 09:11:35 -0000	1.10
***************
*** 66,72 ****
  static void sim_deinit (void)
  {
    struct eventq_elt qe;
  
- #if 0
    for (;;) {
      HeapExtractMin(&qe);
--- 66,72 ----
  static void sim_deinit (void)
  {
+ #if 0
    struct eventq_elt qe;
  
    for (;;) {
      HeapExtractMin(&qe);

Index: sim_events.c
===================================================================
RCS file: /cvsroot/linux-hls/hls/simul/sim_events.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** sim_events.c	25 Feb 2003 09:18:57 -0000	1.13
--- sim_events.c	29 Nov 2003 09:11:35 -0000	1.14
***************
*** 13,16 ****
--- 13,17 ----
  
  #include "interface-data.h"
+ #include "hls_common.h"
  #include "data.h"
  #include "sim.h"
***************
*** 19,22 ****
--- 20,25 ----
  #include "os.h"
  
+ #include "workload.h"
+ 
  /* TODO: Check all of these!!! */
  long long int max_blocking_time;
***************
*** 160,164 ****
  {
    if (ot != NULL) {
!     sim_printf("Next Task Event: sim_state = %d total_remaining_cpu_time = %d\n", ot->sim_state, ot->total_remaining_cpu_time);
  #if 0
      if ((ot->sim_state != THREAD_SM_ENDED) && (ot->sim_state != THREAD_SM_NEVERENDING)) {
--- 163,168 ----
  {
    if (ot != NULL) {
!     sim_printf("Next Task Event: sim_state = %d total_remaining_cpu_time = %lld\n",
! 		    ot->sim_state, ot->total_remaining_cpu_time);
  #if 0
      if ((ot->sim_state != THREAD_SM_ENDED) && (ot->sim_state != THREAD_SM_NEVERENDING)) {

Index: sim_os.c
===================================================================
RCS file: /cvsroot/linux-hls/hls/simul/sim_os.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** sim_os.c	25 Feb 2003 09:18:57 -0000	1.8
--- sim_os.c	29 Nov 2003 09:11:35 -0000	1.9
***************
*** 192,200 ****
  void thread_end(struct sim_task_struct *t, long long int time)
  {
!   struct sim_event *e;
  
    t->sim_state = THREAD_SM_ENDED;
    HLSExitThreadHook(t);
! //  make_new_thread(time + 1 + (sim_rand() % 100000));
    sim_thread_count--;
  	/* swap_thread();		Not Needed */
--- 192,200 ----
  void thread_end(struct sim_task_struct *t, long long int time)
  {
! /*  struct sim_event *e; */
  
    t->sim_state = THREAD_SM_ENDED;
    HLSExitThreadHook(t);
! /*  make_new_thread(time + 1 + (sim_rand() % 100000)); */
    sim_thread_count--;
  	/* swap_thread();		Not Needed */