.

wcfs/client/wcfs.cpp

@@ -821,8 +821,7 @@ string WCFS::String() const {
 
 string _Conn::String() const {
     const _Conn& wconn = *this;
-    return "";  // XXX temp
-    //return fmt::sprintf("%s: conn%d @%s", v(wconn._wc), wconn._wlink->_f.fd(), v(wconn.at));
+    return fmt::sprintf("%s: conn%d @%s", v(wconn._wc), 7/*XXX wconn._wlink->_f.fd()*/, v(wconn.at));
 }
 
 _Conn::_Conn()  {}

wcfs/client/wcfs_watchlink.cpp

@@ -39,6 +39,11 @@ void _WatchLink::decref() {
         delete this;
 }
 
+string _WatchLink::String() const {
+    const _WatchLink& wlink = *this;
+    return fmt::sprintf("%s: wlink%d", v(wlink._wc), wlink._f->fd());
+}
+
 // _openwatch opens new watch link on wcfs.
 pair<WatchLink, error> WCFS::_openwatch() {
     WCFS *wc = this;
@@ -91,7 +96,7 @@ error _WatchLink::closeWrite() {
 // close closes the link.
 error _WatchLink::close() {
     _WatchLink& wlink = *this;
-    xerr::Contextf E("wlink close"); // XXX + wlink ID? + wcfs ID
+    xerr::Contextf E("%s: close", v(wlink));
 
     error err = wlink.closeWrite();
     wlink._serveCancel();

wcfs/client/wcfs_watchlink.h

@@ -110,6 +110,8 @@ public:
     error recvReq(context::Context ctx, PinReq *rx_into);
     error replyReq(context::Context ctx, const PinReq *req, const string& reply);
 
+    string String() const;
+
 private:
     error _serveRX(context::Context ctx);
     tuple<string, error> _readline();