Ticket #8420: netfs_debug.patch

src/add-ons/kernel/file_systems/netfs/authentication_server/AuthenticationServer.cpp

@@ -350 +350 @@
                 context, server, share, badPassword, request.ReplyPort(),
                 request.ReplyToken());
             if (!task) {
-                ERROR("AuthenticationServer::_RequestThread(): ERROR: "
-                    "failed to allocate ");
+                ERROR(("AuthenticationServer::_RequestThread(): ERROR: "
+                    "failed to allocate "));
                 continue;
             }
             status_t error = taskManager.RunTask(task);
             if (error != B_OK) {
-                ERROR("AuthenticationServer::_RequestThread(): Failed to "
-                    "start server info task: %s\n", strerror(error));
+                ERROR(("AuthenticationServer::_RequestThread(): Failed to "
+                    "start server info task: %s\n", strerror(error)));
                 continue;
             }
         }

src/add-ons/kernel/file_systems/netfs/client/QueryManager.cpp

@@ -200 +200 @@
                 delete iteratorList;
             }
         } else {
-            ERROR("QueryManager::PutIterator(): ERROR: No iterator list "
-                "for volume %p!\n", iterator->GetVolume());
+            ERROR(("QueryManager::PutIterator(): ERROR: No iterator list "
+                "for volume %p!\n", iterator->GetVolume()));
         }
 
         // free the iterator and surrender its volume reference

src/add-ons/kernel/file_systems/netfs/client/ServerManager.cpp

@@ -76 +76 @@
         // create a socket
         fFD = socket(AF_INET, SOCK_STREAM, 0);
         if (fFD < 0) {
-            ERROR("ServerManager::ServerInfoTask: ERROR: Failed to create "
-                "socket: %s\n", strerror(errno));
+            ERROR(("ServerManager::ServerInfoTask: ERROR: Failed to create "
+                "socket: %s\n", strerror(errno)));
             return errno;
         }
         return B_OK;
@@ -89 +89 @@
         sockaddr_in addr = fServerInfo->GetAddress().GetAddress();
         addr.sin_port = htons(kDefaultServerInfoPort);
         if (connect(fFD, (sockaddr*)&addr, sizeof(addr)) < 0) {
-            ERROR("ServerManager::ServerInfoTask: ERROR: Failed to connect "
-                "to server info port: %s\n", strerror(errno));
+            ERROR(("ServerManager::ServerInfoTask: ERROR: Failed to connect "
+                "to server info port: %s\n", strerror(errno)));
             return errno;
         }
 
@@ -102 +102 @@
         Request* _request;
         status_t error = requestChannel.ReceiveRequest(&_request);
         if (error != B_OK) {
-            ERROR("ServerManager::ServerInfoTask: ERROR: Failed to receive "
-                "server info request: %s\n", strerror(errno));
+            ERROR(("ServerManager::ServerInfoTask: ERROR: Failed to receive "
+                "server info request: %s\n", strerror(errno)));
             return error;
         }
         ObjectDeleter<Request> requestDeleter(_request);
         ServerInfoRequest* request = dynamic_cast<ServerInfoRequest*>(_request);
         if (!request) {
-            ERROR("ServerManager::ServerInfoTask: ERROR: Received request "
-                "is not a server info request.\n");
+            ERROR(("ServerManager::ServerInfoTask: ERROR: Received request "
+                "is not a server info request.\n"));
             return B_BAD_DATA;
         }
 
@@ -396 +396 @@
         }
         status_t error = taskManager.RunTask(task);
         if (error != B_OK) {
-            ERROR("ServerManager::_BroadcastListener(): Failed to start server "
-                "info task: %s\n", strerror(error));
+            ERROR(("ServerManager::_BroadcastListener(): Failed to start server "
+                "info task: %s\n", strerror(error)));
             continue;
         }
     }
