dwindows: gtk/dw.c comparison

comparison gtk/dw.c @ 558:05060ce4d6ae

Fixes for the new shared memory and named event code.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Sat, 17 Apr 2004 06:04:40 +0000
parents	1a210e2f214b
children	c0a708e2cba3

comparison

equal deleted inserted replaced

-:1a210e2f214b
+:05060ce4d6ae
 #include <unistd.h>
 #include <errno.h>
 #include <sys/time.h>
 #include <dirent.h>
 #include <sys/stat.h>
+#include <signal.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <sys/mman.h>
+#include <fcntl.h>
+#include <unistd.h>
 #include "config.h"
 #include <gdk/gdkkeysyms.h>
 #ifdef USE_IMLIB
 #include <gdk_imlib.h>
 #endif
 	struct sockaddr_un un;
 	int ev, *tmpsock = (int *)malloc(sizeof(int)*2);
 	DWTID dwthread;
 	if(!tmpsock)
-		return DB_EVENT_NO_MEM;
+		return NULL;
 	tmpsock[0] = socket(AF_UNIX, SOCK_STREAM, 0);
 	ev = socket(AF_UNIX, SOCK_STREAM, 0);
 	memset(&un, 0, sizeof(un));
 	un.sun_family=AF_UNIX;
 		if(tmpsock[1] > -1)
 			close(tmpsock[1]);
 		if(ev > -1)
 			close(ev);
 		free(tmpsock);
-		return 0;
+		return NULL;
 	}
 	/* Create a thread to handle this event semaphore */
 	pthread_create(&dwthread, NULL, (void *)_handle_sem, (void *)tmpsock);
-	return ev;
+	return (HEV)ev;
 }
 /* Open an already existing named event semaphore.
 * Parameters:
 *         eve: Pointer to an event handle to receive handle.
 HEV dw_named_event_get(char *name)
 {
 	struct sockaddr_un un;
 	int ev = socket(AF_UNIX, SOCK_STREAM, 0);
 	if(ev < 0)
-		return 0;
+		return NULL;
 	un.sun_family=AF_UNIX;
 	mkdir("/tmp/.dw", S_IWGRP|S_IWOTH);
 	strcpy(un.sun_path, "/tmp/.dw/");
 	strcat(un.sun_path, name);
 	connect(ev, (struct sockaddr *)&un, sizeof(un));
-	return ev;
+	return (HEV)ev;
 }
 /* Resets the event semaphore so threads who call wait
 * on this semaphore will block.
 * Parameters:
 int dw_named_event_reset(HEV eve)
 {
 	/* signal reset */
 	char tmp = (char)0;
-	if(eve < 0)
+	if((int)eve < 0)
 		return 0;
-	if(write(eve, &tmp, 1) == 1)
+	if(write((int)eve, &tmp, 1) == 1)
 		return 0;
 	return 1;
 }
 /* Sets the posted state of an event semaphore, any threads
 {
 	/* signal post */
 	char tmp = (char)1;
-	if(eve < 0)
+	if((int)eve < 0)
 		return 0;
-	if(write(eve, &tmp, 1) == 1)
+	if(write((int)eve, &tmp, 1) == 1)
 		return 0;
 	return 1;
 }
 /* Waits on the specified semaphore until it becomes
 	fd_set rd;
 	struct timeval tv, *useme;
 	int retval = 0;
 	char tmp;
-	if(eve < 0)
+	if((int)eve < 0)
-		return DB_EVENT_NON_INIT;
+		return DW_ERROR_NON_INIT;
 	/* Set the timout or infinite */
 	if(timeout == -1)
 		useme = NULL;
 	else
 		useme = &tv;
 	}
 	FD_ZERO(&rd);
-	FD_SET(eve, &rd);
+	FD_SET((int)eve, &rd);
 	/* Signal wait */
 	tmp = (char)2;
-	write(eve, &tmp, 1);
+	write((int)eve, &tmp, 1);
-	retval = select(eve+1, &rd, NULL, NULL, useme);
+	retval = select((int)eve+1, &rd, NULL, NULL, useme);
 	/* Signal done waiting. */
 	tmp = (char)3;
