add unistd and reduce similar lines between it and o_direct

src/core/disk_ops/disk_unistd.c

@@ -24,256 +24,42 @@
 #include <starpu.h>
 #include <core/disk.h>
 #include <core/perfmodel/perfmodel.h>
-
-#define NITER	64
-#define SIZE_BENCH (4*getpagesize())
+#include <core/disk_ops/unistd/disk_unistd_global.h>
 
 /* ------------------- use UNISTD to write on disk -------------------  */
 
-struct starpu_unistd_obj {
-	int descriptor;
-	char * path;
-	double size;
-};
-
-
 /* allocation memory on disk */
 static void * 
-starpu_unistd_alloc (void *base, size_t size STARPU_ATTRIBUTE_UNUSED)
+starpu_unistd_alloc (void *base, size_t size)
 {
-	
-	struct starpu_unistd_obj * obj = malloc(sizeof(struct starpu_unistd_obj));
-	STARPU_ASSERT(obj != NULL);
-	int id = -1;
-
-	/* create template for mkstemp */
-	unsigned int sizeBase = 16;
-	while(sizeBase < (strlen(base)+7))
-		sizeBase *= 2;
-
-	char * baseCpy = malloc(sizeBase*sizeof(char));
-	STARPU_ASSERT(baseCpy != NULL);
-
-	char * tmp = "STARPU_XXXXXX";
-
-	strcpy(baseCpy, (char *) base);
-	strcat(baseCpy,tmp);
-
-	id = mkostemp(baseCpy, O_RDWR | O_DIRECT);
-	/* fail */
-	if (id < 0)
-	{
-		free(obj);
-		free(baseCpy);
-		return NULL;
-	}
-	
-	int val = ftruncate(id,size);
-	/* fail */
-	if (val < 0)
-	{
-		free(obj);
-		free(baseCpy);
-		unlink(baseCpy);
-		return NULL;
-	}
-
-	obj->descriptor = id;
-	obj->path = baseCpy;
-	obj->size = size;
-
-	return (void *) obj;
-}
-
-
-/* free memory on disk */
-static void
-starpu_unistd_free (void *base STARPU_ATTRIBUTE_UNUSED, void *obj, size_t size STARPU_ATTRIBUTE_UNUSED)
-{
-	struct starpu_unistd_obj * tmp = (struct starpu_unistd_obj *) obj;
-
-	unlink(tmp->path);
-	close(tmp->descriptor);
-
-	free(tmp->path);
-	free(tmp);
+        struct starpu_unistd_global_obj * obj = malloc(sizeof(struct starpu_unistd_global_obj));
+        STARPU_ASSERT(obj != NULL);
+	/* only flags change between unistd and unistd_o_direct */
+	obj->flags = O_RDWR;
+	return starpu_unistd_global_alloc (obj, base, size);
 }
 