@@ -418 +418 @@
     addr.sin_port = htons(kDefaultBroadcastPort);
     addr.sin_addr.s_addr = INADDR_ANY;
     if (bind(fBroadcastListenerSocket, (sockaddr*)&addr, sizeof(addr)) < 0) {
-        ERROR("ServerManager::_InitBroadcastListener(): ERROR: bind()ing the "
-            "broadcasting socket failed: %s\n", strerror(errno));
+        ERROR(("ServerManager::_InitBroadcastListener(): ERROR: bind()ing the "
+            "broadcasting socket failed: %s\n", strerror(errno)));
         safe_closesocket(fBroadcastListenerSocket);
         return errno;
     }
@@ -470 +470 @@
             fListener->ServerAdded(serverInfo);
         }
     } else {
-        WARN("ServerManager::_ServerAdded(%p): WARNING: Unexpected server "
-            "info.\n", serverInfo);
+        WARN(("ServerManager::_ServerAdded(%p): WARNING: Unexpected server "
+            "info.\n", serverInfo));
     }
 }
 
@@ -505 +505 @@
         }
         oldInfo->ReleaseReference();
     } else {
-        WARN("ServerManager::_ServerUpdated(%p): WARNING: Unexpected server "
-            "info.\n", serverInfo);
+        WARN(("ServerManager::_ServerUpdated(%p): WARNING: Unexpected server "
+            "info.\n", serverInfo));
     }
 }
 
@@ -528 +528 @@
             fListener->ServerRemoved(serverInfo);
         }
     } else {
-        WARN("ServerManager::_AddingServerFailed(%p): WARNING: Unexpected "
-            "server info.\n", serverInfo);
+        WARN(("ServerManager::_AddingServerFailed(%p): WARNING: Unexpected "
+            "server info.\n", serverInfo));
     }
 }
 
@@ -557 +557 @@
         serverInfo->SetState(STATE_OBSOLETE);
         oldInfo->SetState(STATE_READY);
     } else {
-        WARN("ServerManager::_UpdatingServerFailed(%p): WARNING: Unexpected "
-            "server info.\n", serverInfo);
+        WARN(("ServerManager::_UpdatingServerFailed(%p): WARNING: Unexpected "
+            "server info.\n", serverInfo));
     }
 }
 

src/add-ons/kernel/file_systems/netfs/client/ServerVolume.cpp

@@ -104 +104 @@
             PRINT(("  adding share: %s\n", shareInfo->GetShareName()));
             status_t error = _AddShare(shareInfo);
             if (error != B_OK) {
-                ERROR("ServerVolume::SetServerInfo(): ERROR: Failed to add "
-                    "share `%s': %s\n", shareName, strerror(error));
+                ERROR(("ServerVolume::SetServerInfo(): ERROR: Failed to add "
+                    "share `%s': %s\n", shareName, strerror(error)));
             }
         }
     }
@@ -139 +139 @@
 
         error = _AddShare(shareInfo);
         if (error != B_OK) {
-            ERROR("ServerVolume::Init(): ERROR: Failed to add share `%s': "
-                "%s\n", shareInfo->GetShareName(), strerror(error));
+            ERROR(("ServerVolume::Init(): ERROR: Failed to add share `%s': "
+                "%s\n", shareInfo->GetShareName(), strerror(error)));
         }
     }
 

src/add-ons/kernel/file_systems/netfs/client/ShareVolume.cpp

