[Linux-hls-cvs] hls/linux-2.6 Makefile,1.1,1.2 bottom.c,1.1,1.2 hls_ctl.c,1.1,1.2 init.c,1.1,1.2

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

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

Modified Files:
	Makefile bottom.c hls_ctl.c init.c 
Log Message:
- Commit the 2.6 gensched patch
- Update the linux-2.6 dir (compiles and inserts, but crashes)


Index: init.c
===================================================================
RCS file: /cvsroot/linux-hls/hls/linux-2.6/init.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** init.c	4 Apr 2004 20:31:24 -0000	1.1
--- init.c	9 Oct 2004 10:26:56 -0000	1.2
***************
*** 64,69 ****
--- 64,73 ----
    t = current;
    if (t->private_data == NULL) {
+ #if 0
      t->policy = SCHED_FIFO;
      t->rt_priority = HLS_IDLE_PRIORITY;
+ #else
+     gensched_dispatch(t, GENSCHED_DISABLE);
+ #endif
      if ((t->state == TASK_INTERRUPTIBLE) || (t->state == TASK_UNINTERRUPTIBLE)) {
        HLSCreateThreadHook(t, t->state);
***************
*** 98,103 ****
  #endif
        if (t->private_data == NULL) {
!         t->policy = SCHED_FIFO;
!         t->rt_priority = HLS_IDLE_PRIORITY;
          if ((t->state == TASK_INTERRUPTIBLE) || (t->state == TASK_UNINTERRUPTIBLE)) {
            HLSCreateThreadHook(t, t->state);
--- 102,111 ----
  #endif
        if (t->private_data == NULL) {
! #if 0
!     t->policy = SCHED_FIFO;
!     t->rt_priority = HLS_IDLE_PRIORITY;
! #else
!     gensched_dispatch(t, GENSCHED_DISABLE);
! #endif
          if ((t->state == TASK_INTERRUPTIBLE) || (t->state == TASK_UNINTERRUPTIBLE)) {
            HLSCreateThreadHook(t, t->state);

Index: bottom.c
===================================================================
RCS file: /cvsroot/linux-hls/hls/linux-2.6/bottom.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** bottom.c	4 Apr 2004 20:31:24 -0000	1.1
--- bottom.c	9 Oct 2004 10:26:56 -0000	1.2
***************
*** 52,55 ****
--- 52,56 ----
  
      c = my_current[proc];
+ #if 0
  #ifdef VERBOSE
      hls_printk("setting %d to %d... ", current->pid, HLS_IDLE_PRIORITY);
***************
*** 59,72 ****
  		      c->pid, c->rt_priority, HLS_SCHEDULING_PRIORITY);
      }
  /* Must be implemented in some way... */
! #error TODO: Do something smart, here!!!
!     c->rt_priority = HLS_IDLE_PRIORITY;
!     c->prio = MAX_PRIO;
! array = c->array;
! array->nr_active--;
! list_del(&c->run_list);
! if (list_empty(array->queue + c->prio))
! __clear_bit(c->prio, array->bitmap);
!   } else {
  #ifdef VERBOSE
      hls_printk("HLS From idle...\n");
--- 60,66 ----
  		      c->pid, c->rt_priority, HLS_SCHEDULING_PRIORITY);
      }
+ #endif
  /* Must be implemented in some way... */
!     gensched_dispatch(c, GENSCHED_DISABLE);
  #ifdef VERBOSE
      hls_printk("HLS From idle...\n");
***************
*** 89,110 ****
       * The linux dispatcher will do the dirty work for us...
       */
!     t->rt_priority = HLS_SCHEDULING_PRIORITY;
      HLSProc[proc].CurrentThread = t->private_data;
-     c->prio = 0;
- /* FIXME! */
- repeat_lock_task:
-     local_irq_save(rq_flags);
-     rq = task_rq(c);
-     spin_lock(&rq->lock);
-     if (unlikely(rq != task_rq(p))) {
-       spin_unlock_irqrestore(&rq->lock, rq_flags);
-       goto repeat_lock_task;
-     }
-     array = rq->active;
- list_add_tail(&c->run_list, array->queue + c->prio);
- __set_bit(c->prio, array->bitmap);
- array->nr_active++;
- c->array = array;
- 
  
  wup = t->pid;
--- 83,88 ----
       * The linux dispatcher will do the dirty work for us...
       */
!     gensched_dispatch(t, GENSCHED_ENABLE);
      HLSProc[proc].CurrentThread = t->private_data;
  
  wup = t->pid;
***************
*** 204,209 ****
--- 182,191 ----
      return;
    }
+ #if 0
    t->policy = SCHED_FIFO;
    t->rt_priority = HLS_IDLE_PRIORITY;
+ #else
+   gensched_dispatch(t, GENSCHED_DISABLE);
+ #endif
    HLSCreateThreadHook(t, t->state);
    

Index: hls_ctl.c
===================================================================
RCS file: /cvsroot/linux-hls/hls/linux-2.6/hls_ctl.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** hls_ctl.c	4 Apr 2004 20:31:24 -0000	1.1
--- hls_ctl.c	9 Oct 2004 10:26:56 -0000	1.2
***************
*** 51,54 ****
--- 51,55 ----
  }
  
+ #if 0 /* FIXME: Unused??? */
  static int hls_null_msg(PRKTHREAD t)
  {
***************
*** 78,81 ****
--- 79,83 ----
    return status;
  }
+ #endif
  
  static int hls_thread_move(PRKTHREAD t, struct HLS_SCHED_INSTANCE *new_sched)

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-hls/hls/linux-2.6/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile	4 Apr 2004 20:31:24 -0000	1.1
--- Makefile	9 Oct 2004 10:26:56 -0000	1.2
***************
*** 9,13 ****
  HLS = /root/src/NewGenSched/hls
  HLS = $(SUBDIRS)/..
! EXTRA_CFLAGS += -I $(HLS)/hls/include -I $(HLS)/linux/include
  
  ifdef DEBUG
--- 9,14 ----
  HLS = /root/src/NewGenSched/hls
  HLS = $(SUBDIRS)/..
! HLS = $(M)/..
! EXTRA_CFLAGS += -D__HARD_PANIC__ -I $(HLS)/hls/include -I $(HLS)/linux-2.6/include
  
  ifdef DEBUG
***************
*** 24,30 ****
  endif
  
! ifndef MULDIV
! OBJS += div.o
! else
  EXTRA_CFLAGS += -D__MULDIV__
  endif
--- 25,29 ----
  endif
  
! ifdef MULDIV
  EXTRA_CFLAGS += -D__MULDIV__
  endif