-
 /* open an existing memory on disk */
 static void * 
 starpu_unistd_open (void *base, void *pos, size_t size)
 {
-	struct starpu_unistd_obj * obj = malloc(sizeof(struct starpu_unistd_obj));
+	struct starpu_unistd_global_obj * obj = malloc(sizeof(struct starpu_unistd_global_obj));
 	STARPU_ASSERT(obj != NULL);
+	/* only flags change between unistd and unistd_o_direct */
+	obj->flags = O_RDWR;
+	return starpu_unistd_global_open (obj, base, pos, size);	
 
-	/* create template */
-	unsigned int sizeBase = 16;
-	while(sizeBase < (strlen(base)+strlen(pos)+1))
-		sizeBase *= 2;
-	
-	char * baseCpy = malloc(sizeBase*sizeof(char));
-	STARPU_ASSERT(baseCpy != NULL);
-	strcpy(baseCpy,(char *) base);
-	strcat(baseCpy,(char *) pos);
-
-	int id = open(baseCpy, O_RDWR | O_DIRECT);
-	if (id < 0)
-	{
-		free(obj);
-		free(baseCpy);
-		return NULL;
-	}
-
-	obj->descriptor = id;
-	obj->path = baseCpy;
-	obj->size = size;
-
-	return (void *) obj;
-	
-}
-
-
-/* free memory without delete it */
-static void 
-starpu_unistd_close (void *base STARPU_ATTRIBUTE_UNUSED, void *obj, size_t size STARPU_ATTRIBUTE_UNUSED)
-{
-	struct starpu_unistd_obj * tmp = (struct starpu_unistd_obj *) obj;
-
-	close(tmp->descriptor);
-	free(tmp->path);
-	free(tmp);	
-}
-
-
-/* read the memory disk */
-static ssize_t 
-starpu_unistd_read (void *base STARPU_ATTRIBUTE_UNUSED, void *obj, void *buf, off_t offset, size_t size)
-{
-	struct starpu_unistd_obj * tmp = (struct starpu_unistd_obj *) obj;
-
-	int res = lseek(tmp->descriptor, offset, SEEK_SET); 
-	STARPU_ASSERT_MSG(res >= 0, "Starpu Disk unistd read failed");
-
-	STARPU_ASSERT_MSG((size % getpagesize()) == 0, "You can only read a multiple of page size %u Bytes (Here %u)", getpagesize(), (int) size);
-
-	STARPU_ASSERT_MSG((((uintptr_t) buf) % getpagesize()) == 0, "You have to use starpu_malloc function");
-
-printf("read \n");
-	ssize_t nb = read(tmp->descriptor, buf, size);
-	STARPU_ASSERT_MSG(res >= 0, "Starpu Disk unistd read failed");
-	
-	return nb;
-}
-
-
-/* write on the memory disk */
-static ssize_t 
-starpu_unistd_write (void *base STARPU_ATTRIBUTE_UNUSED, void *obj, const void *buf, off_t offset, size_t size)
-{
-	struct starpu_unistd_obj * tmp = (struct starpu_unistd_obj *) obj;
-
-	int res = lseek(tmp->descriptor, offset, SEEK_SET); 
-	STARPU_ASSERT_MSG(res >= 0, "Starpu Disk unistd write failed");
-
-	STARPU_ASSERT_MSG((size % getpagesize()) == 0, "You can only write a multiple of page size %u Bytes (Here %u)", getpagesize(), (int) size);
-
-	STARPU_ASSERT_MSG((((uintptr_t)buf) % getpagesize()) == 0, "You have to use starpu_malloc function");
-printf("write \n");	
-	ssize_t nb = write (tmp->descriptor, buf, size);
-	STARPU_ASSERT_MSG(res >= 0, "Starpu Disk unistd write failed");
-
-	return nb;
-}
-
-
-/* create a new copy of parameter == base */
-static void * 
-starpu_unistd_plug (void *parameter)
-{
-	char * tmp = malloc(sizeof(char)*(strlen(parameter)+1));
-	STARPU_ASSERT(tmp != NULL);
-	strcpy(tmp,(char *) parameter);
-
-	starpu_malloc_set_align(getpagesize());
-	
-	return (void *) tmp;	
-}
-
-
-/* free memory allocated for the base */
-static void
-starpu_unistd_unplug (void *base)
-{
-	free(base);
 }
 