@@ -190 +190 @@
     if (fNodes) {
         // there shouldn't be any more nodes
         if (fNodes->Size() > 0) {
-            WARN("ShareVolume::~ShareVolume(): WARNING: There are still "
-                "%ld nodes\n", fNodes->Size());
+            WARN(("ShareVolume::~ShareVolume(): WARNING: There are still "
+                "%ld nodes\n", fNodes->Size()));
         }
         for (NodeMap::Iterator it = fNodes->GetIterator(); it.HasNext();)
             delete it.Next().value;
@@ -202 +202 @@
     if (fEntries) {
         // there shouldn't be any more entries
         if (fEntries->Size() > 0) {
-            WARN("ShareVolume::~ShareVolume(): WARNING: There are still "
-                "%ld entries\n", fEntries->Size());
+            WARN(("ShareVolume::~ShareVolume(): WARNING: There are still "
+                "%ld entries\n", fEntries->Size()));
         }
         for (EntryMap::Iterator it = fEntries->GetIterator(); it.HasNext();)
             delete it.Next().value;
@@ -356 +356 @@
 PRINT(("  %ld nodes to remove\n", count));
     vnode_id* ids = new(std::nothrow) vnode_id[count];
     if (!ids) {
-        ERROR("ShareVolume::PrepareToUnmount(): ERROR: Insufficient memory to "
-            "allocate the node ID array!\n");
+        ERROR(("ShareVolume::PrepareToUnmount(): ERROR: Insufficient memory to "
+            "allocate the node ID array!\n"));
         return;
     }
     ArrayDeleter<vnode_id> _(ids);
@@ -415 +415 @@
 ShareVolume::RemoveChildVolume(Volume* volume)
 {
     // should never be called
-    WARN("WARNING: ShareVolume::RemoveChildVolume(%p) invoked!\n", volume);
+    WARN(("WARNING: ShareVolume::RemoveChildVolume(%p) invoked!\n", volume));
 }
 
 
@@ -2137 +2137 @@
 
             // add the entry
             if (!iterator->AddEntry(entry)) {
-                ERROR("ShareVolume::_ReadRemoteDir(): ERROR: Failed to add "
-                    "entry to remote iterator!\n");
+                ERROR(("ShareVolume::_ReadRemoteDir(): ERROR: Failed to add "
+                    "entry to remote iterator!\n"));
             }
         }
 
@@ -2741 +2741 @@
     DoublyLinkedList<ShareAttrDirIterator>* iteratorList
         = fAttrDirIterators->Get(node->GetID());
     if (!iteratorList) {
-        WARN("ShareVolume::_RemoveAttrDirIterator(): Iterator list not "
-            "found: node: %lld\n", node->GetID());
+        WARN(("ShareVolume::_RemoveAttrDirIterator(): Iterator list not "
+            "found: node: %lld\n", node->GetID()));
         return;
     }
 

src/add-ons/kernel/file_systems/netfs/headers/shared/BlockingQueue.h

@@ -175 +175 @@
         return B_ENTRY_NOT_FOUND;
     }
     if (count > 1) {
-        ERROR("ERROR: BlockingQueue::Remove(): Removed %ld elements!\n",
-            count);
+        ERROR(("ERROR: BlockingQueue::Remove(): Removed %ld elements!\n",
+            count));
     }
     return error;
 }

src/add-ons/kernel/file_systems/netfs/headers/shared/DebugSupport.h

@@ -121 +121 @@
     dbg_printf_end();                                                       \
 }
 
-#define TPRINT(x...)    DEBUG_CONTEXT( __out(x) )
+#define TPRINT(x)   DEBUG_CONTEXT( __out x )
 #define TREPORT_ERROR(status)                                               \
     DEBUG_CONTEXT_LINE( __out("%s\n", strerror(status)) )
 #define TRETURN_ERROR(err)                                                  \
@@ -138 +138 @@
         TREPORT_ERROR(_status);                                             \
         var = _status;                                                      \
 }
-#define TFUNCTION(x...)     DEBUG_CONTEXT_FUNCTION( ": ", __out(x) )
+#define TFUNCTION(x)        DEBUG_CONTEXT_FUNCTION( ": ", __out x )
 #define TFUNCTION_START()   DEBUG_CONTEXT_FUNCTION( "\n",  )
 #define TFUNCTION_END()     DEBUG_CONTEXT_FUNCTION( " done\n",  )
 
 #if DEBUG
-    #define PRINT(x...)             TPRINT(x)
+    #define PRINT(x)                TPRINT(x)
     #define REPORT_ERROR(status)    TREPORT_ERROR(status)
     #define RETURN_ERROR(err)       TRETURN_ERROR(err)
     #define SET_ERROR(var, err)     TSET_ERROR(var, err)
