work on librarisation

Signed-off-by: Mattias Andrée <maandree@operamail.com>

1 files changed, 67 insertions, 255 deletions

diff --git a/src/cmdline.c b/src/cmdline.c
index de81bc1..d3b2a07 100644
--- a/src/cmdline.c
+++ b/src/cmdline.c
@@ -1,51 +1,37 @@
-#define _XOPEN_SOURCE 700
-#include <stdlib.h>
-#include <stdio.h>
-#include <time.h>
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <sys/ipc.h>
-#include <sys/sem.h>
-#include <sys/shm.h>
-
-
-
-#ifdef _SEM_SEMUN_UNDEFINED
-union semun {
-	int val;
-	struct semid_ds *buf;
-	unsigned short *array;
-};
-#endif
-
-
-#define S 0
-#define W 1
-#define X 2
-#define Q 3
-
-#define SEMAPHORES 4
-#define MEMORY_SIZE (2 * 1024)
-
-
-#define    open_semaphore()                        ((sem_id = semget(key_sem, SEMAPHORES, 0600)) == -1 ? -1 : 0)
-#define acquire_semaphore(semaphore, delta, undo)  semaphore_op(semaphore, -delta, undo)
-#define release_semaphore(semaphore, delta, undo)  semaphore_op(semaphore, +delta, undo)
-#define    zero_semaphore(semaphore)               semaphore_op(semaphore, 0, 0)
-
-
+/**
+ * MIT/X Consortium License
+ * 
+ * Copyright © 2015  Mattias Andrée <maandree@member.fsf.org>
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+#include "bus.h"
+
+
+/**
+ * Statement wrapper that goes to `fail` on failure
+ */
 #define t(inst)  if ((inst) == -1)  goto fail
 
 
-
 char *argv0;
-
-static int sem_id = -1;
-static key_t key_sem = -1;
-static key_t key_shm = -1;
-
+static const char *command;
 
 
 static int
@@ -76,180 +62,24 @@ fail:
 
 
 static int
-create_semaphores(void)
-{
-	int id = -1, rint, saved_errno;
-	double r;
-	union semun values;
-
-	values.array = NULL;
-
-	/* Create semaphore array. */
-	for (;;) {
-		rint = rand();
-		r = (double)rint;
-		r /= (double)RAND_MAX + 1;
-		r *= (1 << (8 * sizeof(key_t) - 2)) - 1;
-		key_sem = (key_t)r + 1;
-		if (key_sem == IPC_PRIVATE)
-			continue;
-		id = semget(key_sem, SEMAPHORES, IPC_CREAT | IPC_EXCL | 0600);
-		if (id != -1)
-			break;
-		if ((errno != EEXIST) && (errno != EINTR))
-			goto fail;
-	}
-
-	/* Initialise the array. */
-	values.array = calloc(SEMAPHORES, sizeof(unsigned short));
-	values.array[X] = 1;
-	if (!values.array)
-		goto fail;
-	if (semctl(id, 0, SETALL, values.array) == -1)
-		goto fail;
-	free(values.array);
-	values.array = NULL;
-
-	printf("%zi\n", (ssize_t)key_sem);
-	return 0;
-
-fail:
-	saved_errno = errno;
-	if ((id != -1) && (semctl(id, 0, IPC_RMID) == -1))
-		perror(argv0);
-	free(values.array);
-	errno = saved_errno;
-	return -1;
-}
-
-
-static int
-create_shared_memory(void)
-{
-	int id = -1, rint, saved_errno;
-	double r;
-	struct shmid_ds _info;
-
-	/* Create shared memory. */
-	for (;;) {
-		rint = rand();
-		r = (double)rint;
-		r /= (double)RAND_MAX + 1;
-		r *= (1 << (8 * sizeof(key_t) - 2)) - 1;
-		key_shm = (key_t)r + 1;
-		if (key_shm == IPC_PRIVATE)
-			continue;
-		id = shmget(key_shm, MEMORY_SIZE, IPC_CREAT | IPC_EXCL | 0600);
-		if (id != -1)
-			break;
-		if ((errno != EEXIST) && (errno != EINTR))
-			goto fail;
-	}
-
-	printf("%zi\n", (ssize_t)key_shm);
-	return 0;
-
-fail:
-	saved_errno = errno;
-	if ((id != -1) && (shmctl(id, IPC_RMID, &_info) == -1))
-		perror(argv0);
-	errno = saved_errno;
-	return -1;
-}
-
-
-static int
-remove_semaphores(void)
-{
-	int id = semget(key_sem, SEMAPHORES, 0600);
-	return ((id == -1) || (semctl(id, 0, IPC_RMID) == -1)) ? -1 : 0;
-}
-
-
-static int
-remove_shared_memory(void)
-{
-	struct shmid_ds _info;
-	int id = shmget(key_shm, MEMORY_SIZE, 0600);
-	return ((id == -1) || (shmctl(sem_id, IPC_RMID, &_info) == -1)) ? -1 : 0;
-}
-
-
-static int
-semaphore_op(unsigned short semaphore, short delta, int undo)
-{
-	struct sembuf op;
-	op.sem_op = delta;
-	op.sem_num = semaphore;
-	op.sem_flg = undo ? SEM_UNDO : 0;
-	return semop(sem_id, &op, 1);
-}
-
-
-static int
-write_semaphore(unsigned short semaphore, int value)
-{
-	union semun semval;
-	semval.val = value;
-	return semctl(sem_id, semaphore, SETVAL, semval);
-}
-
-
-
-static int
-read_shared_memory(char *message)
-{
-	int id, saved_errno;
-	void *address = NULL;
-
-	t(id = shmget(key_shm, MEMORY_SIZE, 0600));
-	address = shmat(id, NULL, SHM_RDONLY);
-	if ((address == (void *)-1) || !address)
-		goto fail;
-	strncpy(message, address, MEMORY_SIZE);
-	t(shmdt(address));
-	return 0;
-
-fail:
-	saved_errno = errno;
-	if (address && (shmdt(address) == -1))
-		perror(argv0);
-	errno = saved_errno;
-	return -1;
-}
-
-
-static int
-write_shared_memory(const char *message)
+spawn_continue(const char *message)
 {
-	int id, saved_errno;
-	void *address = NULL;
-
-	t(id = shmget(key_shm, MEMORY_SIZE, 0600));
-	address = shmat(id, NULL, 0);
-	if ((address == (void *)-1) || !address)
-		goto fail;
-	memcpy(address, message, (strlen(message) + 1) * sizeof(char));
-	t(shmdt(address));
-	return 0;
-
-fail:
-	saved_errno = errno;
-	if (address && (shmdt(address) == -1))
-		perror(argv0);
-	errno = saved_errno;
-	return -1;
+	pid_t pid = fork();
+	if (pid)
+		return pid == -1 ? -1 : 1;
+	setenv("arg", message, 1);
+	execlp("sh", "sh", "-c", command, NULL);
+	perror(argv0);
+	exit(1);
 }
 
 
 static int
