[Linux-hls-cvs] hls/hls hls_hooks.c,1.9,1.10

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

Update of /cvsroot/linux-hls/hls/hls
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4892/hls

Modified Files:
	hls_hooks.c 
Log Message:
2.6 backend update... Still doesn't work, but it looks better ;-)


Index: hls_hooks.c
===================================================================
RCS file: /cvsroot/linux-hls/hls/hls/hls_hooks.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** hls_hooks.c	2 Nov 2004 07:39:28 -0000	1.9
--- hls_hooks.c	22 Jan 2005 12:06:24 -0000	1.10
***************
*** 171,182 ****
  #else
    if (t->InState != HLS_Waiting) {
-     BUG_ON(t->InState != HLS_Waiting);
      /* FIXME: This stuff is arch-dependent!!! */
      /* maybe we should provide some TH_STATE() and TH_ID() macros ? */
      hls_hard_printk("HLS ERROR!!! UnBlockThreadHook on task %d (state %ld) with InState = %x!!!\n", Thread->pid, Thread->state, t->InState);
      hls_printk("HLS ERROR!!! UnBlockThreadHook on task %d (state %ld) with InState = %x!!!\n", Thread->pid, Thread->state, t->InState);
    }
  #endif
! #if 1 
    BUG_ON(t->vp->State != VP_Waiting);
    HLS_ASSERT (t->vp->State == VP_Waiting);
--- 171,185 ----
  #else
    if (t->InState != HLS_Waiting) {
      /* FIXME: This stuff is arch-dependent!!! */
      /* maybe we should provide some TH_STATE() and TH_ID() macros ? */
      hls_hard_printk("HLS ERROR!!! UnBlockThreadHook on task %d (state %ld) with InState = %x!!!\n", Thread->pid, Thread->state, t->InState);
      hls_printk("HLS ERROR!!! UnBlockThreadHook on task %d (state %ld) with InState = %x!!!\n", Thread->pid, Thread->state, t->InState);
+ #if 0 /* FIXME: This is Linux-2.6 specific!!! */
+     dump_stack();
+ #endif
+     whereami = 0; return;
    }
  #endif
! #if 0 
    BUG_ON(t->vp->State != VP_Waiting);
    HLS_ASSERT (t->vp->State == VP_Waiting);
***************
*** 187,190 ****
--- 190,196 ----
      hls_hard_printk("HLS ERROR!!! UnBlockThreadHook on task %d (state %ld) with vp->State = %x!!!\n", Thread->pid, Thread->state, t->vp->State);
      hls_printk("HLS ERROR!!! UnBlockThreadHook on task %d (state %ld) with vp->State = %x!!!\n", Thread->pid, Thread->state, t->vp->State);
+ #if 0 /* FIXME: This is Linux-2.6 specific!!! */
+     dump_stack(); 
+ #endif
    }
  #endif