Changeset 2ef94a4 in tol

Timestamp:

Mar 12, 2010, 11:50:42 AM (17 years ago)

Author:

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

Branches:

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

Children:

13bedb1

Parents:

542c12b

Message:

Improve TolServer process structure

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

Location:

tolsh/tolsh.vfs/lib

Files:

• app-tolsh/tolsh.tcl (modified) (1 diff)
• tolcomm/tolserver.tcl (modified) (7 diffs)
• tolcomm/tolslave.tcl (modified) (11 diffs)

tolsh/tolsh.vfs/lib/app-tolsh/tolsh.tcl

@@ -380 +380 @@
   }
 
-  set tolcomm_dir [file join [GetHomeDir] tolcomm] 
+  set tolcomm_dir [file join [GetHomeDir] ".tol" "tolcomm"] 
   file mkdir $tolcomm_dir
 

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

@@ -29 +29 @@
     queue,cancel ""
   }
-  
-  variable trace_active
-  
-  set trace_active 0
 }
 
@@ -481 +477 @@
   tequila::open localhost 20458
   tequila::attach shared_data
+  
+  # this trace is just for debbuging, it's not necesary actually
   trace add var shared_data write tolserver::server_listen
 }    
@@ -533 +531 @@
   set idtask "${client}:$data(queue,id)"
   push_queue_tasks [list $idtask $idrq $chan $tol_expr]
+
   log "debug" "leave, insert_expr, $idtask"
   set idtask
@@ -540 +539 @@
   variable data
 
-  log "debug" "tolserver::push_queue_tasks:item=$item"
+  log "debug" "push_queue_tasks:item=$item"
   lappend data(queue,tasks) $item
 }
@@ -546 +545 @@
 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
-  }
+
+  log "debug" "enter dispatch_to_slave"
+  if {$shared_data(slave_status) ne "ready"} {
+    log "debug" "dispatch_to_slave: vwait shared_data(slave_status)"
+    vwait shared_data(slave_status)
+  }
+  send_tasks_to_slave
+  log "debug" "leave dispatch_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"
+
+  log "debug" "enter 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)
-  }
+  #if {$shared_data(ack) == 0} {
+    #log "debug" "send_tasks_to_slave: vwait shared_data(ack)"
+    #vwait shared_data(ack)
+  #}
+  log "debug" "leave send_tasks_to_slave"
 }
 
@@ -578 +573 @@
   set t_list $data(queue,tasks)
   set data(queue,tasks) [list]
-  log "debug" "tolserver::get_queue_tasks:t_list=$t_list"
+  log "debug" "get_queue_tasks:t_list=$t_list"
   return $t_list
 }
@@ -585 +580 @@
   global shared_data
   
-  log "debug" "tolserver::set_queue_shared:t_list=$t_list"
+  log "debug" "set_queue_shared:t_list=$t_list"
   set shared_data(request) $t_list
 }

tolsh/tolsh.vfs/lib/tolcomm/tolslave.tcl

@@ -26 +26 @@
 
 global shared_data
-set shared_data(ack) 0
+#set shared_data(ack) 0
 set shared_data(slave_status) "busy"
 
@@ -76 +76 @@
   # Compile expression and tol file provided in the command line
   #
-  if {$shared_data(server_init) eq 0} {
+  if {$shared_data(server_init) == 0} {
     vwait shared_data(server_init)
   }
@@ -89 +89 @@
   }
 
-  set shared_data(ack) 0
+  #set shared_data(ack) 0
   set shared_data(slave_status) "ready"
+  log "debug" "leave start"
 }
 
@@ -99 +100 @@
   tequila::open localhost 20458
   tequila::attach shared_data
-  trace add var shared_data(request) write tolslave::slave_listen
+  #trace add var shared_data(request) write tolslave::slave_listen
+  trace add var shared_data write tolslave::slave_listen
 }    
 
@@ -105 +107 @@
   global shared_data
 
-  log "debug" "slave_listen:index=$index"
+  log "debug" "enter slave_listen:index=$index"
   log "debug" "[array get ::shared_data]"
-  set shared_data(ack) 0
-  schedule_queue
+  #set shared_data(ack) 0
+  if {$index eq "request"} {
+    schedule_queue
+  }
+  log "debug" "leave slave_listen"
 }
 
@@ -118 +123 @@
   set_queue_tasks $t_list
   after idle [process_queue]
-  set shared_data(ack) 1
+  #set shared_data(ack) 1
   log "debug" "leave, schedule_queue"
 }
@@ -126 +131 @@
 
   set t_list $shared_data(request)
-  #tequila::privTracer "shared_data" "request" "w"
-  log "debug" "tolslave::get_queue_shared:t_list=$t_list"
+  log "debug" "get_queue_shared:t_list=$t_list"
   return $t_list
 }
@@ -134 +138 @@
   variable data
 
-  log "debug" "tolslave::set_queue_tasks:t_list=$t_list"
+  log "debug" "set_queue_tasks:t_list=$t_list"
   #lappend data(queue,tasks) {*}$t_list
   set data(queue,tasks) $t_list
@@ -141 +145 @@
 proc ::tolslave::process_queue { } {
   variable data
+  global shared_data
 
   log "debug" "enter, process_queue"
@@ -149 +154 @@
     foreach {idtask idrq chan tol_expr} $item break
     set idx [lsearch $data(queue,cancel) $idrq]
-    log "debug" "::tolslave::process_queue idx=$idx, idtask=$idtask"
+    log "debug" "process_queue idx=$idx, idtask=$idtask"
     if {$idx != -1} {
       log debug "canceling task $idtask"
@@ -163 +168 @@
   }
   set shared_data(slave_status) "ready"
-  #tequila::GetAll "shared_data"
+  #tequila::do GetAll shared_data
   log "debug" "leave, process_queue"
 }