.

wcfs/client/wcfs_watchlink.cpp

@@ -28,6 +28,14 @@
 #include <string.h>
 
 
+#define TRACE 0
+#if TRACE
+#  define trace(format, ...) log::Debugf(format, ##__VA_ARGS__)
+#else
+#  define trace(format, ...) do {} while (0)
+#endif
+
+
 // wcfs::
 namespace wcfs {
 
@@ -120,7 +128,6 @@ error _WatchLink::_serveRX(context::Context ctx) {
 
     // when finishing - wakeup everyone waiting for rx
     defer([&]() {
-        //trace("serveRX: close all chans\n");
         wlink._acceptq.close();
         wlink._rxmu.lock();
         wlink._rxdown = true;   // don't allow new rxtab registers
@@ -138,7 +145,6 @@ error _WatchLink::_serveRX(context::Context ctx) {
     while (1) {
         // NOTE: .close() makes sure .f.read*() will wake up
         tie(l, err) = wlink._readline();
-        //trace("    readline -> l='%s'  ; err='%s'\n", v(l), v(err));
         if (err == io::EOF_) {  // peer closed its tx
             // XXX what happens on other errors?
             wlink.rx_eof.close();
@@ -149,7 +155,7 @@ error _WatchLink::_serveRX(context::Context ctx) {
                 err = nil;
             return E(err);
         }
-        //trace("C: watch  : rx: \"%s\"", v(l));
+        trace("C: watch  : rx: \"%s\"", v(l));
 
         err = pkt.from_string(l);
         if (err != nil)
@@ -347,7 +353,7 @@ error _WatchLink::_write(const string &pkt) {
         wlink._txmu.unlock();
     });
 
-    //trace('C: watch  : tx: \"%s\"', v(pkt));
+    trace("C: watch  : tx: \"%s\"", v(pkt));
     int n;
     error err;
     tie(n, err) = wlink._f->write(pkt.c_str(), pkt.size());
@@ -408,7 +414,6 @@ tuple<string, error> _WatchLink::_readline() {
         if (nl != string::npos) {
             auto line = wlink._rxbuf.substr(0, nl+1);
             wlink._rxbuf = wlink._rxbuf.substr(nl+1);
-            //trace("\t_readline -> ret '%s'\n", v(line));
             return make_tuple(line, nil);
         }
         nl_searchfrom = wlink._rxbuf.length();
@@ -419,9 +424,7 @@ tuple<string, error> _WatchLink::_readline() {
 
         int n;
         error err;
-        //trace("\t_readline -> read ...\n");
         tie(n, err) = wlink._f->read(buf, sizeof(buf));
-        //trace("\t_readline -> read: n=%d  err='%s'\n", n, v(err));
         if (n > 0) {
             wlink._rxbuf += string(buf, n);
             continue;