Changeset 4e49e21 in tol

Timestamp:

Dec 7, 2010, 12:10:16 AM (16 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

1c58878

Parents:

a168f52

Message:

refs #1028, slave process of tolserver is started in the right port not the default one 20458.

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

Location:

tolsh/tolsh.vfs/lib

Files:

• tequila/tequilas.tcl (modified) (1 diff)
• tolcomm/tolslave.tcl (modified) (4 diffs)

tolsh/tolsh.vfs/lib/tequila/tequilas.tcl

@@ -431 +431 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-if {[lsearch -exact [package names] tequilas] < 0} {
+if {0 && [lsearch -exact [package names] tequilas] < 0} {
     package require Mk4tcl
     mk::file open tqs tequilas.dat -nocommit

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

@@ -61 +61 @@
   array set options {
     -port 6669
+    -shport 20458
     -logfile ""
   }
@@ -77 +78 @@
   }]
 
-  slave_attach_data
+  slave_attach_data $options(-shport)
 
   # Compile expression and tol file provided in the command line
@@ -98 +99 @@
 }
 
-proc ::tolslave::slave_attach_data {} {
+proc ::tolslave::slave_attach_data { port } {
   package require tequila
   global shared_state
@@ -104 +105 @@
   global shared_finish
 
-  tequila::open localhost 20458
+  tequila::open localhost $port
   tequila::attach shared_state
   tequila::attach shared_tasks