Re: [patch][rfa] --tksched option for configrun-sid.in

[Dave Brolley <brolley@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 353 bytes --]

Frank Ch. Eigler wrote:

>Hi -
>
>  
>
>>This is the first of several patches which have arisen out of some work 
>>we've been doing on a yet-to-be-released port. [...]
>>    
>>
>
>I think you sent the wrong patch (one related logging).
>Anyway it's okay.
>  
>
Ooops....here's the correct patch. That logging one is old and already 
committed.

Dave


[-- Attachment #2: tksched.patch.txt --]
[-- Type: text/plain, Size: 3253 bytes --]

Index: sid/bsp/configrun-sid.in
===================================================================
RCS file: /cvs/src/src/sid/bsp/configrun-sid.in,v
retrieving revision 1.34
diff -c -p -r1.34 configrun-sid.in
*** sid/bsp/configrun-sid.in	28 Dec 2001 21:16:48 -0000	1.34
--- sid/bsp/configrun-sid.in	21 Oct 2003 16:20:53 -0000
*************** $load_mapper_data = "cpu-mapper access-p
*** 120,125 ****
--- 120,126 ----
  	    "gdbport=i%" => ["gdbport PROCESSOR=PORT", "Add a gdb/debugger interface on TCP port", "",
  			     "for the given processor. May be specified",
  			     "more than once to debug multiple CPUs.      [none]"],
+ 	    "tksched!" => ["tksched", "Add a simple visual scheduler controller.", "no"],
  	    "tksm!" => ["tksm", "Add an experimental Tk system monitor.", "no"],
  	    "board=s" => ["board=BOARD", "Model given board or system.", "gloss"],
  	    "engine=s" => ["engine=scache|pbb", "Set given cgen CPU engine.", "pbb"],
*************** connect-pin host-sched 7-event -> sidaud
*** 1207,1212 ****
--- 1208,1225 ----
  ";
    }
  
+ # --tksched
+ if ($opt_tksched != 0)
+   {
+     $any_tcl = 1;
+ 
+     $first_section .= "# tk visual scheduler controller\n" .
+       &sidconf_new("sid-visual-sched", "tksched") . "\n";
+ 
+     $second_section .= "# tk system monitor
+ relate tksched scheduler target-sched
+ ";
+   }
  
  # any tcl stuff?
  if ($any_tcl)
Index: sid/component/sched/sid-visual-sched.tk
===================================================================
RCS file: /cvs/src/src/sid/component/sched/sid-visual-sched.tk,v
retrieving revision 1.2
diff -c -p -r1.2 sid-visual-sched.tk
*** sid/component/sched/sid-visual-sched.tk	8 Jan 2003 03:49:50 -0000	1.2
--- sid/component/sched/sid-visual-sched.tk	21 Oct 2003 16:20:55 -0000
*************** proc get_sub {sched n} {
*** 20,42 ****
  proc set_sub {sched n pair} {
      set time [lindex $pair 0]
      set regular [lindex $pair 1]
!     set time [sid::component::set_attribute_value $sched $n-time $time]
!     set regular [sid::component::set_attribute_value $sched $n-regular? $regular]
! }
! 
! 
! proc set_enable {sched flag} {
!     sid::component::set_attribute_value $sched enabled? $flag
  }
  
  
  proc toggle_subscription {sched n} {
      global saved_subs
-     set_enable $sched 0
      set new_sub $saved_subs($sched,$n)
      set saved_subs($sched,$n) [get_sub $sched $n]
      set_sub $sched $n $new_sub
-     set_enable $sched 1
  }
  
  
--- 20,42 ----
  proc set_sub {sched n pair} {
      set time [lindex $pair 0]
      set regular [lindex $pair 1]
!     if {$time} {
! 	# time is nonzero, so set regular *first* and then time
! 	set regular [sid::component::set_attribute_value $sched $n-regular? $regular]
! 	set time [sid::component::set_attribute_value $sched $n-time $time]
!     } else {
! 	# time is zero, so disable time *first* and then set regular
! 	set time [sid::component::set_attribute_value $sched $n-time $time]
! 	set regular [sid::component::set_attribute_value $sched $n-regular? $regular]
!     }
  }
  
  
  proc toggle_subscription {sched n} {
      global saved_subs
      set new_sub $saved_subs($sched,$n)
      set saved_subs($sched,$n) [get_sub $sched $n]
      set_sub $sched $n $new_sub
  }