X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/984ea3223c5e84f4fd94cbfa594162e4ee87eac9..ded5bf36fae30e458d8f8e225832ec7d8d88ee34:/include/msg/datatypes.h diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h index 241d649ecf..efee4e6efd 100644 --- a/include/msg/datatypes.h +++ b/include/msg/datatypes.h @@ -1,4 +1,5 @@ -/* Copyright (c) 2004-2012. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2013. The SimGrid Team. + * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -102,13 +103,13 @@ typedef struct msg_vm { /* ******************************** File ************************************ */ typedef struct simdata_file *simdata_file_t; -typedef struct s_file_info { - size_t size; +typedef struct s_msg_file_info { + sg_storage_size_t size; char* mount_point; char* storageId; char* storage_type; char* content_type; -} s_file_info_t, *msg_file_info_t; +} s_msg_file_info_t, *msg_file_info_t; typedef struct msg_file { char *fullname; /**< @brief file full name (path+name)*/ @@ -117,9 +118,9 @@ typedef struct msg_file { } s_msg_file_t; /** @brief File datatype. - @ingroup msg_file_management - - You should consider this as an opaque object. + * @ingroup msg_file_management + * + * You should consider this as an opaque object. */ typedef struct msg_file *msg_file_t; @@ -129,23 +130,19 @@ typedef struct msg_file *msg_file_t; extern int MSG_STORAGE_LEVEL; +/** @brief Storage datatype. + * @ingroup msg_storage_management + * + * You should consider this as an opaque object. + */ typedef xbt_dictelm_t msg_storage_t; typedef s_xbt_dictelm_t s_msg_storage_t; -typedef struct msg_storage_priv { -/* TODO PV: fill it (or not) ! */ +typedef struct msg_storage_priv { + // TODO PV: fill it (or not) ! + void * dummy; } s_msg_storage_priv_t, *msg_storage_priv_t; -//typedef struct simdata_storage *simdata_storage_t; -// -//typedef struct msg_storage { -// char *name; -// simdata_storage_t simdata; /**< @brief simulator data */ -// void *data; /**< @brief user data */ -//} s_msg_storage_t; -// -//typedef struct msg_storage *msg_storage_t; - /*************** Begin GPU ***************/ typedef struct simdata_gpu_task *simdata_gpu_task_t;