comparison vamp-server/server.cpp @ 105:491a4bc10a01

Merge

 #include <capnp/serialize.h>
 
 #include <map>
 #include <set>
 
+#include <unistd.h> // getpid for logging
+
 using namespace std;
 using namespace piper_vamp;
 using namespace Vamp;
 
 //!!! This could be faster and lighter:
 //  - Use Capnp structures directly rather than converting to vamp-support ones
 //  - Use Vamp C API (vamp.h) directly rather than converting to C++
 //!!! Doing the above for process() and finish() alone would be a good start
 
+static int pid = getpid();
+    
 void usage()
 {
     string myname = "piper-vamp-server";
     cerr << "\n" << myname <<
 	": Load and run Vamp plugins in response to messages from stdin\n\n"

 
     case RRType::Load:
 	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;
 	
     case RRType::Configure:

     }
     
     return response;
 }
 
-int main(int argc, char **argv)
+int main(int argc, char **)
 {
     if (argc != 1) {
 	usage();
     }
 

 	
 	try {
 
 	    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);
 	    
 	    exit(1);
 	}