-/* Copyright (c) 2004-2014. The SimGrid Team.
+/* Copyright (c) 2004-2015. 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. */
+#ifndef SURF_NETWORK_INTERFACE_HPP_
+#define SURF_NETWORK_INTERFACE_HPP_
+
#include <boost/unordered_map.hpp>
#include "xbt/fifo.h"
+#include "xbt/dict.h"
#include "surf_interface.hpp"
#include "surf_routing.hpp"
#include "simgrid/link.h"
-#ifndef SURF_NETWORK_INTERFACE_HPP_
-#define SURF_NETWORK_INTERFACE_HPP_
-
/***********
* Classes *
***********/
*/
class NetworkModel : public Model {
public:
- /** @brief NetworkModel constructor */
- NetworkModel() : Model("network") {
- f_networkSolve = lmm_solve;
- };
-
- /** @brief NetworkModel constructor */
- NetworkModel(const char *name) : Model(name) {
- f_networkSolve = lmm_solve;
- };
+ /** @brief Constructor */
+ NetworkModel() : Model() { }
- /** @brief The destructor of the NetworkModel */
+ /** @brief Destructor */
~NetworkModel() {
if (p_maxminSystem)
lmm_system_free(p_maxminSystem);
e_surf_link_sharing_policy_t policy,
xbt_dict_t properties)=0;
- virtual void gapAppend(double /*size*/, const Link* /*link*/, NetworkAction */*action*/) {};
+ virtual void gapAppend(double /*size*/, const Link* /*link*/, NetworkAction * /*action*/) {};
/**
* @brief Create a communication between two hosts.
virtual Action *communicate(RoutingEdge *src, RoutingEdge *dst,
double size, double rate)=0;
- /**
- * @brief Function pointer to the function to use to solve the lmm_system_t
+ /** @brief Function pointer to the function to use to solve the lmm_system_t
*
* @param system The lmm_system_t to solve
*/
- void (*f_networkSolve)(lmm_system_t);
+ void (*f_networkSolve)(lmm_system_t) = lmm_solve;
/**
* @brief Get the right multiplicative factor for the latency.
*/
class NetworkAction : public Action {
public:
- /**
- * @brief NetworkAction constructor
+ /** @brief Constructor
*
* @param model The NetworkModel associated to this NetworkAction
* @param cost The cost of this NetworkAction in [TODO]