-    #define FATAL(x...)             DEBUG_CONTEXT( __out(x) )
-    #define ERROR(x...)             DEBUG_CONTEXT( __out(x) )
-    #define WARN(x...)              DEBUG_CONTEXT( __out(x) )
-    #define INFORM(x...)            DEBUG_CONTEXT( __out(x) )
-    #define FUNCTION(x...)          TFUNCTION(x)
+    #define FATAL(x)                DEBUG_CONTEXT( __out x )
+    #define ERROR(x)                DEBUG_CONTEXT( __out x )
+    #define WARN(x)             DEBUG_CONTEXT( __out x )
+    #define INFORM(x)           DEBUG_CONTEXT( __out x )
+    #define FUNCTION(x)         TFUNCTION(x)
     #define FUNCTION_START()        TFUNCTION_START()
     #define FUNCTION_END()          TFUNCTION_END()
     #define DARG(x)                 x
     #define D(x)                    {x;};
 #else
-    #define PRINT(x...)             ;
+    #define PRINT(x)                ;
     #define REPORT_ERROR(status)    ;
     #define RETURN_ERROR(status)    return status;
     #define SET_ERROR(var, err)     var = err;
-    #define FATAL(x...)             DEBUG_CONTEXT( __out(x) )
-    #define ERROR(x...)             DEBUG_CONTEXT( __out(x) )
-    #define WARN(x...)              DEBUG_CONTEXT( __out(x) )
-    #define INFORM(x...)            DEBUG_CONTEXT( __out(x) )
-    #define FUNCTION(x...)          ;
+    #define FATAL(x)                DEBUG_CONTEXT( __out x )
+    #define ERROR(x)                DEBUG_CONTEXT( __out x )
+    #define WARN(x)             DEBUG_CONTEXT( __out x )
+    #define INFORM(x)           DEBUG_CONTEXT( __out x )
+    #define FUNCTION(x)         ;
     #define FUNCTION_START()        ;
     #define FUNCTION_END()          ;
     #define DARG(x)

src/add-ons/kernel/file_systems/netfs/server/ClientConnection.cpp

@@ -2201 +2201 @@
         if (fInverseClientEndianess) {
             if (_KnownAttributeType(type)) {
                 if (pos != 0) {
-                    WARN("WriteAttr(): WARNING: Need to convert attribute "
+                    WARN(("WriteAttr(): WARNING: Need to convert attribute "
                         "endianess, but position is not 0: attribute: %s, "
                         "pos: %lld, size: %ld\n", request->name.GetString(),
-                        pos, size);
+                        pos, size));
                 }
                 swap_data(type, buffer, size, B_SWAP_ALWAYS);
             } else
@@ -2566 +2566 @@
     } else {
         // We only support "entry created" and "entry removed" query events.
         // "entry moved" is split by the volume manager into those.
-        ERROR("Ignoring unexpected query event: opcode: 0x%lx\n",
-            event->opcode);
+        ERROR(("Ignoring unexpected query event: opcode: 0x%lx\n",
+            event->opcode));
         return;
     }
 PRINT(("ClientConnection::ProcessQueryEvent(): event: %p, type: %s: directory: (%ld, %lld)\n", event, typeid(event).name(), volumeID, directoryID));

src/add-ons/kernel/file_systems/netfs/server/NetFSServer.cpp

@@ -168 +168 @@
         // send the request
         status_t error = requestChannel.SendRequest(&request);
         if (error != B_OK) {
-            ERROR("ServerInfoSender: ERROR: Failed to send request: %s\n",
-                strerror(error));
+            ERROR(("ServerInfoSender: ERROR: Failed to send request: %s\n",
+                strerror(error)));
         }
 
         SetDone(true);
