Reorder fields

include/starpu_disk.h

@@ -22,24 +22,31 @@
 
 /* list of functions to use on disk */
 struct starpu_disk_ops {
- 	 void *  (*alloc)  (void *base, size_t size);
+	 void *  (*plug)   (void *parameter);
+	 void    (*unplug) (void *base);
+
+	 int    (*bandwidth)    (unsigned node);
+
+	 void *  (*alloc)  (void *base, size_t size);
 	 void    (*free)   (void *base, void *obj, size_t size);
+
 	 void *  (*open)   (void *base, void *pos, size_t size);     /* open an existing file */
 	 void    (*close)  (void *base, void *obj, size_t size);
+
 	 int     (*read)   (void *base, void *obj, void *buf, off_t offset, size_t size);
 	 int     (*write)  (void *base, void *obj, const void *buf, off_t offset, size_t size);
+
+	 int	(*full_read)    (unsigned node, void * base, void * obj, void ** ptr, size_t * size);
+	 int 	(*full_write)   (unsigned node, void * base, void * obj, void * ptr, size_t size);
+
 	 void *  (*async_write)  (void *base, void *obj, void *buf, off_t offset, size_t size); 
 	 void *  (*async_read)   (void *base, void *obj, void *buf, off_t offset, size_t size); 
-	/* readv, writev, read2d, write2d, etc. */
-	 void *  (*plug)   (void *parameter);
-	 void    (*unplug) (void *base);
 	 void *  (*copy)   (void *base_src, void* obj_src, off_t offset_src,  void *base_dst, void* obj_dst, off_t offset_dst, size_t size);
-	 int    (*bandwidth)    (unsigned node);
 	 void   (*wait_request) (void * async_channel);
 	 int    (*test_request) (void * async_channel);
 	 void   (*free_request)(void * async_channel);
-	 int	(*full_read)    (unsigned node, void * base, void * obj, void ** ptr, size_t * size);
-	 int 	(*full_write)   (unsigned node, void * base, void * obj, void * ptr, size_t size);
+
+	/* TODO: readv, writev, read2d, write2d, etc. */
 };
 
 /* Posix functions to use disk memory */

src/core/disk_ops/disk_leveldb.cpp

@@ -316,42 +316,42 @@ get_leveldb_bandwidth_between_disk_and_main_ram(unsigned node)
 
 #if __cplusplus >= 201103L
 struct starpu_disk_ops starpu_disk_leveldb_ops = {
+	.plug = starpu_leveldb_plug,
+	.unplug = starpu_leveldb_unplug,
+	.bandwidth = get_leveldb_bandwidth_between_disk_and_main_ram,
 	.alloc = starpu_leveldb_alloc,
 	.free = starpu_leveldb_free,
 	.open = starpu_leveldb_open,
 	.close = starpu_leveldb_close,
 	.read = starpu_leveldb_read,
 	.write = starpu_leveldb_write,
+	.full_read = starpu_leveldb_full_read,
+	.full_write = starpu_leveldb_full_write
 	.async_write = NULL,
 	.async_read = NULL,
-	.plug = starpu_leveldb_plug,
-	.unplug = starpu_leveldb_unplug,
 	.copy = NULL,
-	.bandwidth = get_leveldb_bandwidth_between_disk_and_main_ram,
 	.wait_request = NULL,
 	.test_request = NULL,
 	.free_request = NULL,
-	.full_read = starpu_leveldb_full_read,
-	.full_write = starpu_leveldb_full_write
 };
 #else
 struct starpu_disk_ops starpu_disk_leveldb_ops = {
+	starpu_leveldb_plug,
+	starpu_leveldb_unplug,
+	get_leveldb_bandwidth_between_disk_and_main_ram,
 	starpu_leveldb_alloc,
 	starpu_leveldb_free,
 	starpu_leveldb_open,
 	starpu_leveldb_close,
 	starpu_leveldb_read,
 	starpu_leveldb_write,
+	starpu_leveldb_full_read,
+	starpu_leveldb_full_write
 	NULL,
 	NULL,
-	starpu_leveldb_plug,
-	starpu_leveldb_unplug,
 	NULL,
-	get_leveldb_bandwidth_between_disk_and_main_ram,
 	NULL,
 	NULL,
 	NULL,
-	starpu_leveldb_full_read,
-	starpu_leveldb_full_write
 };
 #endif