浏览代码

change disk_ops to starpu_disk_ops

Corentin Salingue 12 年之前
父节点
当前提交
41c50b31bc
共有 3 个文件被更改,包括 8 次插入8 次删除
  1. 3 3
      include/starpu_disk.h
  2. 4 4
      src/core/disk.c
  3. 1 1
      src/core/disk_ops/disk_stdio.c

+ 3 - 3
include/starpu_disk.h

@@ -19,7 +19,7 @@
 #define __STARPU_DISK_H__
 
 /* list of functions to use on disk */
-struct disk_ops {
+struct starpu_disk_ops {
  	 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 */
@@ -35,11 +35,11 @@ struct disk_ops {
 
 
 /* Posix functions to use disk memory */
-extern struct disk_ops starpu_disk_stdio_ops;
+extern struct starpu_disk_ops starpu_disk_stdio_ops;
 
 
 /* interface to create and to free a memory disk */
-int starpu_disk_register(struct disk_ops * func, void *parameter, size_t size);
+int starpu_disk_register(struct starpu_disk_ops * func, void *parameter, size_t size);
 
 void starpu_disk_unregister(unsigned node);
 

+ 4 - 4
src/core/disk.c

@@ -38,10 +38,10 @@
 struct disk_register {
 	unsigned node;
 	void * base;
-	struct disk_ops * functions;
+	struct starpu_disk_ops * functions;
 };
 
-static void add_disk_in_list(unsigned node, struct disk_ops * func, void * base);
+static void add_disk_in_list(unsigned node, struct starpu_disk_ops * func, void * base);
 static int get_location_with_node(unsigned node);
 
 static struct disk_register ** disk_register_list = NULL;
@@ -50,7 +50,7 @@ static int size_register_list = 2;
 
 
 int
-starpu_disk_register(struct disk_ops * func, void *parameter, size_t size)
+starpu_disk_register(struct starpu_disk_ops * func, void *parameter, size_t size)
 {
 
 	STARPU_ASSERT_MSG(size >= SIZE_DISK_MIN,"Minimum disk size is %u Bytes ! (Here %u) \n", (int) SIZE_DISK_MIN, (int) size);
@@ -165,7 +165,7 @@ _starpu_disk_close(unsigned node, void *obj, size_t size)
 
 
 static void 
-add_disk_in_list(unsigned node,  struct disk_ops * func, void * base)
+add_disk_in_list(unsigned node,  struct starpu_disk_ops * func, void * base)
 {
 	/* initialization */
 	if(disk_register_list == NULL)

+ 1 - 1
src/core/disk_ops/disk_stdio.c

@@ -283,7 +283,7 @@ get_stdio_bandwidth_between_disk_and_main_ram(unsigned node)
 
 
 
-struct disk_ops starpu_disk_stdio_ops = {
+struct starpu_disk_ops starpu_disk_stdio_ops = {
 	.alloc = starpu_stdio_alloc,
 	.free = starpu_stdio_free,
 	.open = starpu_stdio_open,