Changeset 542c12b in tol for tolsh/tolsh.vfs/lib/tolcomm

Timestamp:

Mar 11, 2010, 11:40:22 AM (17 years ago)

Author:

Liván Ramírez Dorta <livanr68@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

2ef94a4

Parents:

a4e3c41

Message:

refs#873: Improve TolServer process structure

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@2052 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tolsh/tolsh.vfs/lib/tolcomm

Files:

• pkgIndex.tcl (modified) (1 diff)
• tolserver.tcl (modified) (5 diffs)
• tolshared.tcl (added)
• tolslave.tcl (added)

tolsh/tolsh.vfs/lib/tolcomm/pkgIndex.tcl

@@ -1 +1 @@
 
   package ifneeded tolserver 1.0 [list source [file join $dir tolserver.tcl]]
+  package ifneeded tolshared 1.0 [list source [file join $dir tolshared.tcl]]
+  package ifneeded tolslave 1.0 [list source [file join $dir tolslave.tcl]]
   package ifneeded tolclient 1.0 [list source [file join $dir tolclient.tcl]]
   package ifneeded rmtps_client 1.0 [list source [file join $dir rmtps_client.tcl]]

tolsh/tolsh.vfs/lib/tolcomm/tolserver.tcl

@@ -29 +29 @@
     queue,cancel ""
   }
-}
+  
+  variable trace_active
+  
+  set trace_active 0
+}
+
+global shared_data
+set shared_data(request) ""
+set shared_data(init) ""
+set shared_data(server_init) 0
 
 ###############################################################################
@@ -288 +297 @@
   set idtask [insert_expr $chan $idrq $cmd]
   send_to_client $chan "TSTART" "$idrq $idtask"
-  schedule_queue
+  after idle ::tolserver::dispatch_to_slave
   
   log "debug" "leave, on_toleval"
@@ -440 +449 @@
 ###############################################################################
 proc ::tolserver::start { args } {
-  variable data
+  global shared_data
 
   array set options {
     -port 6669
     -logfile ""
+    -compile ""
   }
   array set options $args
 
   ::tlogger::init tolserver $options(-logfile)
-  ::tlogger::level tolserver "error"
-
-  # redirect the log
-  ::tol::console eval [string map "%P $options(-port)" {
-    Text {
-      Text srv_root = TolAppDataPath+"/server";
-      Real OSDirMake(srv_root);
-      Text PutDumpFile(srv_root+"/start.%P.log")
-    }
-  }]
+  ::tlogger::level tolserver "debug"
+
   if {[catch {open_socket $options(-port)} msgerr]} {
     log emergency "::tolserver::start '$msgerr'"
@@ -465 +467 @@
     log "notice" "started"
   }
+  
+  server_attach_data
+
+  log "debug" "shared_data(init)=$options(-compile)"
+  set shared_data(init) $options(-compile)  
+  set shared_data(server_init) 1
+}
+
+proc ::tolserver::server_attach_data {} {
+  package require tequila
+  global shared_data
+
+  tequila::open localhost 20458
+  tequila::attach shared_data
+  trace add var shared_data write tolserver::server_listen
+}    
+
+proc tolserver::server_listen {name index op} {
+  global shared_data
+
+  log "debug" "server_listen:index=$index"
+  log "debug" "[array get shared_data]"
 }
 
@@ -508 +532 @@
   set client [get_client_id $chan]
   set idtask "${client}:$data(queue,id)"
-  lappend data(queue,tasks) [list $idtask $idrq $chan $tol_expr]
-
+  push_queue_tasks [list $idtask $idrq $chan $tol_expr]
   log "debug" "leave, insert_expr, $idtask"
   set idtask
 }
 
-proc ::tolserver::process_queue { } {
-  variable data
-
-  log "debug" "enter, process_queue"
-
-  if {[llength $data(queue,tasks)]} {
-    set item [lindex $data(queue,tasks) 0]
-    set data(queue,tasks) [lrange data(queue,tasks) 1 end]
-    foreach {idtask idrq chan tol_expr} $item break
-    set idx [lsearch $data(queue,cancel) $idrq]
-    if {$idx != -1} {
-      log debug "canceling task $idtask"
-      # remove idrq from the cancel list
-      set data(queue,cancel) [lreplace $data(queue,cancel) $idx $idx]
-    } else {
-      log debug "processing task $idtask"
-      ::tol::console eval $tol_expr
-      # inform client this request has being finished
-      after idle [namespace code "send_to_client $chan TFINISH $idtask"]
-    }
-    schedule_queue
-  }
-
-  log "debug" "leave, process_queue"
-}
-
-###########################################################################
-#
-# 
-#
-###########################################################################
-proc ::tolserver::schedule_queue { } {
-
-  variable data
-
-  if {[llength $data(queue,tasks)]} {
-    after idle [namespace code process_queue]
-  }
-}
+proc ::tolserver::push_queue_tasks {item} {
+  variable data
+
+  log "debug" "tolserver::push_queue_tasks:item=$item"
+  lappend data(queue,tasks) $item
+}
+
+proc ::tolserver::dispatch_to_slave {} {
+  global shared_data
+  variable trace_active
+
+  log "debug" "tolserver::dispatch_to_slave"
+  if {$shared_data(slave_status) eq "ready"} {
+    send_tasks_to_slave
+  } else {
+    set trace_active 1
+    trace add var shared_data(slave_status) write ::tolserver::send_tasks_to_slave
+  }
+}
+
+proc ::tolserver::send_tasks_to_slave {} {
+  global shared_data
+  variable trace_active
+
+  if {$trace_active == 1} {
+    trace remove var shared_data(slave_status) write ::tolserver::send_tasks_to_slave
+    set trace_active 0
+  }
+  log "debug" "tolserver::send_tasks_to_slave"
+  set t_list [get_queue_tasks]
+  set_queue_shared $t_list
+  if {$shared_data(ack) eq 0} {
+    vwait shared_data(ack)
+  }
+}
+
+proc ::tolserver::get_queue_tasks {} {
+  variable data
+
+  set t_list $data(queue,tasks)
+  set data(queue,tasks) [list]
+  log "debug" "tolserver::get_queue_tasks:t_list=$t_list"
+  return $t_list
+}
+
+proc ::tolserver::set_queue_shared {t_list} {
+  global shared_data
+  
+  log "debug" "tolserver::set_queue_shared:t_list=$t_list"
+  set shared_data(request) $t_list
+}