-spawn(const char *command, const char *message)
+spawn_break(const char *message)
 {
 	pid_t pid = fork();
-
 	if (pid)
 		return pid == -1 ? -1 : 0;
-
 	setenv("arg", message, 1);
 	execlp("sh", "sh", "-c", command, NULL);
 	perror(argv0);
@@ -260,55 +90,37 @@ spawn(const char *command, const char *message)
 int
 main(int argc, char *argv[])
 {
-	char read_message[MEMORY_SIZE];
+	bus_t bus;
 
 	argv0 = *argv;
 
-	if ((argc == 2) && !strcmp(argv[1], "create")) {
-		srand((unsigned int)time(NULL));
-		t(create_semaphores());
-		t(create_shared_memory());
-
-	} else if ((argc == 2) && !strcmp(argv[1], "remove")) {
-		t(get_keys());
-		t(remove_semaphores());
-		t(remove_shared_memory());
-
-	} else if ((argc == 3) && !strcmp(argv[1], "listen")) {
-		t(get_keys());
-		t(open_semaphore());
-		t(release_semaphore(S, 1, 1));
-		for (;;) {
-			t(release_semaphore(Q, 1, 0));
-			t(zero_semaphore(Q));
-			t(read_shared_memory(read_message));
-			t(spawn(argv[2], read_message));
-			t(release_semaphore(W, 1, 1));
-			t(acquire_semaphore(S, 1, 1));
-			t(zero_semaphore(S));
-			t(release_semaphore(S, 1, 1));
-			t(acquire_semaphore(W, 1, 1));
-		}
-
-	} else if ((argc == 3) && !strcmp(argv[1], "wait")) {
-		t(get_keys());
-		t(open_semaphore());
-		t(release_semaphore(S, 1, 1));
-		t(release_semaphore(Q, 1, 0));
-		t(zero_semaphore(Q));
-		t(read_shared_memory(read_message));
-		t(spawn(argv[2], read_message));
-		t(acquire_semaphore(S, 1, 1));
-
-	} else if ((argc == 3) && !strcmp(argv[1], "broadcast")) {
-		t(get_keys());
-		t(open_semaphore());
-		t(acquire_semaphore(X, 1, 1));
-		t(zero_semaphore(W));
-		t(write_shared_memory(argv[2]));
-		t(write_semaphore(Q, 0));
-		t(zero_semaphore(S));
-		t(release_semaphore(X, 1, 1));
+	if ((argc == 3) && !strcmp(argv[1], "create")) {
+		t(bus_create(argv[2], 0) ? 0 : -1);
+
+	} else if ((argc == 2) && !strcmp(argv[1], "create")) {
+		char *file = bus_create(NULL, 0);
+		t(file ? 0 : -1);
+		printf("%s\n", file);
+
+	} else if ((argc == 3) && !strcmp(argv[1], "remove")) {
+		t(bus_unlink(argv[2]));
+
+	} else if ((argc == 4) && !strcmp(argv[1], "listen")) {
+		command = argv[3];
+		t(bus_open(&bus, argv[2], BUS_RDONLY));
+		t(bus_read(&bus, spawn_continue, NULL));
+		t(bus_close(&bus));
+
+	} else if ((argc == 4) && !strcmp(argv[1], "wait")) {
+		command = argv[3];
+		t(bus_open(&bus, argv[2], BUS_RDONLY));
+		t(bus_read(&bus, spawn_break, NULL));
+		t(bus_close(&bus));
+
+	} else if ((argc == 4) && !strcmp(argv[1], "broadcast")) {
+		t(bus_open(&bus, argv[2], BUS_WRONLY));
+		t(bus_write(&bus, argv[3]))
+		t(bus_close(&bus));
 
 	} else
 		return 2;