A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new callback: s4u::onTimeAdvance
[simgrid.git]
/
src
/
surf
/
HostImpl.hpp
diff --git
a/src/surf/HostImpl.hpp
b/src/surf/HostImpl.hpp
index
21908ea
..
1bc9ff9
100644
(file)
--- a/
src/surf/HostImpl.hpp
+++ b/
src/surf/HostImpl.hpp
@@
-1,5
+1,4
@@
-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2004-2016. 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. */
/* 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. */
@@
-25,8
+24,6
@@
namespace surf {
class XBT_PRIVATE HostModel;
class XBT_PRIVATE HostImpl;
class XBT_PRIVATE HostAction;
class XBT_PRIVATE HostModel;
class XBT_PRIVATE HostImpl;
class XBT_PRIVATE HostAction;
-
-
}
}
}
}
@@
-52,8
+49,8
@@
public:
HostModel() : Model() {}
virtual void adjustWeightOfDummyCpuActions();
HostModel() : Model() {}
virtual void adjustWeightOfDummyCpuActions();
- virtual Action
*executeParallelTask(int host_nb, sg_host_t *host_lis
t,
-
double *flops_amount, double *bytes_amount,
double rate);
+ virtual Action
* executeParallelTask(int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amoun
t,
+
double rate);
};
/************
};
/************
@@
-66,20
+63,12
@@
public:
class HostImpl : public simgrid::surf::PropertyHolder {
public:
class HostImpl : public simgrid::surf::PropertyHolder {
public:
- /**
- * @brief Host constructor
- *
- * @param storage The Storage associated to this Host
- */
- HostImpl(s4u::Host* host, xbt_dynar_t storage);
-
- /* Host destruction logic */
- /**************************/
+ explicit HostImpl(s4u::Host* host);
virtual ~HostImpl();
public:
/** @brief Return the storage of corresponding mount point */
virtual ~HostImpl();
public:
/** @brief Return the storage of corresponding mount point */
- virtual simgrid::surf::Storage
*
findStorageOnMountList(const char* storage);
+ virtual simgrid::surf::Storage
*
findStorageOnMountList(const char* storage);
/** @brief Get the xbt_dict_t of mount_point: Storage */
virtual xbt_dict_t getMountedStorageList();
/** @brief Get the xbt_dict_t of mount_point: Storage */
virtual xbt_dict_t getMountedStorageList();
@@
-93,7
+82,7
@@
public:
* @param fullpath The full path to the file
* @return The StorageAction corresponding to the opening
*/
* @param fullpath The full path to the file
* @return The StorageAction corresponding to the opening
*/
- virtual Action
*
open(const char* fullpath);
+ virtual Action
*
open(const char* fullpath);
/**
* @brief Close a file
/**
* @brief Close a file
@@
-101,7
+90,7
@@
public:
* @param fd The file descriptor to close
* @return The StorageAction corresponding to the closing
*/
* @param fd The file descriptor to close
* @return The StorageAction corresponding to the closing
*/
- virtual Action
*
close(surf_file_t fd);
+ virtual Action
*
close(surf_file_t fd);
/**
* @brief Unlink a file
/**
* @brief Unlink a file
@@
-127,7
+116,7
@@
public:
* @param size The size in bytes to read
* @return The StorageAction corresponding to the reading
*/
* @param size The size in bytes to read
* @return The StorageAction corresponding to the reading
*/
- virtual Action
*
read(surf_file_t fd, sg_size_t size);
+ virtual Action
*
read(surf_file_t fd, sg_size_t size);
/**
* @brief Write a file
/**
* @brief Write a file
@@
-136,7
+125,7
@@
public:
* @param size The size in bytes to write
* @return The StorageAction corresponding to the writing
*/
* @param size The size in bytes to write
* @return The StorageAction corresponding to the writing
*/
- virtual Action
*
write(surf_file_t fd, sg_size_t size);
+ virtual Action
*
write(surf_file_t fd, sg_size_t size);
/**
* @brief Get the information of a file descriptor
/**
* @brief Get the information of a file descriptor
@@
-189,12
+178,8
@@
public:
xbt_dynar_t storage_ = nullptr;
simgrid::s4u::Host* piface_ = nullptr;
xbt_dynar_t storage_ = nullptr;
simgrid::s4u::Host* piface_ = nullptr;
- /** @brief Get the list of virtual machines on the current Host */
- xbt_dynar_t getVms();
-
simgrid::s4u::Host* getHost() { return piface_; }
};
simgrid::s4u::Host* getHost() { return piface_; }
};
-
}
}
}
}