-
-static int
-get_unistd_bandwidth_between_disk_and_main_ram(unsigned node)
-{
-
-	unsigned iter;
-	double timing_slowness, timing_latency;
-	struct timeval start;
-	struct timeval end;
-
-	srand (time (NULL)); 
-	char * buf;
-	posix_memalign((void *) &buf, getpagesize(), SIZE_BENCH*sizeof(char));
-	STARPU_ASSERT(buf != NULL);
-	
-	/* allocate memory */
-	void * mem = _starpu_disk_alloc(node, SIZE_BENCH);
-	/* fail to alloc */
-	if (mem == NULL)
-		return 0;
-
-	/* Measure upload slowness */
-	gettimeofday(&start, NULL);
-	for (iter = 0; iter < NITER; ++iter)
-	{
-		_starpu_disk_write(node, mem, buf, 0, SIZE_BENCH);
-	}
-	gettimeofday(&end, NULL);
-	timing_slowness = (double)((end.tv_sec - start.tv_sec)*1000000 + (end.tv_usec - start.tv_usec));
-
-
-	/* free memory */
-	free(buf);
-
-	
-	posix_memalign((void *) &buf, getpagesize(), getpagesize()*sizeof(char));
-	STARPU_ASSERT(buf != NULL);
-
-	/* Measure latency */
-	gettimeofday(&start, NULL);
-	for (iter = 0; iter < NITER; ++iter)
-	{
-		_starpu_disk_write(node, mem, buf, rand() % (SIZE_BENCH -1) , getpagesize());
-	}
-	gettimeofday(&end, NULL);
-	timing_latency = (double)((end.tv_sec - start.tv_sec)*1000000 + (end.tv_usec - start.tv_usec));
-
-	_starpu_disk_free(node, mem, SIZE_BENCH);
-	free(buf);
-
-	_starpu_save_bandwidth_and_latency_disk((NITER/timing_slowness)*1000000, (NITER/timing_slowness)*1000000,
-					       timing_latency/NITER, timing_latency/NITER, node);
-	return 1;
-}
-
-
-
 struct starpu_disk_ops starpu_disk_unistd_ops = {
 	.alloc = starpu_unistd_alloc,
-	.free = starpu_unistd_free,
+	.free = starpu_unistd_global_free,
 	.open = starpu_unistd_open,
-	.close = starpu_unistd_close,
-	.read = starpu_unistd_read,
-	.write = starpu_unistd_write,
-	.plug = starpu_unistd_plug,
-	.unplug = starpu_unistd_unplug,
+	.close = starpu_unistd_global_close,
+	.read = starpu_unistd_global_read,
+	.write = starpu_unistd_global_write,
+	.plug = starpu_unistd_global_plug,
+	.unplug = starpu_unistd_global_unplug,
 	.copy = NULL,
-	.bandwidth = get_unistd_bandwidth_between_disk_and_main_ram
+	.bandwidth = get_unistd_global_bandwidth_between_disk_and_main_ram
 };

src/core/disk_ops/disk_unistd_o_direct.c

