postgrespro
diff --git a/‎contrib/pg_dtm/dtmd/include/limits.h
Lines changed: 3 additions & 2 deletions b/‎contrib/pg_dtm/dtmd/include/limits.h
Lines changed: 3 additions & 2 deletions
diff --git a/‎contrib/pg_dtm/dtmd/include/parser.h
Lines changed: 0 additions & 47 deletions b/‎contrib/pg_dtm/dtmd/include/parser.h
Lines changed: 0 additions & 47 deletions
diff --git a/‎contrib/pg_dtm/dtmd/include/server.h
Lines changed: 90 additions & 0 deletions b/‎contrib/pg_dtm/dtmd/include/server.h
Lines changed: 90 additions & 0 deletions
diff --git a/‎contrib/pg_dtm/dtmd/src/main.c
Lines changed: 0 additions & 21 deletions b/‎contrib/pg_dtm/dtmd/src/main.c
Lines changed: 0 additions & 21 deletions
diff --git a/‎contrib/pg_dtm/dtmd/src/parser-test.c
Lines changed: 0 additions & 71 deletions b/‎contrib/pg_dtm/dtmd/src/parser-test.c
Lines changed: 0 additions & 71 deletions
@@ -4,7 +4,8 @@
 #define MAX_TRANSACTIONS_PER_CLIENT 1024
 #define MAX_TRANSACTIONS 1024
 
-#define BITS_PER_NODE 4
-#define MAX_NODES (1 << BITS_PER_NODE)
+#define BUFFER_SIZE (64 * 1024)
+#define LISTEN_QUEUE_SIZE 100
+#define MAX_STREAMS 128
 
 #endif
@@ -0,0 +1,90 @@
+#ifndef SERVER_H
+#define SERVER_H
+
+/*
+ * You should not want to know what is inside those structures.
+ */
+typedef struct server_data_t *server_t;
+typedef struct client_data_t *client_t;
+
+/*
+ * The server will call this function whenever it gets a message ('len' bytes
+ * of 'data') from the 'client'.
+ */
+typedef void (*onmessage_callback_t)(client_t client, size_t len, char *data);
+
+/*
+ * The server will call this function whenever a new 'client' send the first
+ * message. This callback gets called before the 'onmessage'.
+ */
+typedef void (*onconnect_callback_t)(client_t client);
+
+/*
+ * The server will call this function whenever it considers the 'client'
+ * disconnected.
+ */
+typedef void (*ondisconnect_callback_t)(client_t client);
+
+/*
+ * Creates a new server that will listen on 'host:port' and call the specified
+ * callbacks. Returns the server handle to use in other methods.
+ */
+server_t server_init(
+	char *host,
+	int port,
+	onmessage_callback_t onmessage,
+	onconnect_callback_t onconnect,
+	ondisconnect_callback_t ondisconnect,
+);
+
+/*
+ * Starts the server. Returns 'true' on success, 'false' otherwise.
+ */
+bool server_start(server_t server);
+
+/*
+ * The main server loop. Does not return, so use the callbacks and signal
+ * handlers to add more logic.
+ */
+void server_loop(server_t server);
+
+/*
+ * These two methods allow you to set and get your custom 'userdata' for the
+ * 'client'. The server does not care about this data and will not free it on
+ * client disconnection.
+ */
+void client_set_data(client_t client, void *userdata);
+void *client_get_data(client_t client);
+
+/*
+ * Puts an empty message header into the output buffer of the corresponding
+ * socket. The message will not be sent until you call the _finish() method.
+ * A call to this function may lead to a send() call if there is not enough
+ * space in the buffer.
+ * 
+ * Returns 'true' on success, 'false' otherwise.
+ * 
+ * NOTE: Be careful not to call the _message_ methods for other clients until
+ * you _finish() this message. This limitation is due to the fact that multiple
+ * clients share the same socket.
+ */
+bool client_message_start(client_t client);
+
+/*
+ * Appends 'len' bytes of 'data' to the buffer of the corresponding socket.
+ * A call to this function may lead to a send() call if there is not enough
+ * space in the buffer.
+ * 
+ * Returns 'true' on success, 'false' otherwise.
+ */
+bool client_message_append(client_t client, size_t len, void *data);
+
+/*
+ * Finalizes the message. After finalizing the message becomes ready to be sent
+ * over the corresponding socket, and you may _start() another message.
+ * 
+ * Returns 'true' on success, 'false' otherwise.
+ */
+bool client_message_finish(client_t client);
+
+#endif
@@ -9,7 +9,6 @@
 #include <sys/wait.h>
 
 #include "clog.h"
-#include "parser.h"
 #include "eventwrap.h"
 #include "util.h"
 #include "intset.h"
@@ -28,29 +27,25 @@ xid_t prev_gxid, next_gxid;
 
 typedef struct client_data_t {
 	int id;
-	parser_t parser;
 	int snapshots_sent;
 	xid_t xid;
 } client_data_t;
 
 clog_t clg;
 
 #define CLIENT_ID(X) (((client_data_t*)(X))->id)
-#define CLIENT_PARSER(X) (((client_data_t*)(X))->parser)
 #define CLIENT_SNAPSENT(X) (((client_data_t*)(X))->snapshots_sent)
 #define CLIENT_XID(X) (((client_data_t*)(X))->xid)
 
 static client_data_t *create_client_data(int id) {
 	client_data_t *cd = malloc(sizeof(client_data_t));
 	cd->id = id;
-	cd->parser = parser_create();
 	cd->snapshots_sent = 0;
 	cd->xid = INVALID_XID;
 	return cd;
 }
 
 static void free_client_data(client_data_t *cd) {
-	parser_destroy(cd->parser);
 	free(cd);
 }
 
@@ -547,30 +542,14 @@ static char *oncmd(void *stream, void *clientdata, cmd_t *cmd) {
 
 static char *ondata(void *stream, void *clientdata, size_t len, char *data) {
 	int i;
-	parser_t parser = CLIENT_PARSER(clientdata);
 	char *response = NULL;
 
-	// The idea is to feed each character through
-	// the parser, which will return a cmd from
-	// time to time.
 	for (i = 0; i < len; i++) {
 		if (data[i] == '\n') {
 			// ignore newlines (TODO: should we ignore them?)
 			continue;
 		}
 
-		cmd_t *cmd = parser_feed(parser, data[i]);
-		if (parser_failed(parser)) {
-			shout(
-				"[%d] parser failed on character '%c' (%d): %s\n",
-				CLIENT_ID(clientdata),
-				data[i], data[i],
-				parser_errormsg(parser)
-			);
-			parser_init(parser);
-			response = strdup("-");
-			break;
-		}
 		if (cmd) {
 			char *newresponse = oncmd(stream, clientdata, cmd);
 			response = destructive_concat(response, newresponse);