Mercurial > hg > piper-cpp

changeset 103:6fad5154778e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add pid to server debug output
author Chris Cannam <c.cannam@qmul.ac.uk>
date Fri, 14 Oct 2016 16:23:36 +0100
parents bbb99f94e225
children 387d38c96c16
files Makefile vamp-server/server.cpp
diffstat 2 files changed, 13 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Fri Oct 14 12:46:38 2016 +0100
+++ b/Makefile	Fri Oct 14 16:23:36 2016 +0100
@@ -2,7 +2,7 @@
 VAMPSDK_DIR	:= ../vamp-plugin-sdk
 PIPER_DIR	:= ../piper
 
-CXXFLAGS	:= -Wall -Werror -g3 -std=c++11
+CXXFLAGS	:= -Wall -Wextra -Werror -g3 -std=c++11
 INCFLAGS	:= -I$(VAMPSDK_DIR) -I. -I/usr/local/include
 
 LDFLAGS		:= $(VAMPSDK_DIR)/libvamp-hostsdk.a -L/usr/local/lib -lcapnp -lkj -ldl
--- a/vamp-server/server.cpp	Fri Oct 14 12:46:38 2016 +0100
+++ b/vamp-server/server.cpp	Fri Oct 14 16:23:36 2016 +0100
@@ -13,10 +13,14 @@
 #include <map>
 #include <set>
 
+#include <unistd.h> // getpid for logging
+
 using namespace std;
 using namespace piper_vamp;
 using namespace Vamp;
 
+static int pid = getpid();
+    
 void usage()
 {
     string myname = "piper-vamp-server";
@@ -175,7 +179,7 @@
 	response.loadResponse = LoaderRequests().loadPlugin(request.loadRequest);
 	if (response.loadResponse.plugin != nullptr) {
 	    mapper.addPlugin(response.loadResponse.plugin);
-            cerr << "loaded plugin, handle = " << mapper.pluginToHandle(response.loadResponse.plugin) << endl;
+            cerr << "piper-vamp-server " << pid << ": loaded plugin, handle = " << mapper.pluginToHandle(response.loadResponse.plugin) << endl;
 	    response.success = true;
 	}
 	break;
@@ -257,7 +261,7 @@
     return response;
 }
 
-int main(int argc, char **argv)
+int main(int argc, char **)
 {
     if (argc != 1) {
 	usage();
@@ -271,36 +275,36 @@
 
 	    request = readRequestCapnp();
 
-	    cerr << "piper-vamp-server: request received, of type "
+	    cerr << "piper-vamp-server " << pid << ": request received, of type "
 		 << int(request.type)
 		 << endl;
 	    
 	    // NotValid without an exception indicates EOF:
 	    if (request.type == RRType::NotValid) {
-		cerr << "piper-vamp-server: eof reached, exiting" << endl;
+		cerr << "piper-vamp-server " << pid << ": eof reached, exiting" << endl;
 		break;
 	    }
 
 	    RequestOrResponse response = handleRequest(request);
             response.id = request.id;
 
-	    cerr << "piper-vamp-server: request handled, writing response"
+	    cerr << "piper-vamp-server " << pid << ": request handled, writing response"
 		 << endl;
 	    
 	    writeResponseCapnp(response);
 
-	    cerr << "piper-vamp-server: response written" << endl;
+	    cerr << "piper-vamp-server " << pid << ": response written" << endl;
 
 	    if (request.type == RRType::Finish) {
 		auto h = mapper.pluginToHandle(request.finishRequest.plugin);
-                cerr << "deleting the plugin with handle " << h << endl;
+                cerr << "piper-vamp-server " << pid << ": deleting the plugin with handle " << h << endl;
 		mapper.removePlugin(h);
 		delete request.finishRequest.plugin;
 	    }
 	    
 	} catch (std::exception &e) {
 
-	    cerr << "piper-vamp-server: error: " << e.what() << endl;
+	    cerr << "piper-vamp-server " << pid << ": error: " << e.what() << endl;
 
 	    writeExceptionCapnp(e, request.type);