@@ -328 +328 @@
         fBroadcaster = spawn_thread(&_BroadcasterEntry, "broadcaster",
             B_NORMAL_PRIORITY, this);
         if (fBroadcaster < 0) {
-            WARN("NetFSServer::Init(): Failed to spawn broadcaster thread "
-                "(%s). Continuing anyway.\n", strerror(fBroadcaster));
+            WARN(("NetFSServer::Init(): Failed to spawn broadcaster thread "
+                "(%s). Continuing anyway.\n", strerror(fBroadcaster)));
         }
     }
     return B_OK;
@@ -809 +809 @@
         const char* userName = parameter.ValueAt(0);
         const char* password = parameter.GetParameterValue("password");
         if (!userName) {
-            WARN("Skipping nameless user settings entry.\n");
+            WARN(("Skipping nameless user settings entry.\n"));
             continue;
         }
 //      PRINT(("user: %s, password: %s\n", parameter.ValueAt(0),
 //          parameter.GetParameterValue("password")));
         error = securityContext->AddUser(userName, password);
         if (error != B_OK)
-            ERROR("ERROR: Failed to add user `%s'\n", userName);
+            ERROR(("ERROR: Failed to add user `%s'\n", userName));
     }
 
     // load shares
@@ -825 +825 @@
         const char* shareName = parameter.ValueAt(0);
         const char* path = parameter.GetParameterValue("path");
         if (!shareName || !path) {
-            WARN("settings: Skipping invalid share settings entry (no name"
-                " or no path).\n");
+            WARN(("settings: Skipping invalid share settings entry (no name"
+                " or no path).\n"));
             continue;
         }
 //      PRINT(("share: %s, path: %s\n", parameter.ValueAt(0),
@@ -834 +834 @@
         Share* share;
         error = securityContext->AddShare(shareName, path, &share);
         if (error != B_OK) {
-            ERROR("ERROR: Failed to add share `%s'\n", shareName);
+            ERROR(("ERROR: Failed to add share `%s'\n", shareName));
             continue;
         }
         BReference<Share> shareReference(share, true);
@@ -847 +847 @@
 //          PRINT(("  user: %s\n", userName));
             User* user = securityContext->FindUser(userName);
             if (!user) {
-                ERROR("ERROR: Undefined user `%s'.\n", userName);
+                ERROR(("ERROR: Undefined user `%s'.\n", userName));
                 continue;
             }
             BReference<User> userReference(user, true);
@@ -877 +877 @@
             error = securityContext->SetNodePermissions(share->GetPath(), user,
                 permissions);
             if (error != B_OK) {
-                ERROR("ERROR: Failed to set permissions for share `%s'\n",
-                    share->GetName());
+                ERROR(("ERROR: Failed to set permissions for share `%s'\n",
+                    share->GetName()));
             }
         }
     }