@@ -0,0 +1,99 @@
+/* StarPU --- Runtime system for heterogeneous multicore architectures.
+ *
+ * Copyright (C) 2013 Corentin Salingue
+ *
+ * StarPU is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or (at
+ * your option) any later version.
+ *
+ * StarPU is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * See the GNU Lesser General Public License in COPYING.LGPL for more details.
+ */
+
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <stdint.h>
+
+#include <starpu.h>
+#include <core/disk.h>
+#include <core/perfmodel/perfmodel.h>
+#include <core/disk_ops/unistd/disk_unistd_global.h>
+
+/* ------------------- use UNISTD to write on disk -------------------  */
+
+/* allocation memory on disk */
+static void *
+starpu_unistd_o_direct_alloc (void *base, size_t size)
+{
+        struct starpu_unistd_global_obj * obj = malloc(sizeof(struct starpu_unistd_global_obj));
+        STARPU_ASSERT(obj != NULL);
+        /* only flags change between unistd and unistd_o_direct */
+        obj->flags = O_RDWR | O_DIRECT;
+        return starpu_unistd_global_alloc (obj, base, size);
+}
+
+/* open an existing memory on disk */
+static void *
+starpu_unistd_o_direct_open (void *base, void *pos, size_t size)
+{
+        struct starpu_unistd_global_obj * obj = malloc(sizeof(struct starpu_unistd_global_obj));
+        STARPU_ASSERT(obj != NULL);
+        /* only flags change between unistd and unistd_o_direct */
+        obj->flags = O_RDWR | O_DIRECT;
+        return starpu_unistd_global_open (obj, base, pos, size);
+
+}
+
+
+/* read the memory disk */
+static ssize_t 
+starpu_unistd_o_direct_read (void *base STARPU_ATTRIBUTE_UNUSED, void *obj, void *buf, off_t offset, size_t size)
+{
+	STARPU_ASSERT_MSG((size % getpagesize()) == 0, "You can only read a multiple of page size %u Bytes (Here %u)", getpagesize(), (int) size);
+
+	STARPU_ASSERT_MSG((((uintptr_t) buf) % getpagesize()) == 0, "You have to use starpu_malloc function");
+
+	return starpu_unistd_global_read (base, obj, buf, offset, size);
+}
+
+
+/* write on the memory disk */
+static ssize_t 
+starpu_unistd_o_direct_write (void *base STARPU_ATTRIBUTE_UNUSED, void *obj, const void *buf, off_t offset, size_t size)
+{
+	STARPU_ASSERT_MSG((size % getpagesize()) == 0, "You can only write a multiple of page size %u Bytes (Here %u)", getpagesize(), (int) size);
+
+	STARPU_ASSERT_MSG((((uintptr_t)buf) % getpagesize()) == 0, "You have to use starpu_malloc function");
+
+	return starpu_unistd_global_write (base, obj, buf, offset, size);
+}
+
+
+/* create a new copy of parameter == base */
+static void * 
+starpu_unistd_o_direct_plug (void *parameter)
+{
+	starpu_malloc_set_align(getpagesize());
+
+	return starpu_unistd_global_plug (parameter);
+}
+
+struct starpu_disk_ops starpu_disk_unistd_o_direct_ops = {
+	.alloc = starpu_unistd_o_direct_alloc,
+	.free = starpu_unistd_global_free,
+	.open = starpu_unistd_o_direct_open,
+	.close = starpu_unistd_global_close,
+	.read = starpu_unistd_o_direct_read,
+	.write = starpu_unistd_o_direct_write,
+	.plug = starpu_unistd_o_direct_plug,
+	.unplug = starpu_unistd_global_unplug,
+	.copy = NULL,
+	.bandwidth = get_unistd_global_bandwidth_between_disk_and_main_ram
+};

src/core/disk_ops/unistd/disk_unistd_global.c