-	write(eve, &tmp, 1);
+	write((int)eve, &tmp, 1);
 	if(retval == 0)
-		return DW_EVENT_TIMEOUT;
+		return DW_ERROR_TIMEOUT;
 	else if(retval == -1)
-		return DW_EVENT_INTERRUPT;
+		return DW_ERROR_INTERRUPT;
 	/* Clear the entry from the pipe so
 	 * we don't loop endlessly. :)
 	 */
-	read(eve, &tmp, 1);
+	read((int)eve, &tmp, 1);
 	return 0;
 }
 /* Release this semaphore, if there are no more open
 * handles on this semaphore the semaphore will be destroyed.
 int dw_named_event_close(HEV eve)
 {
 	/* Finally close the domain socket,
 	 * cleanup will continue in _handle_sem.
 	 */
-	close(eve);
+	close((int)eve);
 	return 0;
 }
 /*
 * Setup thread independent color sets.
 *         name: A string pointer to a unique memory name.
 */
 HSHM dw_named_memory_new(void **dest, int size, char *name)
 {
 	char namebuf[1024];
-	HSHM handle;
+	struct _dw_unix_shm *handle = malloc(sizeof(struct _dw_unix_shm));
 	mkdir("/tmp/.dw", S_IWGRP|S_IWOTH);
 	sprintf(namebuf, "/tmp/.dw/%s", name);
 	if((handle->fd = open(namebuf, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR)) < 0)
-		return 0;
+	{
+		free(handle);
+		return NULL;
+	}
 	ftruncate(handle->fd, size);
 	/* attach the shared memory segment to our process's address space. */
 	*dest = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, handle->fd, 0);
 	if(*dest == MAP_FAILED)
 	{
 		close(handle->fd);
 		*dest = NULL;
-		return 0;
+		free(handle);
+		return NULL;
 	}
 	handle->size = size;
 	handle->sid = getsid(0);
 	handle->path = strdup(namebuf);
 *         name: A string pointer to a unique memory name.
 */
 HSHM dw_named_memory_get(void **dest, int size, char *name)
 {
 	char namebuf[1024];
-	HSHM handle;
+	struct _dw_unix_shm *handle = malloc(sizeof(struct _dw_unix_shm));
 	mkdir("/tmp/.dw", S_IWGRP|S_IWOTH);
 	sprintf(namebuf, "/tmp/.dw/%s", name);
 	if((handle->fd = open(namebuf, O_RDWR)) < 0)
-		return -1;
+	{
+		free(handle);
+		return NULL;
+	}
 	/* attach the shared memory segment to our process's address space. */
 	*dest = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, handle->fd, 0);
 	if(*dest == MAP_FAILED)
 	{
 		close(handle->fd);
 		*dest = NULL;
-		return 0;
+		free(handle);
+		return NULL;
 	}
 	handle->size = size;
 	handle->sid = -1;
 	handle->path = NULL;
 *         handle: Handle obtained from DB_named_memory_allocate.
 *         ptr: The memory address aquired with DB_named_memory_allocate.
 */
 int dw_named_memory_free(HSHM handle, void *ptr)
 {
-	int rc = munmap(ptr, handle.size);
+	struct _dw_unix_shm *h = handle;
+	int rc = munmap(ptr, h->size);
-	close(handle.fd);
-	if(handle.path)
+	close(h->fd);
+	if(h->path)
 	{
 		/* Only remove the actual file if we are the
 		 * creator of the file.
 		 */
-		if(handle.sid != -1 && handle.sid == getsid(0))
+		if(h->sid != -1 && h->sid == getsid(0))
-			remove(handle.path);
+			remove(h->path);
-		free(handle.path);
+		free(h->path);
 	}
 	return rc;
 }
 /*
 * Creates a new thread with a starting point of func.

Mercurial > dwindows

comparison gtk/dw.c @ 558:05060ce4d6ae