Encapsulate ev_loop into jsonrpc-c. Add jrpc_server_run.

Signed-off-by: Mathieu Benoit <mathieu.benoit@savoirfairelinux.com>

Author: Mathieu Benoit

example/server.c

@@ -17,30 +17,27 @@
 #include <arpa/inet.h>
 #include <sys/wait.h>
 #include <signal.h>
-#include <ev.h>
 #include "jsonrpc-c.h"
 
 #define PORT 1234  // the port users will be connecting to
 
-struct ev_loop *loop;
+struct jrpc_server my_server;
 
 cJSON * say_hello(jrpc_context * ctx, cJSON * params, cJSON *id) {
 	return cJSON_CreateString("Hello!");
 }
 
 cJSON * exit_server(jrpc_context * ctx, cJSON * params, cJSON *id) {
-	ev_break(loop, EVBREAK_ALL);
+	jrpc_server_stop(&my_server);
 	return cJSON_CreateString("Bye!");
 }
 
 int main(void) {
-	loop = EV_DEFAULT;
-	struct jrpc_server my_server;
-	jrpc_server_init(&my_server, loop, PORT);
+	jrpc_server_init(&my_server, PORT);
 	jrpc_server_start(&my_server);
 	jrpc_register_procedure(&my_server, say_hello, "sayHello", NULL );
 	jrpc_register_procedure(&my_server, exit_server, "exit", NULL );
-	ev_run(loop, 0);
+	jrpc_server_run(&my_server);
 	jrpc_server_destroy(&my_server);
 	return 0;
 }

include/jsonrpc-c.h

@@ -63,11 +63,12 @@ struct jrpc_connection {
 	int debug_level;
 };
 
-int jrpc_server_init(struct jrpc_server *server, struct ev_loop *loop,
-		int port_number);
+int jrpc_server_init(struct jrpc_server *server, int port_number);
 
 int jrpc_server_start(struct jrpc_server *server);
 
+void jrpc_server_run(struct jrpc_server *server);
+
 int jrpc_server_stop(struct jrpc_server *server);
 
 void jrpc_server_destroy(struct jrpc_server *server);

src/jsonrpc-c.c

@@ -18,6 +18,8 @@
 
 #include "jsonrpc-c.h"
 
+struct ev_loop *loop;
+
 // get sockaddr, IPv4 or IPv6:
 static void *get_in_addr(struct sockaddr *sa) {
 	if (sa->sa_family == AF_INET) {
@@ -234,8 +236,8 @@ static void accept_cb(struct ev_loop *loop, ev_io *w, int revents) {
 	}
 }
 
-int jrpc_server_init(struct jrpc_server *server, struct ev_loop *loop,
-		int port_number) {
+int jrpc_server_init(struct jrpc_server *server, int port_number) {
+    loop = EV_DEFAULT;
 	memset(server, 0, sizeof(struct jrpc_server));
 	server->loop = loop;
 	server->port_number = port_number;
@@ -309,7 +311,12 @@ int jrpc_server_start(struct jrpc_server *server) {
 	return 0;
 }
 
+void jrpc_server_run(struct jrpc_server *server){
+	ev_run(server->loop, 0);
+}
+
 int jrpc_server_stop(struct jrpc_server *server) {
+	ev_break(server->loop, EVBREAK_ALL);
 	return 0;
 }