@@ -0,0 +1,241 @@
+/* StarPU --- Runtime system for heterogeneous multicore architectures.
+ *
+ * Copyright (C) 2013 Corentin Salingue
+ *
+ * StarPU is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or (at
+ * your option) any later version.
+ *
+ * StarPU is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * See the GNU Lesser General Public License in COPYING.LGPL for more details.
+ */
+
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <stdint.h>
+
+#include <starpu.h>
+#include <core/disk.h>
+#include <core/perfmodel/perfmodel.h>
+#include <core/disk_ops/unistd/disk_unistd_global.h>
+
+#define NITER	64
+#define SIZE_BENCH (4*getpagesize())
+
+/* ------------------- use UNISTD to write on disk -------------------  */
+
+/* allocation memory on disk */
+ void * 
+starpu_unistd_global_alloc (struct starpu_unistd_global_obj * obj, void *base, size_t size STARPU_ATTRIBUTE_UNUSED)
+{
+	int id = -1;
+
+	/* create template for mkstemp */
+	unsigned int sizeBase = 16;
+	while(sizeBase < (strlen(base)+7))
+		sizeBase *= 2;
+
+	char * baseCpy = malloc(sizeBase*sizeof(char));
+	STARPU_ASSERT(baseCpy != NULL);
+
+	char * tmp = "STARPU_XXXXXX";
+
+	strcpy(baseCpy, (char *) base);
+	strcat(baseCpy,tmp);
+
+	id = mkostemp(baseCpy, obj->flags);
+	/* fail */
+	if (id < 0)
+	{
+		free(obj);
+		free(baseCpy);
+		return NULL;
+	}
+	
+	int val = ftruncate(id,size);
+	/* fail */
+	if (val < 0)
+	{
+		free(obj);
+		free(baseCpy);
+		unlink(baseCpy);
+		return NULL;
+	}
+
+	obj->descriptor = id;
+	obj->path = baseCpy;
+	obj->size = size;
+
+	return (void *) obj;
+}
+
+
+/* free memory on disk */
+ void
+starpu_unistd_global_free (void *base STARPU_ATTRIBUTE_UNUSED, void *obj, size_t size STARPU_ATTRIBUTE_UNUSED)
+{
+	struct starpu_unistd_global_obj * tmp = (struct starpu_unistd_global_obj *) obj;
+
+	unlink(tmp->path);
+	close(tmp->descriptor);
+
+	free(tmp->path);
+	free(tmp);
+}
+
+
+/* open an existing memory on disk */
+ void * 
+starpu_unistd_global_open (struct starpu_unistd_global_obj * obj, void *base, void *pos, size_t size)
+{
+	/* create template */
+	unsigned int sizeBase = 16;
+	while(sizeBase < (strlen(base)+strlen(pos)+1))
+		sizeBase *= 2;
+	
+	char * baseCpy = malloc(sizeBase*sizeof(char));
+	STARPU_ASSERT(baseCpy != NULL);
+	strcpy(baseCpy,(char *) base);
+	strcat(baseCpy,(char *) pos);
+
+	int id = open(baseCpy, obj->flags);
+	if (id < 0)
+	{
+		free(obj);
+		free(baseCpy);
+		return NULL;
+	}
+
+	obj->descriptor = id;
+	obj->path = baseCpy;
+	obj->size = size;
+
+	return (void *) obj;
+	
+}
+
+
+/* free memory without delete it */
+ void 
+starpu_unistd_global_close (void *base STARPU_ATTRIBUTE_UNUSED, void *obj, size_t size STARPU_ATTRIBUTE_UNUSED)
+{
+	struct starpu_unistd_global_obj * tmp = (struct starpu_unistd_global_obj *) obj;
+
+	close(tmp->descriptor);
+	free(tmp->path);
+	free(tmp);	
+}
+
+
+/* read the memory disk */
+ ssize_t 
+starpu_unistd_global_read (void *base STARPU_ATTRIBUTE_UNUSED, void *obj, void *buf, off_t offset, size_t size)
+{
+	struct starpu_unistd_global_obj * tmp = (struct starpu_unistd_global_obj *) obj;
+
+	int res = lseek(tmp->descriptor, offset, SEEK_SET); 
+	STARPU_ASSERT_MSG(res >= 0, "Starpu Disk unistd read failed");
+
+	ssize_t nb = read(tmp->descriptor, buf, size);
+	STARPU_ASSERT_MSG(res >= 0, "Starpu Disk unistd read failed");
+	
+	return nb;
+}
+
+
+/* write on the memory disk */
+ ssize_t 
+starpu_unistd_global_write (void *base STARPU_ATTRIBUTE_UNUSED, void *obj, const void *buf, off_t offset, size_t size)
+{
+	struct starpu_unistd_global_obj * tmp = (struct starpu_unistd_global_obj *) obj;
+
+	int res = lseek(tmp->descriptor, offset, SEEK_SET); 
+	STARPU_ASSERT_MSG(res >= 0, "Starpu Disk unistd write failed");
+
+	ssize_t nb = write (tmp->descriptor, buf, size);
+	STARPU_ASSERT_MSG(res >= 0, "Starpu Disk unistd write failed");
+
+	return nb;
+}
+
+
+/* create a new copy of parameter == base */
+ void * 
+starpu_unistd_global_plug (void *parameter)
+{
+	char * tmp = malloc(sizeof(char)*(strlen(parameter)+1));
+	STARPU_ASSERT(tmp != NULL);
+	strcpy(tmp,(char *) parameter);
+
+	return (void *) tmp;	
+}
+
+
+/* free memory allocated for the base */
+ void
+starpu_unistd_global_unplug (void *base)
+{
+	free(base);
+}
+
+
+ int
+get_unistd_global_bandwidth_between_disk_and_main_ram(unsigned node)
+{
+
+	unsigned iter;
+	double timing_slowness, timing_latency;
+	struct timeval start;
+	struct timeval end;
+
+	srand (time (NULL)); 
+	char * buf;
+	starpu_malloc((void *) &buf, SIZE_BENCH*sizeof(char));
+	STARPU_ASSERT(buf != NULL);
+	
+	/* allocate memory */
+	void * mem = _starpu_disk_alloc(node, SIZE_BENCH);
+	/* fail to alloc */
+	if (mem == NULL)
+		return 0;
+
+	/* Measure upload slowness */
+	gettimeofday(&start, NULL);
+	for (iter = 0; iter < NITER; ++iter)
+	{
+		_starpu_disk_write(node, mem, buf, 0, SIZE_BENCH);
+	}
+	gettimeofday(&end, NULL);
+	timing_slowness = (double)((end.tv_sec - start.tv_sec)*1000000 + (end.tv_usec - start.tv_usec));
+
+
+	/* free memory */
+	starpu_free(buf);
+
+	
+	starpu_malloc((void *) &buf, getpagesize()*sizeof(char));
+	STARPU_ASSERT(buf != NULL);
+
+	/* Measure latency */
+	gettimeofday(&start, NULL);
+	for (iter = 0; iter < NITER; ++iter)
+	{
+		_starpu_disk_write(node, mem, buf, rand() % (SIZE_BENCH -1) , getpagesize());
+	}
+	gettimeofday(&end, NULL);
+	timing_latency = (double)((end.tv_sec - start.tv_sec)*1000000 + (end.tv_usec - start.tv_usec));
+
+	_starpu_disk_free(node, mem, SIZE_BENCH);
+	starpu_free(buf);
+
+	_starpu_save_bandwidth_and_latency_disk((NITER/timing_slowness)*1000000, (NITER/timing_slowness)*1000000,
+					       timing_latency/NITER, timing_latency/NITER, node);
+	return 1;
+}

