.

wcfs/client/wcfs_watchlink.cpp

@@ -67,14 +67,14 @@ pair<WatchLink, error> WCFS::_openwatch() {
 }
 
 error _WatchLink::closeWrite() {
-    _WatchLink &wlink = *this;
+    _WatchLink& wlink = *this;
     xerr::Contextf E("%s: closeWrite", v(wlink));
 
     wlink._txclose1.do_([&]() {
         // ask wcfs to close its tx & rx sides; wcfs.close(tx) wakes up
         // _serveRX on client (= on us). The connection can be already closed
         // by wcfs - so ignore errors when sending bye.
-        (void)wlink._send(1, "bye");    // XXX stream ok?
+        (void)wlink._send(wlink._nextReqID(), "bye");
 
         // XXX vvv should be ~ shutdown(TX, wlink._f), however shutdown does
         // not work for non-socket file descriptors. And even if we dup link
@@ -238,7 +238,7 @@ error _WatchLink::_write(const string &pkt) {
         wlink->_txmu.unlock();
     });
 
-    //printf('C: watch  : tx: %r' % pkt)
+    //trace('C: watch  : tx: %r' % pkt)
     int n;
     error err;
     tie(n, err) = wlink->_f->write(pkt.c_str(), pkt.size());
@@ -276,14 +276,23 @@ pair<string, error> _WatchLink::sendReq(context::Context ctx, const string &req)
     return make_pair(reply, nil);
 }
 
+// _nextReqID returns stream ID for next client-originating request to be made.
+// XXX place=?
+StreamID _WatchLink::_nextReqID() {
+    _WatchLink& wlink = *this;
+
+    wlink._txmu.lock(); // TODO ._req_next -> atomic (currently uses arbitrary lock)
+        StreamID stream = wlink._req_next;
+        wlink._req_next = (wlink._req_next + 2); // wraparound at uint64 max
+    wlink._txmu.unlock();
+    return stream;
+}
+
 tuple</*rxq*/chan<rxPkt>, error> _WatchLink::_sendReq(context::Context ctx, const string &req) {
     _WatchLink *wlink = this;
     // XXX errctx?
 
-    wlink->_txmu.lock(); // TODO ._req_next -> atomic (currently uses arbitrary lock)
-        StreamID stream = wlink->_req_next;
-        wlink->_req_next = (wlink->_req_next + 2); // wraparound at uint64 max
-    wlink->_txmu.unlock();
+    StreamID stream = wlink->_nextReqID();
 
     auto rxq = makechan<rxPkt>(1);
     wlink->_rxmu.lock();

wcfs/client/wcfs_watchlink.h

@@ -118,6 +118,7 @@ private:
     tuple<string, error> _readline();
     error _send(StreamID stream, const string &msg);
     error _write(const string &pkt);
+    StreamID _nextReqID();
     tuple<chan<rxPkt>, error> _sendReq(context::Context ctx, const string &req);
 
     friend error _twlinkwrite(WatchLink wlink, const string &pkt);