@@ -894 +894 @@
 {
     status_t error = _LoadSettings();
     if (error != B_OK) {
-        WARN("NetFSServer::_InitSettings(): WARNING: Failed to load settings "
-            "file: %s - falling back to driver settings.\n", strerror(error));
+        WARN(("NetFSServer::_InitSettings(): WARNING: Failed to load settings "
+            "file: %s - falling back to driver settings.\n", strerror(error)));
 
         // fall back to the driver settings file
         error = _LoadSecurityContext(&fSecurityContext);
         if (error != B_OK) {
-            WARN("NetFSServer::_InitSettings(): WARNING: Failed to load "
-                "settings from driver settings: %s\n", strerror(error));
+            WARN(("NetFSServer::_InitSettings(): WARNING: Failed to load "
+                "settings from driver settings: %s\n", strerror(error)));
 
             // use defaults
             // create a security context
@@ -1117 +1117 @@
                     connection);
             if (initializer) {
                 if (initializer->Run() != B_OK) {
-                    ERROR("Failed to run connection initializer.\n")
+                    ERROR(("Failed to run connection initializer.\n"))
                     delete initializer;
                 }
             } else {
-                ERROR("Failed to create connection initializer.\n")
+                ERROR(("Failed to create connection initializer.\n"))
                 delete connection;
             }
 
@@ -1169 +1169 @@
     // create the socket
     fBroadcastingSocket = socket(AF_INET, SOCK_DGRAM, 0);
     if (fBroadcastingSocket < 0) {
-        WARN("NetFSServer::_Broadcaster(): WARN: Failed to init broadcasting: "
-            "%s.\n", strerror(errno));
+        WARN(("NetFSServer::_Broadcaster(): WARN: Failed to init broadcasting: "
+            "%s.\n", strerror(errno)));
         return errno;
     }
 
@@ -1179 +1179 @@
         int soBroadcastValue = 1;
         if (setsockopt(fBroadcastingSocket, SOL_SOCKET, SO_BROADCAST,
             &soBroadcastValue, sizeof(soBroadcastValue)) < 0) {
-            WARN("NetFSServer::_Broadcaster(): WARN: Failed to set "
-                "SO_BROADCAST on socket: %s.\n", strerror(errno));
+            WARN(("NetFSServer::_Broadcaster(): WARN: Failed to set "
+                "SO_BROADCAST on socket: %s.\n", strerror(errno)));
         }
     #endif
 
@@ -1205 +1205 @@
         ssize_t bytesSent = sendto(fBroadcastingSocket, &message,
             sizeof(message), 0, (sockaddr*)&addr, addrSize);
         if (bytesSent < 0) {
-            WARN("NetFSServer::_Broadcaster(): WARN: sending failed: %s.\n",
-                strerror(errno));
+            WARN(("NetFSServer::_Broadcaster(): WARN: sending failed: %s.\n",
+                strerror(errno)));
             return errno;
         }
 
@@ -1297 +1297 @@
     // set the server name and the connection method
     char hostName[1024];
     if (gethostname(hostName, sizeof(hostName)) < 0) {
-        ERROR("NetFSServer::_GetServerInfo(): ERROR: Failed to get host "
-            "name.");
+        ERROR(("NetFSServer::_GetServerInfo(): ERROR: Failed to get host "
+            "name."));
         return B_ERROR;
     }
     status_t error = serverInfo.SetServerName(hostName);

src/add-ons/kernel/file_systems/netfs/server/Node.cpp

@@ -150 +150 @@
 
     // check if it is the same node
     if (st.st_dev != fStat.st_dev || st.st_ino != fStat.st_ino) {
-        ERROR("Node::UpdateStat(): ERROR: GetPath() returned path that "
+        ERROR(("Node::UpdateStat(): ERROR: GetPath() returned path that "
             "doesn't point to this node: node: (%ld, %lld), path: `%s'\n",
-            GetVolumeID(), GetID(), path.GetPath());
+            GetVolumeID(), GetID(), path.GetPath()));
         return B_ENTRY_NOT_FOUND;
     }
 

src/add-ons/kernel/file_systems/netfs/shared/RequestChannel.cpp

@@ -169 +169 @@
     if (error != B_OK)
         RETURN_ERROR(error);
     if (size < 0 || size > kMaxSaneRequestSize) {
-        ERROR("RequestChannel::SendRequest(): ERROR: Invalid request size: "
-            "%ld\n", size);
+        ERROR(("RequestChannel::SendRequest(): ERROR: Invalid request size: "
+            "%ld\n", size));
         RETURN_ERROR(B_BAD_DATA);
     }
 
@@ -208 +208 @@
     header.type = B_HOST_TO_BENDIAN_INT32(header.type);
     header.size = B_HOST_TO_BENDIAN_INT32(header.size);
     if (header.size < 0 || header.size > kMaxSaneRequestSize) {
-        ERROR("RequestChannel::ReceiveRequest(): ERROR: Invalid request size: "
-            "%ld\n", header.size);
+        ERROR(("RequestChannel::ReceiveRequest(): ERROR: Invalid request size: "
+            "%ld\n", header.size));
         RETURN_ERROR(B_BAD_DATA);
     }