src/core/disk_ops/unistd/disk_unistd_global.h

@@ -0,0 +1,37 @@
+/* StarPU --- Runtime system for heterogeneous multicore architectures.
+ *
+ * Copyright (C) 2013 Corentin Salingue
+ *
+ * StarPU is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or (at
+ * your option) any later version.
+ *
+ * StarPU is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * See the GNU Lesser General Public License in COPYING.LGPL for more details.
+ */
+
+#ifndef __DISK_UNISTD_GLOBAL_H__
+#define __DISK_UNISTD_GLOBAL_H__
+
+struct starpu_unistd_global_obj {
+        int descriptor;
+        char * path;
+        double size;
+	int flags;
+};
+
+ void * starpu_unistd_global_alloc (struct starpu_unistd_global_obj * obj, void *base, size_t size STARPU_ATTRIBUTE_UNUSED);
+ void starpu_unistd_global_free (void *base STARPU_ATTRIBUTE_UNUSED, void *obj, size_t size STARPU_ATTRIBUTE_UNUSED);
+ void * starpu_unistd_global_open (struct starpu_unistd_global_obj * obj, void *base, void *pos, size_t size);
+ void starpu_unistd_global_close (void *base STARPU_ATTRIBUTE_UNUSED, void *obj, size_t size STARPU_ATTRIBUTE_UNUSED);
+ ssize_t starpu_unistd_global_read (void *base STARPU_ATTRIBUTE_UNUSED, void *obj, void *buf, off_t offset, size_t size);
+ ssize_t starpu_unistd_global_write (void *base STARPU_ATTRIBUTE_UNUSED, void *obj, const void *buf, off_t offset, size_t size);
+ void * starpu_unistd_global_plug (void *parameter);
+ void starpu_unistd_global_unplug (void *base);
+ int get_unistd_global_bandwidth_between_disk_and_main_ram(unsigned node);
+
+#endif