Changeset fc9de2f in tol for tolsh/tolsh.vfs/lib

Timestamp:

Mar 15, 2010, 4:53:13 PM (17 years ago)

Author:

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

Branches:

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

Children:

080113c

Parents:

1f82c01

Message:

refs#873: Improve TolServer process structure
Use of another shared array in order to inform client that a task has being finished

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

Location:

tolsh/tolsh.vfs/lib/tolcomm

Files:

• tolserver.tcl (modified) (5 diffs)
• tolslave.tcl (modified) (9 diffs)

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

@@ -37 +37 @@
 
 global shared_state
+global shared_finish
 
 ###############################################################################
@@ -477 +478 @@
   global shared_tasks
   global shared_state
+  global shared_finish
 
   tequila::open localhost 20458
   tequila::attach shared_tasks
   tequila::attach shared_state
-  
+  tequila::attach shared_finish
+  
+  #trace add var shared_finish(tasks) write tolserver::server_listen_finish
+  trace add var shared_finish write tolserver::server_listen_finish
+
   # this trace is just for debbuging, it's not necesary actually
   trace add var shared_tasks write tolserver::server_listen_tasks
@@ -488 +494 @@
   trace add var shared_state write tolserver::server_listen_state
 }    
+
+proc tolserver::server_listen_finish {name index op} {
+  global shared_finish
+
+  log "debug" "enter server_listen_finish:index=$index"
+  log "debug" "[array get ::shared_finish]"
+  
+  # inform client this request has being finished
+  foreach {chan idtask} $shared_finish(tasks) break
+  after idle [namespace code "send_to_client $chan TFINISH $idtask"]
+
+  log "debug" "leave server_listen_finish"
+}
 
 proc tolserver::server_listen_tasks {name index op} {
@@ -570 +589 @@
 
 proc ::tolserver::send_tasks_to_slave {} {
-  #global shared_data
 
   log "debug" "enter send_tasks_to_slave"
@@ -577 +595 @@
     set_queue_shared $t_list
   }
-  #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"
 }

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

@@ -26 +26 @@
 
 global shared_state
-#set shared_data(ack) 0
 set shared_state(slave) "busy"
+
+global shared_finish
+set shared_finish(tasks) ""
 
 global shared_tasks
@@ -92 +94 @@
   }
 
-  #set shared_data(ack) 0
   set shared_state(slave) "ready"
   log "debug" "leave start"
@@ -101 +102 @@
   global shared_state
   global shared_tasks
+  global shared_finish
 
   tequila::open localhost 20458
   tequila::attach shared_state
   tequila::attach shared_tasks
+  tequila::attach shared_finish
   
   #trace add var shared_tasks(request) write tolslave::slave_listen_tasks
@@ -111 +114 @@
   # this trace is just for debbuging, it's not necesary actually
   trace add var shared_state write tolslave::slave_listen_state
+
+  # this trace is just for debbuging, it's not necesary actually
+  trace add var shared_finish write tolslave::slave_listen_finish
 }    
 
@@ -118 +124 @@
   log "debug" "enter slave_listen_tasks:index=$index"
   log "debug" "[array get ::shared_tasks]"
-  #set shared_data(ack) 0
   if {$index eq "request"} {
     schedule_queue
@@ -132 +137 @@
 }
 
+proc tolslave::slave_listen_finish {name index op} {
+  global shared_finish
+
+  log "debug" "slave_listen_finish:index=$index"
+  log "debug" "[array get shared_finish]"
+}
+
 proc ::tolslave::schedule_queue { } {
-  #global shared_data
 
   log "debug" "enter, schedule_queue"
@@ -139 +150 @@
   set_queue_tasks $t_list
   after idle [process_queue]
-  #set shared_data(ack) 1
   log "debug" "leave, schedule_queue"
 }
@@ -162 +172 @@
   variable data
   global shared_state
+  global shared_finish
 
   log "debug" "enter, process_queue"
@@ -179 +190 @@
       log "debug" "::tol::console eval tol_expr=$tol_expr"
       ::tol::console eval $tol_expr
-      # inform client this request has being finished
-      #after idle [namespace code "send_to_client $chan TFINISH $idtask"]
+      # inform server this request has being finished
+      set shared_finish(tasks) [list $chan $idtask]
     }
   }
   set shared_state(slave) "ready"
-  #tequila::do GetAll shared_data
   log "debug" "leave, process_queue"
 }