From d6518039d4f861727761edac1abfa0efb7ad0e5e Mon Sep 17 00:00:00 2001
From: Dave Schuyler <nthparameter@gmail.com>
Date: Sat, 4 May 2002 03:45:34 +0000
Subject: [PATCH] reduced writer threads

---
 direct/src/directd/directd.cxx             | 9 +++++----
 direct/src/directdServer/directdClient.cxx | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/direct/src/directd/directd.cxx b/direct/src/directd/directd.cxx
index 37131eab6e..1762fa123a 100644
--- a/direct/src/directd/directd.cxx
+++ b/direct/src/directd/directd.cxx
@@ -132,7 +132,7 @@ namespace {
 
 DirectD::DirectD() :
     _app_pid(0),
-    _reader(&_cm, 1), _writer(&_cm, 1), _listener(&_cm, 0),
+    _reader(&_cm, 1), _writer(&_cm, 0), _listener(&_cm, 0),
     _shutdown(false) {
 }
 
@@ -174,13 +174,12 @@ DirectD::wait_for_servers(int count, int timeout_ms) {
     while (_reader.data_available()) {
       NetDatagram datagram;
       if (_reader.get_data(datagram)) {
-        nout << "Got datagram " /*<< datagram <<*/ "from "
-             << datagram.get_address() << endl;
+        cout << count << ": Server at " << datagram.get_address()
+            << " is ready." << endl;
         datagram.dump_hex(nout);
         //handle_datagram(datagram);
         DatagramIterator di(datagram);
         string s=di.get_string();
-        nout<<"wait_for_servers() count="<<count<<", s="<<s<<endl;
         if (s=="r" && !--count) {
           return true;
         }
@@ -205,6 +204,7 @@ DirectD::server_ready(const string& client_host, int port) {
 void
 DirectD::start_app(const string& cmd) {
   nout<<"start_app(cmd="<<cmd<<")"<<endl;
+  kill_app();
   _app_pid=StartApp(cmd);
   nout<<"    _app_pid="<<_app_pid<<endl;
 }
@@ -268,6 +268,7 @@ DirectD::send_one_message(const string& host_name,
   _writer.send(datagram, c);
   
   //PR_Sleep(PR_MillisecondsToInterval(200));
+  //wait_for_servers(1, 10*1000);
   //_reader.remove_connection(c);
   _cm.close_connection(c);
 }
diff --git a/direct/src/directdServer/directdClient.cxx b/direct/src/directdServer/directdClient.cxx
index 09d6aa5e44..05d4e5ac5a 100644
--- a/direct/src/directdServer/directdClient.cxx
+++ b/direct/src/directdServer/directdClient.cxx
@@ -27,7 +27,7 @@ DirectDClient::~DirectDClient() {
 void
 DirectDClient::cli_command(const string& cmd) {
   cerr<<"command "<<cmd<<endl;
-  if (cmd[0]=='!') {
+  if (cmd[0]==':') {
     // ...connect to host.
     cerr<<"Local command "<<flush;
     string code;