From 7c047878cb2905079a6a0544f1a15134ae3ab3a6 Mon Sep 17 00:00:00 2001 From: Christian Heinrich Date: Wed, 8 Jun 2016 23:20:59 +0200 Subject: [PATCH] [SURF] NULL -> nullptr substitution I used the following command: (the '**' means recursion in ZSH) sed -i -e 's/\([^_]\s*\)NULL/\1nullptr/g' src/**/*.cpp We check for the underscore to avoid replacing MPI_*_NULL --- src/surf/AsCluster.cpp | 2 +- src/surf/AsClusterTorus.cpp | 2 +- src/surf/AsDijkstra.cpp | 46 +++++++-------- src/surf/AsFloyd.cpp | 22 ++++---- src/surf/AsFull.cpp | 6 +- src/surf/AsImpl.cpp | 18 +++--- src/surf/AsRoutedGraph.cpp | 22 ++++---- src/surf/HostImpl.cpp | 30 +++++----- src/surf/PropertyHolder.cpp | 6 +- src/surf/cpu_cas01.cpp | 14 ++--- src/surf/cpu_interface.cpp | 10 ++-- src/surf/cpu_ti.cpp | 6 +- src/surf/fair_bottleneck.cpp | 12 ++-- src/surf/instr_routing.cpp | 88 ++++++++++++++--------------- src/surf/lagrange.cpp | 26 ++++----- src/surf/maxmin.cpp | 88 ++++++++++++++--------------- src/surf/network_cm02.cpp | 22 ++++---- src/surf/network_constant.cpp | 8 +-- src/surf/network_ib.cpp | 14 ++--- src/surf/network_interface.cpp | 12 ++-- src/surf/network_ns3.cpp | 14 ++--- src/surf/network_smpi.cpp | 16 +++--- src/surf/plugins/energy.cpp | 10 ++-- src/surf/ptask_L07.cpp | 34 +++++------ src/surf/sg_platf.cpp | 56 +++++++++--------- src/surf/storage_interface.cpp | 26 ++++----- src/surf/storage_n11.cpp | 14 ++--- src/surf/surf_c_bindings.cpp | 18 +++--- src/surf/surf_interface.cpp | 66 +++++++++++----------- src/surf/surf_routing.cpp | 16 +++--- src/surf/trace_mgr.cpp | 16 +++--- src/surf/virtual_machine.cpp | 4 +- src/surf/vm_hl13.cpp | 2 +- src/surf/xml/surfxml_parseplatf.cpp | 34 +++++------ src/surf/xml/surfxml_sax_cb.cpp | 16 +++--- 35 files changed, 398 insertions(+), 398 deletions(-) diff --git a/src/surf/AsCluster.cpp b/src/surf/AsCluster.cpp index 53b888220e..cd81e1ec33 100644 --- a/src/surf/AsCluster.cpp +++ b/src/surf/AsCluster.cpp @@ -79,7 +79,7 @@ void AsCluster::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) int table_size = xbt_dynar_length(vertices_); NetCard *src; - xbt_node_t current, previous, backboneNode = NULL, routerNode; + xbt_node_t current, previous, backboneNode = nullptr, routerNode; s_surf_parsing_link_up_down_t info; xbt_assert(router_,"Malformed cluster. This may be because your platform file is a hypergraph while it must be a graph."); diff --git a/src/surf/AsClusterTorus.cpp b/src/surf/AsClusterTorus.cpp index d53146eae3..946b349c6f 100644 --- a/src/surf/AsClusterTorus.cpp +++ b/src/surf/AsClusterTorus.cpp @@ -91,7 +91,7 @@ namespace simgrid { xbt_dynar_t dimensions = xbt_str_split(cluster->topo_parameters, ","); if (!xbt_dynar_is_empty(dimensions)) { - dimensions_ = xbt_dynar_new(sizeof(int), NULL); + dimensions_ = xbt_dynar_new(sizeof(int), nullptr); /* We are in a torus cluster * Parse attribute dimensions="dim1,dim2,dim3,...,dimN" * and safe it in a dynarray. diff --git a/src/surf/AsDijkstra.cpp b/src/surf/AsDijkstra.cpp index ec9af59303..2b701fae96 100644 --- a/src/surf/AsDijkstra.cpp +++ b/src/surf/AsDijkstra.cpp @@ -40,19 +40,19 @@ namespace simgrid { namespace surf { void AsDijkstra::seal() { - xbt_node_t node = NULL; + xbt_node_t node = nullptr; unsigned int cursor2, cursor; /* Create the topology graph */ if(!routeGraph_) - routeGraph_ = xbt_graph_new_graph(1, NULL); + routeGraph_ = xbt_graph_new_graph(1, nullptr); if(!graphNodeMap_) graphNodeMap_ = xbt_dict_new_homogeneous(&graph_node_map_elem_free); /* Add the loopback if needed */ if (routing_platf->loopback_ && hierarchy_ == RoutingMode::base) { xbt_dynar_foreach(xbt_graph_get_nodes(routeGraph_), cursor, node) { - xbt_edge_t edge = NULL; + xbt_edge_t edge = nullptr; bool found = false; xbt_dynar_foreach(xbt_graph_node_get_outedges(node), cursor2, edge) { @@ -82,9 +82,9 @@ void AsDijkstra::seal() xbt_node_t AsDijkstra::routeGraphNewNode(int id, int graph_id) { - xbt_node_t node = NULL; - graph_node_data_t data = NULL; - graph_node_map_element_t elm = NULL; + xbt_node_t node = nullptr; + graph_node_data_t data = nullptr; + graph_node_map_element_t elm = nullptr; data = xbt_new0(struct graph_node_data, 1); data->id = id; @@ -93,7 +93,7 @@ xbt_node_t AsDijkstra::routeGraphNewNode(int id, int graph_id) elm = xbt_new0(struct graph_node_map_element, 1); elm->node = node; - xbt_dict_set_ext(graphNodeMap_, (char *) (&id), sizeof(int), (xbt_dictelm_t) elm, NULL); + xbt_dict_set_ext(graphNodeMap_, (char *) (&id), sizeof(int), (xbt_dictelm_t) elm, nullptr); return node; } @@ -108,8 +108,8 @@ graph_node_map_element_t AsDijkstra::nodeMapSearch(int id) void AsDijkstra::newRoute(int src_id, int dst_id, sg_platf_route_cbarg_t e_route) { XBT_DEBUG("Load Route from \"%d\" to \"%d\"", src_id, dst_id); - xbt_node_t src = NULL; - xbt_node_t dst = NULL; + xbt_node_t src = nullptr; + xbt_node_t dst = nullptr; graph_node_map_element_t src_elm = nodeMapSearch(src_id); graph_node_map_element_t dst_elm = nodeMapSearch(dst_id); @@ -121,14 +121,14 @@ void AsDijkstra::newRoute(int src_id, int dst_id, sg_platf_route_cbarg_t e_route dst = dst_elm->node; /* add nodes if they don't exist in the graph */ - if (src_id == dst_id && src == NULL && dst == NULL) { + if (src_id == dst_id && src == nullptr && dst == nullptr) { src = this->routeGraphNewNode(src_id, -1); dst = src; } else { - if (src == NULL) { + if (src == nullptr) { src = this->routeGraphNewNode(src_id, -1); } - if (dst == NULL) { + if (dst == nullptr) { dst = this->routeGraphNewNode(dst_id, -1); } } @@ -143,7 +143,7 @@ void AsDijkstra::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_c int src_id = src->id(); int dst_id = dst->id(); - int *pred_arr = NULL; + int *pred_arr = nullptr; sg_platf_route_cbarg_t e_route; int size = 0; xbt_dynar_t nodes = xbt_graph_get_nodes(routeGraph_); @@ -162,7 +162,7 @@ void AsDijkstra::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_c xbt_node_t node_e_v = xbt_dynar_get_as(nodes, dst_node_id, xbt_node_t); xbt_edge_t edge = xbt_graph_get_edge(routeGraph_, node_s_v, node_e_v); - if (edge == NULL) + if (edge == nullptr) THROWF(arg_error, 0, "No route from '%s' to '%s'", src->name(), dst->name()); e_route = (sg_platf_route_cbarg_t) xbt_graph_edge_get_data(edge); @@ -175,7 +175,7 @@ void AsDijkstra::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_c } - route_cache_element_t elm = NULL; + route_cache_element_t elm = nullptr; if (routeCache_) { /* cache mode */ elm = (route_cache_element_t) xbt_dict_get_or_null_ext(routeCache_, (char *) (&src_id), sizeof(int)); } @@ -210,7 +210,7 @@ void AsDijkstra::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_c while (xbt_heap_size(pqueue) > 0) { int *v_id = (int *) xbt_heap_pop(pqueue); xbt_node_t v_node = xbt_dynar_get_as(nodes, *v_id, xbt_node_t); - xbt_edge_t edge = NULL; + xbt_edge_t edge = nullptr; unsigned int cursor; xbt_dynar_foreach(xbt_graph_node_get_outedges(v_node), cursor, edge) { @@ -238,15 +238,15 @@ void AsDijkstra::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_c } /* compose route path with links */ - NetCard *gw_src = NULL, *gw_dst, *prev_gw_src, *first_gw = NULL; - NetCard *gw_dst_net_elm = NULL, *prev_gw_src_net_elm = NULL; + NetCard *gw_src = nullptr, *gw_dst, *prev_gw_src, *first_gw = nullptr; + NetCard *gw_dst_net_elm = nullptr, *prev_gw_src_net_elm = nullptr; for (int v = dst_node_id; v != src_node_id; v = pred_arr[v]) { xbt_node_t node_pred_v = xbt_dynar_get_as(nodes, pred_arr[v], xbt_node_t); xbt_node_t node_v = xbt_dynar_get_as(nodes, v, xbt_node_t); xbt_edge_t edge = xbt_graph_get_edge(routeGraph_, node_pred_v, node_v); - if (edge == NULL) + if (edge == nullptr) THROWF(arg_error, 0, "No route from '%s' to '%s'", src->name(), dst->name()); prev_gw_src = gw_src; @@ -261,7 +261,7 @@ void AsDijkstra::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_c if (hierarchy_ == RoutingMode::recursive && v != dst_node_id && strcmp(gw_dst->name(), prev_gw_src->name())) { std::vector *e_route_as_to_as = new std::vector(); - routing_platf->getRouteAndLatency(gw_dst_net_elm, prev_gw_src_net_elm, e_route_as_to_as, NULL); + routing_platf->getRouteAndLatency(gw_dst_net_elm, prev_gw_src_net_elm, e_route_as_to_as, nullptr); auto pos = route->link_list->begin(); for (auto link : *e_route_as_to_as) { route->link_list->insert(pos, link); @@ -284,12 +284,12 @@ void AsDijkstra::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_c route->gw_dst = first_gw; } - if (routeCache_ && elm == NULL) { + if (routeCache_ && elm == nullptr) { /* add to predecessor list of the current src-host to cache */ elm = xbt_new0(struct route_cache_element, 1); elm->pred_arr = pred_arr; elm->size = size; - xbt_dict_set_ext(routeCache_, (char *) (&src_id), sizeof(int), (xbt_dictelm_t) elm, NULL); + xbt_dict_set_ext(routeCache_, (char *) (&src_id), sizeof(int), (xbt_dictelm_t) elm, nullptr); } if (!routeCache_) @@ -323,7 +323,7 @@ void AsDijkstra::addRoute(sg_platf_route_cbarg_t route) /* Create the topology graph */ if(!routeGraph_) - routeGraph_ = xbt_graph_new_graph(1, NULL); + routeGraph_ = xbt_graph_new_graph(1, nullptr); if(!graphNodeMap_) graphNodeMap_ = xbt_dict_new_homogeneous(&graph_node_map_elem_free); diff --git a/src/surf/AsFloyd.cpp b/src/surf/AsFloyd.cpp index 960b039f34..887d5a579e 100644 --- a/src/surf/AsFloyd.cpp +++ b/src/surf/AsFloyd.cpp @@ -20,15 +20,15 @@ namespace surf { AsFloyd::AsFloyd(const char*name) : AsRoutedGraph(name) { - predecessorTable_ = NULL; - costTable_ = NULL; - linkTable_ = NULL; + predecessorTable_ = nullptr; + costTable_ = nullptr; + linkTable_ = nullptr; } AsFloyd::~AsFloyd(){ int i, j; int table_size = (int)xbt_dynar_length(vertices_); - if (linkTable_ == NULL) // Dealing with a parse error in the file? + if (linkTable_ == nullptr) // Dealing with a parse error in the file? return; /* Delete link_table */ for (i = 0; i < table_size; i++) @@ -47,7 +47,7 @@ void AsFloyd::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbar getRouteCheckParams(src, dst); /* create a result route */ - xbt_dynar_t route_stack = xbt_dynar_new(sizeof(sg_platf_route_cbarg_t), NULL); + xbt_dynar_t route_stack = xbt_dynar_new(sizeof(sg_platf_route_cbarg_t), nullptr); int pred; int cur = dst->id(); do { @@ -63,11 +63,11 @@ void AsFloyd::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbar route->gw_dst = xbt_dynar_getfirst_as(route_stack, sg_platf_route_cbarg_t)->gw_dst; } - sg_netcard_t prev_dst_gw = NULL; + sg_netcard_t prev_dst_gw = nullptr; while (!xbt_dynar_is_empty(route_stack)) { sg_platf_route_cbarg_t e_route = xbt_dynar_pop_as(route_stack, sg_platf_route_cbarg_t); - if (hierarchy_ == RoutingMode::recursive && prev_dst_gw != NULL && strcmp(prev_dst_gw->name(), e_route->gw_src->name())) { + if (hierarchy_ == RoutingMode::recursive && prev_dst_gw != nullptr && strcmp(prev_dst_gw->name(), e_route->gw_src->name())) { routing_platf->getRouteAndLatency(prev_dst_gw, e_route->gw_src, route->link_list, lat); } @@ -103,7 +103,7 @@ void AsFloyd::addRoute(sg_platf_route_cbarg_t route) for (int j = 0; j < table_size; j++) { TO_FLOYD_COST(i, j) = DBL_MAX; TO_FLOYD_PRED(i, j) = -1; - TO_FLOYD_LINK(i, j) = NULL; + TO_FLOYD_LINK(i, j) = nullptr; } } @@ -165,7 +165,7 @@ void AsFloyd::seal(){ for (unsigned int j = 0; j < table_size; j++) { TO_FLOYD_COST(i, j) = DBL_MAX; TO_FLOYD_PRED(i, j) = -1; - TO_FLOYD_LINK(i, j) = NULL; + TO_FLOYD_LINK(i, j) = nullptr; } } @@ -175,8 +175,8 @@ void AsFloyd::seal(){ sg_platf_route_cbarg_t e_route = TO_FLOYD_LINK(i, i); if (!e_route) { e_route = xbt_new0(s_sg_platf_route_cbarg_t, 1); - e_route->gw_src = NULL; - e_route->gw_dst = NULL; + e_route->gw_src = nullptr; + e_route->gw_dst = nullptr; e_route->link_list = new std::vector(); e_route->link_list->push_back(routing_platf->loopback_); TO_FLOYD_LINK(i, i) = e_route; diff --git a/src/surf/AsFull.cpp b/src/surf/AsFull.cpp index 37d3ff7709..2678d36b63 100644 --- a/src/surf/AsFull.cpp +++ b/src/surf/AsFull.cpp @@ -34,8 +34,8 @@ void AsFull::seal() { e_route = TO_ROUTE_FULL(i, i); if (!e_route) { e_route = xbt_new0(s_sg_platf_route_cbarg_t, 1); - e_route->gw_src = NULL; - e_route->gw_dst = NULL; + e_route->gw_src = nullptr; + e_route->gw_dst = nullptr; e_route->link_list = new std::vector(); e_route->link_list->push_back(routing_platf->loopback_); TO_ROUTE_FULL(i, i) = e_route; @@ -68,7 +68,7 @@ void AsFull::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg /* set utils vars */ size_t table_size = xbt_dynar_length(vertices_); - sg_platf_route_cbarg_t e_route = NULL; + sg_platf_route_cbarg_t e_route = nullptr; e_route = TO_ROUTE_FULL(src->id(), dst->id()); diff --git a/src/surf/AsImpl.cpp b/src/surf/AsImpl.cpp index 23b78aa009..780056b074 100644 --- a/src/surf/AsImpl.cpp +++ b/src/surf/AsImpl.cpp @@ -22,7 +22,7 @@ namespace simgrid { } xbt_dynar_t AsImpl::getOneLinkRoutes() { - return NULL; + return nullptr; } /** @brief Get the common ancestor and its first childs in each line leading to src and dst */ @@ -46,17 +46,17 @@ namespace simgrid { xbt_assert(dst_as, "Host %s must be in an AS", dst->name()); /* (2) find the path to the root routing component */ - for (AsImpl *current = src_as; current != NULL; current = static_cast(current->father())) { + for (AsImpl *current = src_as; current != nullptr; current = static_cast(current->father())) { xbt_assert(index_src < ROUTING_HIERARCHY_MAXDEPTH, "ROUTING_HIERARCHY_MAXDEPTH should be increased for element %s", src->name()); path_src[index_src++] = current; } - for (AsImpl *current = dst_as; current != NULL; current = static_cast(current->father())) { + for (AsImpl *current = dst_as; current != nullptr; current = static_cast(current->father())) { xbt_assert(index_dst < ROUTING_HIERARCHY_MAXDEPTH,"ROUTING_HIERARCHY_MAXDEPTH should be increased for path_dst"); path_dst[index_dst++] = current; } /* (3) find the common father. - * Before that, index_src and index_dst may be different, they both point to NULL in path_src/path_dst + * Before that, index_src and index_dst may be different, they both point to nullptr in path_src/path_dst * So we move them down simultaneously as long as they point to the same content. */ do { @@ -81,7 +81,7 @@ namespace simgrid { /* PRECONDITION: this is the common ancestor of src and dst */ std::vector *AsImpl::getBypassRoute(surf::NetCard *src, surf::NetCard *dst) { - // If never set a bypass route return NULL without any further computations + // If never set a bypass route return nullptr without any further computations XBT_DEBUG("generic_get_bypassroute from %s to %s", src->name(), dst->name()); if (bypassRoutes_.empty()) return nullptr; @@ -99,14 +99,14 @@ namespace simgrid { /* (2) find the path to the root routing component */ std::vector path_src; As *current = src->containingAS(); - while (current != NULL) { + while (current != nullptr) { path_src.push_back(current); current = current->father_; } std::vector path_dst; current = dst->containingAS(); - while (current != NULL) { + while (current != nullptr) { path_dst.push_back(current); current = current->father_; } @@ -162,7 +162,7 @@ namespace simgrid { * \param src the source host * \param dst the destination host * \param links Where to store the links and the gw information - * \param latency If not NULL, the latency of all links will be added in it + * \param latency If not nullptr, the latency of all links will be added in it */ void AsImpl::getRouteRecursive(surf::NetCard *src, surf::NetCard *dst, /* OUT */ std::vector * links, double *latency) @@ -201,7 +201,7 @@ namespace simgrid { route.link_list = new std::vector(); common_ancestor->getRouteAndLatency(src_ancestor->netcard_, dst_ancestor->netcard_, &route, latency); - xbt_assert((route.gw_src != NULL) && (route.gw_dst != NULL), + xbt_assert((route.gw_src != nullptr) && (route.gw_dst != nullptr), "bad gateways for route from \"%s\" to \"%s\"", src->name(), dst->name()); /* If source gateway is not our source, we have to recursively find our way up to this point */ diff --git a/src/surf/AsRoutedGraph.cpp b/src/surf/AsRoutedGraph.cpp index e58e1979d2..5ba0b40433 100644 --- a/src/surf/AsRoutedGraph.cpp +++ b/src/surf/AsRoutedGraph.cpp @@ -55,7 +55,7 @@ xbt_node_t new_xbt_graph_node(xbt_graph_t graph, const char *name, xbt_dict_t no return ret; ret = xbt_graph_new_node(graph, xbt_strdup(name)); - xbt_dict_set(nodes, name, ret, NULL); + xbt_dict_set(nodes, name, ret, nullptr); return ret; } @@ -69,14 +69,14 @@ xbt_edge_t new_xbt_graph_edge(xbt_graph_t graph, xbt_node_t s, xbt_node_t d, xbt snprintf(name, len, "%s%s", sn, dn); xbt_edge_t ret = (xbt_edge_t) xbt_dict_get_or_null(edges, name); - if (ret == NULL) { + if (ret == nullptr) { snprintf(name, len, "%s%s", dn, sn); ret = (xbt_edge_t) xbt_dict_get_or_null(edges, name); } - if (ret == NULL) { - ret = xbt_graph_new_edge(graph, s, d, NULL); - xbt_dict_set(edges, name, ret, NULL); + if (ret == nullptr) { + ret = xbt_graph_new_edge(graph, s, d, nullptr); + xbt_dict_set(edges, name, ret, nullptr); } free(name); return ret; @@ -97,7 +97,7 @@ namespace surf { route->link_list->clear(); NetCard *src_elm = xbt_dynar_get_as(vertices_, src, NetCard*); NetCard *dst_elm = xbt_dynar_get_as(vertices_, dst, NetCard*); - this->getRouteAndLatency(src_elm, dst_elm,route, NULL); + this->getRouteAndLatency(src_elm, dst_elm,route, nullptr); if (route->link_list->size() == 1) { Link *link = route->link_list->at(0); @@ -107,7 +107,7 @@ namespace surf { else if (hierarchy_ == RoutingMode::recursive) onelink = new Onelink(link, route->gw_src, route->gw_dst); else - onelink = new Onelink(link, NULL, NULL); + onelink = new Onelink(link, nullptr, nullptr); xbt_dynar_push(ret, &onelink); } } @@ -133,7 +133,7 @@ void AsRoutedGraph::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edg sg_platf_route_cbarg_t route = xbt_new0(s_sg_platf_route_cbarg_t, 1); route->link_list = new std::vector(); - getRouteAndLatency(my_src, my_dst, route, NULL); + getRouteAndLatency(my_src, my_dst, route, nullptr); XBT_DEBUG ("get_route_and_latency %s -> %s", my_src->name(), my_dst->name()); @@ -189,7 +189,7 @@ sg_platf_route_cbarg_t AsRoutedGraph::newExtendedRoute(RoutingMode hierarchy, sg "The hierarchy of this AS is neither BASIC nor RECURSIVE, I'm lost here."); if (hierarchy == RoutingMode::recursive) { - xbt_assert(routearg->gw_src && routearg->gw_dst, "NULL is obviously a deficient gateway"); + xbt_assert(routearg->gw_src && routearg->gw_dst, "nullptr is obviously a deficient gateway"); result->gw_src = routearg->gw_src; result->gw_dst = routearg->gw_dst; @@ -207,8 +207,8 @@ sg_platf_route_cbarg_t AsRoutedGraph::newExtendedRoute(RoutingMode hierarchy, sg void AsRoutedGraph::getRouteCheckParams(NetCard *src, NetCard *dst) { - xbt_assert(src,"Cannot find a route from NULL to %s", dst->name()); - xbt_assert(dst,"Cannot find a route from %s to NULL", src->name()); + xbt_assert(src,"Cannot find a route from nullptr to %s", dst->name()); + xbt_assert(dst,"Cannot find a route from %s to nullptr", src->name()); As *src_as = src->containingAS(); As *dst_as = dst->containingAS(); diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp index 63995901bc..d5105eab0b 100644 --- a/src/surf/HostImpl.cpp +++ b/src/surf/HostImpl.cpp @@ -17,7 +17,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_host, surf, "Logging specific to the SURF host module"); -simgrid::surf::HostModel *surf_host_model = NULL; +simgrid::surf::HostModel *surf_host_model = nullptr; /************* * Callbacks * @@ -78,7 +78,7 @@ Action *HostModel::executeParallelTask(int host_nb, double *bytes_amount, double rate){ #define cost_or_zero(array,pos) ((array)?(array)[pos]:0.0) - Action *action =NULL; + Action *action =nullptr; if ((host_nb == 1) && (cost_or_zero(bytes_amount, 0) == 0.0)){ action = host_list[0]->pimpl_cpu->execution_start(flops_amount[0]); @@ -174,7 +174,7 @@ void HostImpl::turnOff(){ simgrid::surf::Storage *HostImpl::findStorageOnMountList(const char* mount) { - simgrid::surf::Storage *st = NULL; + simgrid::surf::Storage *st = nullptr; s_mount_t mnt; unsigned int cursor; @@ -195,12 +195,12 @@ xbt_dict_t HostImpl::getMountedStorageList() { s_mount_t mnt; unsigned int i; - xbt_dict_t storage_list = xbt_dict_new_homogeneous(NULL); - char *storage_name = NULL; + xbt_dict_t storage_list = xbt_dict_new_homogeneous(nullptr); + char *storage_name = nullptr; xbt_dynar_foreach(p_storage,i,mnt){ storage_name = (char *)static_cast(mnt.storage)->getName(); - xbt_dict_set(storage_list,mnt.name,storage_name,NULL); + xbt_dict_set(storage_list,mnt.name,storage_name,nullptr); } return storage_list; } @@ -210,9 +210,9 @@ xbt_dynar_t HostImpl::getAttachedStorageList() xbt_lib_cursor_t cursor; char *key; void **data; - xbt_dynar_t result = xbt_dynar_new(sizeof(void*), NULL); + xbt_dynar_t result = xbt_dynar_new(sizeof(void*), nullptr); xbt_lib_foreach(storage_lib, cursor, key, data) { - if(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL) != NULL) { + if(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL) != nullptr) { simgrid::surf::Storage *storage = static_cast(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL)); if(!strcmp((const char*)storage->p_attach,this->getName())){ xbt_dynar_push_as(result, void *, (void*)storage->getName()); @@ -224,13 +224,13 @@ xbt_dynar_t HostImpl::getAttachedStorageList() Action *HostImpl::open(const char* fullpath) { - simgrid::surf::Storage *st = NULL; + simgrid::surf::Storage *st = nullptr; s_mount_t mnt; unsigned int cursor; size_t longest_prefix_length = 0; - char *path = NULL; - char *file_mount_name = NULL; - char *mount_name = NULL; + char *path = nullptr; + char *file_mount_name = nullptr; + char *mount_name = nullptr; XBT_DEBUG("Search for storage name for '%s' on '%s'", fullpath, getName()); xbt_dynar_foreach(p_storage,cursor,mnt) @@ -320,7 +320,7 @@ xbt_dynar_t HostImpl::getInfo( surf_file_t fd) simgrid::surf::Storage *st = findStorageOnMountList(fd->mount); sg_size_t *psize = xbt_new(sg_size_t, 1); *psize = fd->size; - xbt_dynar_t info = xbt_dynar_new(sizeof(void*), NULL); + xbt_dynar_t info = xbt_dynar_new(sizeof(void*), nullptr); xbt_dynar_push_as(info, sg_size_t *, psize); xbt_dynar_push_as(info, void *, fd->mount); xbt_dynar_push_as(info, void *, (void *)st->getName()); @@ -366,7 +366,7 @@ int HostImpl::fileMove(surf_file_t fd, const char* fullpath){ strncpy(path, fullpath+strlen(fd->mount), strlen(fullpath)-strlen(fd->mount)+1); xbt_dict_set(findStorageOnMountList(fd->mount)->p_content, path, - new_psize,NULL); + new_psize,nullptr); XBT_DEBUG("Move file from %s to %s, size '%llu'",fd->name, fullpath, *psize); free(path); return 0; @@ -383,7 +383,7 @@ int HostImpl::fileMove(surf_file_t fd, const char* fullpath){ xbt_dynar_t HostImpl::getVms() { - xbt_dynar_t dyn = xbt_dynar_new(sizeof(simgrid::surf::VirtualMachine*), NULL); + xbt_dynar_t dyn = xbt_dynar_new(sizeof(simgrid::surf::VirtualMachine*), nullptr); /* iterate for all virtual machines */ for (simgrid::surf::VMModel::vm_list_t::iterator iter = diff --git a/src/surf/PropertyHolder.cpp b/src/surf/PropertyHolder.cpp index 97331c6632..b57e536e44 100644 --- a/src/surf/PropertyHolder.cpp +++ b/src/surf/PropertyHolder.cpp @@ -18,10 +18,10 @@ PropertyHolder::~PropertyHolder() { xbt_dict_free(&properties_); } -/** @brief Return the property associated to the provided key (or NULL if not existing) */ +/** @brief Return the property associated to the provided key (or nullptr if not existing) */ const char *PropertyHolder::getProperty(const char*key) { - if (properties_ == NULL) - return NULL; + if (properties_ == nullptr) + return nullptr; return (const char*) xbt_dict_get_or_null(properties_,key); } diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index 1fcdca9e31..d361db65c6 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -58,7 +58,7 @@ CpuCas01Model::CpuCas01Model() : simgrid::surf::CpuModel() maxminSystem_ = lmm_system_new(selectiveUpdate_); if (getUpdateMechanism() == UM_LAZY) { - actionHeap_ = xbt_heap_new(8, NULL); + actionHeap_ = xbt_heap_new(8, nullptr); xbt_heap_set_update_callback(actionHeap_, surf_action_lmm_update_index_heap); modifiedSet_ = new ActionLmmList(); maxminSystem_->keep_track = modifiedSet_; @@ -68,11 +68,11 @@ CpuCas01Model::CpuCas01Model() : simgrid::surf::CpuModel() CpuCas01Model::~CpuCas01Model() { lmm_system_free(maxminSystem_); - maxminSystem_ = NULL; + maxminSystem_ = nullptr; xbt_heap_free(actionHeap_); delete modifiedSet_; - surf_cpu_model_pm = NULL; + surf_cpu_model_pm = nullptr; delete p_cpuRunningActionSetThatDoesNotNeedBeingChecked; } @@ -114,8 +114,8 @@ bool CpuCas01::isUsed() /** @brief take into account changes of speed (either load or max) */ void CpuCas01::onSpeedChange() { - lmm_variable_t var = NULL; - lmm_element_t elem = NULL; + lmm_variable_t var = nullptr; + lmm_element_t elem = nullptr; lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(), coresAmount_ * speed_.scale * speed_.peak); @@ -151,8 +151,8 @@ void CpuCas01::apply_event(tmgr_trace_iterator_t event, double value) turnOn(); } else { lmm_constraint_t cnst = getConstraint(); - lmm_variable_t var = NULL; - lmm_element_t elem = NULL; + lmm_variable_t var = nullptr; + lmm_element_t elem = nullptr; double date = surf_get_clock(); turnOff(); diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index 0530b0ddee..64b46e648c 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -12,7 +12,7 @@ XBT_LOG_EXTERNAL_CATEGORY(surf_kernel); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf, "Logging specific to the SURF cpu module"); -void_f_void_t surf_cpu_model_init_preparse = NULL; +void_f_void_t surf_cpu_model_init_preparse = nullptr; simgrid::surf::CpuModel *surf_cpu_model_pm; simgrid::surf::CpuModel *surf_cpu_model_vm; @@ -80,7 +80,7 @@ void CpuModel::updateActionsStateLazy(double now, double /*delta*/) void CpuModel::updateActionsStateFull(double now, double delta) { - CpuAction *action = NULL; + CpuAction *action = nullptr; ActionList *running_actions = getRunningActionSet(); for(ActionList::iterator it(running_actions->begin()), itNext=it, itend(running_actions->end()) @@ -126,7 +126,7 @@ bool CpuModel::next_occuring_event_isIdempotent() * Resource * ************/ Cpu::Cpu(Model *model, simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core) - : Cpu(model, host, NULL/*constraint*/, speedPerPstate, core) + : Cpu(model, host, nullptr/*constraint*/, speedPerPstate, core) { } @@ -235,13 +235,13 @@ int Cpu::getCore() void Cpu::setStateTrace(tmgr_trace_t trace) { - xbt_assert(stateEvent_==NULL,"Cannot set a second state trace to Host %s", host_->name().c_str()); + xbt_assert(stateEvent_==nullptr,"Cannot set a second state trace to Host %s", host_->name().c_str()); stateEvent_ = future_evt_set->add_trace(trace, 0.0, this); } void Cpu::setSpeedTrace(tmgr_trace_t trace) { - xbt_assert(speed_.event==NULL,"Cannot set a second speed trace to Host %s", host_->name().c_str()); + xbt_assert(speed_.event==nullptr,"Cannot set a second speed trace to Host %s", host_->name().c_str()); speed_.event = future_evt_set->add_trace(trace, 0.0, this); } diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp index 8cde051edc..027ac812b7 100644 --- a/src/surf/cpu_ti.cpp +++ b/src/surf/cpu_ti.cpp @@ -397,14 +397,14 @@ CpuTiModel::CpuTiModel() : CpuModel() modifiedCpu_ = new CpuTiList(); - tiActionHeap_ = xbt_heap_new(8, NULL); + tiActionHeap_ = xbt_heap_new(8, nullptr); xbt_heap_set_update_callback(tiActionHeap_, cpu_ti_action_update_index_heap); } CpuTiModel::~CpuTiModel() { - surf_cpu_model_pm = NULL; + surf_cpu_model_pm = nullptr; delete runningActionSetThatDoesNotNeedBeingChecked_; delete modifiedCpu_; xbt_heap_free(tiActionHeap_); @@ -465,7 +465,7 @@ CpuTi::CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, xbt_dynar_t speedPerPs xbt_dynar_get_cpy(speedPerPstate, 0, &speed_.peak); XBT_DEBUG("CPU create: peak=%f", speed_.peak); - speedIntegratedTrace_ = new CpuTiTgmr(NULL, 1/*scale*/); + speedIntegratedTrace_ = new CpuTiTgmr(nullptr, 1/*scale*/); } CpuTi::~CpuTi() diff --git a/src/surf/fair_bottleneck.cpp b/src/surf/fair_bottleneck.cpp index 7694c4ca3a..04a64dcfde 100644 --- a/src/surf/fair_bottleneck.cpp +++ b/src/surf/fair_bottleneck.cpp @@ -18,13 +18,13 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_maxmin); void bottleneck_solve(lmm_system_t sys) { void *_var, *_var_next, *_cnst, *_cnst_next, *_elem; - lmm_variable_t var = NULL; - lmm_constraint_t cnst = NULL; + lmm_variable_t var = nullptr; + lmm_constraint_t cnst = nullptr; s_lmm_constraint_t s_cnst; - lmm_element_t elem = NULL; - xbt_swag_t cnst_list = NULL; - xbt_swag_t var_list = NULL; - xbt_swag_t elem_list = NULL; + lmm_element_t elem = nullptr; + xbt_swag_t cnst_list = nullptr; + xbt_swag_t var_list = nullptr; + xbt_swag_t elem_list = nullptr; int i; static s_xbt_swag_t cnst_to_update; diff --git a/src/surf/instr_routing.cpp b/src/surf/instr_routing.cpp index ad7511791a..76fb677cc5 100644 --- a/src/surf/instr_routing.cpp +++ b/src/surf/instr_routing.cpp @@ -15,7 +15,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_routing, instr, "Tracing platform hierarchy"); static int platform_created = 0; /* indicate whether the platform file has been traced */ -static xbt_dynar_t currentContainer = NULL; /* push and pop, used only in creation */ +static xbt_dynar_t currentContainer = nullptr; /* push and pop, used only in creation */ static const char *instr_node_name (xbt_node_t node) { @@ -31,7 +31,7 @@ static container_t lowestCommonAncestor (container_t a1, container_t a2) if (a1->father == a2->father) return a1->father; //create an array with all ancestors of a1 - xbt_dynar_t ancestors_a1 = xbt_dynar_new(sizeof(container_t), NULL); + xbt_dynar_t ancestors_a1 = xbt_dynar_new(sizeof(container_t), nullptr); container_t p; p = a1->father; while (p){ @@ -40,7 +40,7 @@ static container_t lowestCommonAncestor (container_t a1, container_t a2) } //create an array with all ancestors of a2 - xbt_dynar_t ancestors_a2 = xbt_dynar_new(sizeof(container_t), NULL); + xbt_dynar_t ancestors_a2 = xbt_dynar_new(sizeof(container_t), nullptr); p = a2->father; while (p){ xbt_dynar_push_as (ancestors_a2, container_t, p); @@ -48,7 +48,7 @@ static container_t lowestCommonAncestor (container_t a1, container_t a2) } //find the lowest ancestor - p = NULL; + p = nullptr; int i = xbt_dynar_length (ancestors_a1) - 1; int j = xbt_dynar_length (ancestors_a2) - 1; while (i >= 0 && j >= 0){ @@ -81,7 +81,7 @@ static void linkContainers (container_t src, container_t dst, xbt_dict_t filter) xbt_die ("common father unknown, this is a tracing problem"); } - if (filter != NULL){ + if (filter != nullptr){ //check if we already register this pair (we only need one direction) char aux1[INSTR_DEFAULT_STR_SIZE], aux2[INSTR_DEFAULT_STR_SIZE]; snprintf (aux1, INSTR_DEFAULT_STR_SIZE, "%s%s", src->name, dst->name); @@ -96,8 +96,8 @@ static void linkContainers (container_t src, container_t dst, xbt_dict_t filter) } //ok, not found, register it - xbt_dict_set (filter, aux1, xbt_strdup ("1"), NULL); - xbt_dict_set (filter, aux2, xbt_strdup ("1"), NULL); + xbt_dict_set (filter, aux1, xbt_strdup ("1"), nullptr); + xbt_dict_set (filter, aux2, xbt_strdup ("1"), nullptr); } //declare type @@ -107,12 +107,12 @@ static void linkContainers (container_t src, container_t dst, xbt_dict_t filter) src->type->name, src->type->id, dst->type->name, dst->type->id); type_t link_type = PJ_type_get_or_null (link_typename, father->type); - if (link_type == NULL){ + if (link_type == nullptr){ link_type = PJ_type_link_new (link_typename, father->type, src->type, dst->type); } //register EDGE types for triva configuration - xbt_dict_set (trivaEdgeTypes, link_type->name, xbt_strdup("1"), NULL); + xbt_dict_set (trivaEdgeTypes, link_type->name, xbt_strdup("1"), nullptr); //create the link static long long counter = 0; @@ -133,7 +133,7 @@ static void recursiveGraphExtraction (simgrid::s4u::As *as, container_t containe } XBT_DEBUG ("Graph extraction for routing_component = %s", as->name()); if (!xbt_dict_is_empty(as->children())){ - xbt_dict_cursor_t cursor = NULL; + xbt_dict_cursor_t cursor = nullptr; AS_t rc_son; char *child_name; //bottom-up recursion @@ -144,12 +144,12 @@ static void recursiveGraphExtraction (simgrid::s4u::As *as, container_t containe } { - xbt_graph_t graph = xbt_graph_new_graph (0, NULL); - xbt_dict_t nodes = xbt_dict_new_homogeneous(NULL); - xbt_dict_t edges = xbt_dict_new_homogeneous(NULL); - xbt_edge_t edge = NULL; + xbt_graph_t graph = xbt_graph_new_graph (0, nullptr); + xbt_dict_t nodes = xbt_dict_new_homogeneous(nullptr); + xbt_dict_t edges = xbt_dict_new_homogeneous(nullptr); + xbt_edge_t edge = nullptr; - xbt_dict_cursor_t cursor = NULL; + xbt_dict_cursor_t cursor = nullptr; char *edge_name; static_cast(as)->getGraph(graph, nodes, edges); @@ -160,7 +160,7 @@ static void recursiveGraphExtraction (simgrid::s4u::As *as, container_t containe } xbt_dict_free (&nodes); xbt_dict_free (&edges); - xbt_graph_free_graph(graph, xbt_free_f, xbt_free_f, NULL); + xbt_graph_free_graph(graph, xbt_free_f, xbt_free_f, nullptr); } } @@ -171,16 +171,16 @@ void sg_instr_AS_begin(sg_platf_AS_cbarg_t AS) { const char*id = AS->id; - if (PJ_container_get_root() == NULL){ + if (PJ_container_get_root() == nullptr){ PJ_container_alloc (); PJ_type_alloc(); - container_t root = PJ_container_new (id, INSTR_AS, NULL); + container_t root = PJ_container_new (id, INSTR_AS, nullptr); PJ_container_set_root (root); if (TRACE_smpi_is_enabled()) { if (!TRACE_smpi_is_grouped()){ type_t mpi = PJ_type_get_or_null ("MPI", root->type); - if (mpi == NULL){ + if (mpi == nullptr){ mpi = PJ_type_container_new("MPI", root->type); PJ_type_state_new ("MPI_STATE", mpi); PJ_type_link_new ("MPI_LINK", PJ_type_get_root(), mpi, mpi); @@ -189,7 +189,7 @@ void sg_instr_AS_begin(sg_platf_AS_cbarg_t AS) } if (TRACE_needs_platform()){ - currentContainer = xbt_dynar_new (sizeof(container_t), NULL); + currentContainer = xbt_dynar_new (sizeof(container_t), nullptr); xbt_dynar_push (currentContainer, &root); } return; @@ -228,7 +228,7 @@ static void instr_routing_parse_start_link (sg_platf_link_cbarg_t link) xbt_dynar_push_as (links_to_create, char*, strdup(link->id)); } - char *link_name = NULL; + char *link_name = nullptr; unsigned int i; xbt_dynar_foreach (links_to_create, i, link_name){ @@ -236,19 +236,19 @@ static void instr_routing_parse_start_link (sg_platf_link_cbarg_t link) if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (! TRACE_disable_link())) { type_t bandwidth = PJ_type_get_or_null ("bandwidth", container->type); - if (bandwidth == NULL){ - bandwidth = PJ_type_variable_new ("bandwidth", NULL, container->type); + if (bandwidth == nullptr){ + bandwidth = PJ_type_variable_new ("bandwidth", nullptr, container->type); } type_t latency = PJ_type_get_or_null ("latency", container->type); - if (latency == NULL){ - latency = PJ_type_variable_new ("latency", NULL, container->type); + if (latency == nullptr){ + latency = PJ_type_variable_new ("latency", nullptr, container->type); } new_pajeSetVariable (0, container, bandwidth, bandwidth_value); new_pajeSetVariable (0, container, latency, latency_value); } if (TRACE_uncategorized()){ type_t bandwidth_used = PJ_type_get_or_null ("bandwidth_used", container->type); - if (bandwidth_used == NULL){ + if (bandwidth_used == nullptr){ PJ_type_variable_new ("bandwidth_used", "0.5 0.5 0.5", container->type); } } @@ -264,8 +264,8 @@ void sg_instr_new_host(sg_platf_host_cbarg_t host) if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (! TRACE_disable_speed())) { type_t speed = PJ_type_get_or_null ("power", container->type); - if (speed == NULL){ - speed = PJ_type_variable_new ("power", NULL, container->type); + if (speed == nullptr){ + speed = PJ_type_variable_new ("power", nullptr, container->type); } double current_speed_state; @@ -274,14 +274,14 @@ void sg_instr_new_host(sg_platf_host_cbarg_t host) } if (TRACE_uncategorized()){ type_t speed_used = PJ_type_get_or_null ("power_used", container->type); - if (speed_used == NULL){ + if (speed_used == nullptr){ PJ_type_variable_new ("power_used", "0.5 0.5 0.5", container->type); } } if (TRACE_smpi_is_enabled() && TRACE_smpi_is_grouped()){ type_t mpi = PJ_type_get_or_null ("MPI", container->type); - if (mpi == NULL){ + if (mpi == nullptr){ mpi = PJ_type_container_new("MPI", container->type); PJ_type_state_new ("MPI_STATE", mpi); PJ_type_link_new ("MPI_LINK", PJ_type_get_root(), mpi, mpi); @@ -290,7 +290,7 @@ void sg_instr_new_host(sg_platf_host_cbarg_t host) if (TRACE_msg_process_is_enabled()) { type_t msg_process = PJ_type_get_or_null ("MSG_PROCESS", container->type); - if (msg_process == NULL){ + if (msg_process == nullptr){ msg_process = PJ_type_container_new("MSG_PROCESS", container->type); type_t state = PJ_type_state_new ("MSG_PROCESS_STATE", msg_process); PJ_value_new ("suspend", "1 0 1", state); @@ -305,7 +305,7 @@ void sg_instr_new_host(sg_platf_host_cbarg_t host) if (TRACE_msg_vm_is_enabled()) { type_t msg_vm = PJ_type_get_or_null ("MSG_VM", container->type); - if (msg_vm == NULL){ + if (msg_vm == nullptr){ msg_vm = PJ_type_container_new("MSG_VM", container->type); type_t state = PJ_type_state_new ("MSG_VM_STATE", msg_vm); PJ_value_new ("suspend", "1 0 1", state); @@ -329,7 +329,7 @@ void sg_instr_new_router(sg_platf_router_cbarg_t router) static void instr_routing_parse_end_platform () { xbt_dynar_free(¤tContainer); - currentContainer = NULL; + currentContainer = nullptr; xbt_dict_t filter = xbt_dict_new_homogeneous(xbt_free_f); XBT_DEBUG ("Starting graph extraction."); recursiveGraphExtraction (simgrid::s4u::Engine::instance()->rootAs(), PJ_container_get_root(), filter); @@ -369,7 +369,7 @@ static void recursiveNewVariableType (const char *new_typename, const char *colo snprintf (tnstr, INSTR_DEFAULT_STR_SIZE, "b%s", new_typename); PJ_type_variable_new (tnstr, color, root); } - xbt_dict_cursor_t cursor = NULL; + xbt_dict_cursor_t cursor = nullptr; type_t child_type; char *name; xbt_dict_foreach(root->children, cursor, name, child_type) { @@ -387,7 +387,7 @@ static void recursiveNewUserVariableType (const char *father_type, const char *n if (!strcmp (root->name, father_type)){ PJ_type_variable_new (new_typename, color, root); } - xbt_dict_cursor_t cursor = NULL; + xbt_dict_cursor_t cursor = nullptr; type_t child_type; char *name; xbt_dict_foreach(root->children, cursor, name, child_type) { @@ -405,7 +405,7 @@ static void recursiveNewUserStateType (const char *father_type, const char *new_ if (!strcmp (root->name, father_type)){ PJ_type_state_new (new_typename, root); } - xbt_dict_cursor_t cursor = NULL; + xbt_dict_cursor_t cursor = nullptr; type_t child_type; char *name; xbt_dict_foreach(root->children, cursor, name, child_type) { @@ -423,7 +423,7 @@ static void recursiveNewValueForUserStateType (const char *type_name, const char if (!strcmp (root->name, type_name)){ PJ_value_new (value, color, root); } - xbt_dict_cursor_t cursor = NULL; + xbt_dict_cursor_t cursor = nullptr; type_t child_type; char *name; xbt_dict_foreach(root->children, cursor, name, child_type) { @@ -448,7 +448,7 @@ static void recursiveXBTGraphExtraction (xbt_graph_t graph, xbt_dict_t nodes, xb AS_t as, container_t container) { if (!xbt_dict_is_empty(as->children())){ - xbt_dict_cursor_t cursor = NULL; + xbt_dict_cursor_t cursor = nullptr; AS_t as_child; char *child_name; //bottom-up recursion @@ -464,9 +464,9 @@ static void recursiveXBTGraphExtraction (xbt_graph_t graph, xbt_dict_t nodes, xb xbt_graph_t instr_routing_platform_graph (void) { - xbt_graph_t ret = xbt_graph_new_graph (0, NULL); - xbt_dict_t nodes = xbt_dict_new_homogeneous(NULL); - xbt_dict_t edges = xbt_dict_new_homogeneous(NULL); + xbt_graph_t ret = xbt_graph_new_graph (0, nullptr); + xbt_dict_t nodes = xbt_dict_new_homogeneous(nullptr); + xbt_dict_t edges = xbt_dict_new_homogeneous(nullptr); recursiveXBTGraphExtraction (ret, nodes, edges, simgrid::s4u::Engine::instance()->rootAs(), PJ_container_get_root()); xbt_dict_free (&nodes); xbt_dict_free (&edges); @@ -476,9 +476,9 @@ xbt_graph_t instr_routing_platform_graph (void) void instr_routing_platform_graph_export_graphviz (xbt_graph_t g, const char *filename) { unsigned int cursor = 0; - xbt_node_t node = NULL; - xbt_edge_t edge = NULL; - FILE *file = NULL; + xbt_node_t node = nullptr; + xbt_edge_t edge = nullptr; + FILE *file = nullptr; file = fopen(filename, "w"); xbt_assert(file, "Failed to open %s \n", filename); diff --git a/src/surf/lagrange.cpp b/src/surf/lagrange.cpp index 9257a84c6a..1efd8ac7cb 100644 --- a/src/surf/lagrange.cpp +++ b/src/surf/lagrange.cpp @@ -44,10 +44,10 @@ static int __check_feasible(xbt_swag_t cnst_list, xbt_swag_t var_list, int warn) { void *_cnst, *_elem, *_var; - xbt_swag_t elem_list = NULL; - lmm_element_t elem = NULL; - lmm_constraint_t cnst = NULL; - lmm_variable_t var = NULL; + xbt_swag_t elem_list = nullptr; + lmm_element_t elem = nullptr; + lmm_constraint_t cnst = nullptr; + lmm_variable_t var = nullptr; double tmp; @@ -128,8 +128,8 @@ static double new_mu(lmm_variable_t var) static double dual_objective(xbt_swag_t var_list, xbt_swag_t cnst_list) { void *_cnst, *_var; - lmm_constraint_t cnst = NULL; - lmm_variable_t var = NULL; + lmm_constraint_t cnst = nullptr; + lmm_variable_t var = nullptr; double obj = 0.0; @@ -178,13 +178,13 @@ void lagrange_solve(lmm_system_t sys) * Variables to manipulate the data structure proposed to model the maxmin * fairness. See docummentation for more details. */ - xbt_swag_t cnst_list = NULL; + xbt_swag_t cnst_list = nullptr; void *_cnst; - lmm_constraint_t cnst = NULL; + lmm_constraint_t cnst = nullptr; - xbt_swag_t var_list = NULL; + xbt_swag_t var_list = nullptr; void *_var; - lmm_variable_t var = NULL; + lmm_variable_t var = nullptr; /* * Auxiliary variables. @@ -492,9 +492,9 @@ static double partial_diff_lambda(double lambda, void *param_cnst) int j; void *_elem; - xbt_swag_t elem_list = NULL; - lmm_element_t elem = NULL; - lmm_variable_t var = NULL; + xbt_swag_t elem_list = nullptr; + lmm_element_t elem = nullptr; + lmm_variable_t var = nullptr; lmm_constraint_t cnst = (lmm_constraint_t) param_cnst; double diff = 0.0; double sigma_i = 0.0; diff --git a/src/surf/maxmin.cpp b/src/surf/maxmin.cpp index 9fabd0d807..05da40302c 100644 --- a/src/surf/maxmin.cpp +++ b/src/surf/maxmin.cpp @@ -27,7 +27,7 @@ double sg_surf_precision = 0.00001; static void *lmm_variable_mallocator_new_f(void); static void lmm_variable_mallocator_free_f(void *var); -#define lmm_variable_mallocator_reset_f ((void_f_pvoid_t)NULL) +#define lmm_variable_mallocator_reset_f ((void_f_pvoid_t)nullptr) static void lmm_update_modified_set(lmm_system_t sys, lmm_constraint_t cnst); static void lmm_remove_all_modified_set(lmm_system_t sys); static int Global_debug_id = 1; @@ -75,7 +75,7 @@ inline void lmm_increase_concurrency(lmm_element_t elem) { lmm_system_t lmm_system_new(int selective_update) { - lmm_system_t l = NULL; + lmm_system_t l = nullptr; s_lmm_variable_t var; s_lmm_constraint_t cnst; @@ -128,7 +128,7 @@ static inline void lmm_variable_remove(lmm_system_t sys, lmm_variable_t var) int i; int nelements; - lmm_element_t elem = NULL; + lmm_element_t elem = nullptr; XBT_IN("(sys=%p, var=%p)", sys, var); sys->modified = 1; @@ -182,7 +182,7 @@ static inline void lmm_cnst_free(lmm_system_t sys, lmm_constraint_t cnst) lmm_constraint_t lmm_constraint_new(lmm_system_t sys, void *id, double bound_value) { - lmm_constraint_t cnst = NULL; + lmm_constraint_t cnst = nullptr; s_lmm_element_t elem; cnst = xbt_new0(s_lmm_constraint_t, 1); @@ -257,7 +257,7 @@ inline void lmm_constraint_free(lmm_system_t sys,lmm_constraint_t cnst) static void *lmm_variable_mallocator_new_f(void) { lmm_variable_t var = xbt_new(s_lmm_variable_t, 1); - var->cnsts = NULL; /* will be created by realloc */ + var->cnsts = nullptr; /* will be created by realloc */ return var; } @@ -269,7 +269,7 @@ static void lmm_variable_mallocator_free_f(void *var) lmm_variable_t lmm_variable_new(lmm_system_t sys, void *id, double weight, double bound, int number_of_constraints) { - lmm_variable_t var = NULL; + lmm_variable_t var = nullptr; int i; XBT_IN("(sys=%p, id=%p, weight=%f, bound=%f, num_cons =%d)", sys, id, weight, bound, number_of_constraints); @@ -279,14 +279,14 @@ lmm_variable_t lmm_variable_new(lmm_system_t sys, void *id, double weight, doubl var->id_int = Global_debug_id++; var->cnsts = (s_lmm_element_t *) xbt_realloc(var->cnsts, number_of_constraints * sizeof(s_lmm_element_t)); for (i = 0; i < number_of_constraints; i++) { - var->cnsts[i].enabled_element_set_hookup.next = NULL; - var->cnsts[i].enabled_element_set_hookup.prev = NULL; - var->cnsts[i].disabled_element_set_hookup.next = NULL; - var->cnsts[i].disabled_element_set_hookup.prev = NULL; - var->cnsts[i].active_element_set_hookup.next = NULL; - var->cnsts[i].active_element_set_hookup.prev = NULL; - var->cnsts[i].constraint = NULL; - var->cnsts[i].variable = NULL; + var->cnsts[i].enabled_element_set_hookup.next = nullptr; + var->cnsts[i].enabled_element_set_hookup.prev = nullptr; + var->cnsts[i].disabled_element_set_hookup.next = nullptr; + var->cnsts[i].disabled_element_set_hookup.prev = nullptr; + var->cnsts[i].active_element_set_hookup.next = nullptr; + var->cnsts[i].active_element_set_hookup.prev = nullptr; + var->cnsts[i].constraint = nullptr; + var->cnsts[i].variable = nullptr; var->cnsts[i].value = 0.0; } var->cnsts_size = number_of_constraints; @@ -303,10 +303,10 @@ lmm_variable_t lmm_variable_new(lmm_system_t sys, void *id, double weight, doubl var->func_fp = func_fp_def; var->func_fpi = func_fpi_def; - var->variable_set_hookup.next = NULL; - var->variable_set_hookup.prev = NULL; - var->saturated_variable_set_hookup.next = NULL; - var->saturated_variable_set_hookup.prev = NULL; + var->variable_set_hookup.next = nullptr; + var->variable_set_hookup.prev = nullptr; + var->saturated_variable_set_hookup.next = nullptr; + var->saturated_variable_set_hookup.prev = nullptr; if (weight) xbt_swag_insert_at_head(var, &(sys->variable_set)); @@ -340,7 +340,7 @@ double lmm_variable_getbound(lmm_variable_t var) void lmm_shrink(lmm_system_t sys, lmm_constraint_t cnst, lmm_variable_t var) { - lmm_element_t elem = NULL; + lmm_element_t elem = nullptr; int found = 0; int i; @@ -374,8 +374,8 @@ void lmm_shrink(lmm_system_t sys, lmm_constraint_t cnst, lmm_variable_t var) lmm_decrease_concurrency(elem); xbt_swag_remove(elem, &(elem->constraint->active_element_set)); - elem->constraint = NULL; - elem->variable = NULL; + elem->constraint = nullptr; + elem->variable = nullptr; elem->value = 0; var->cnsts_number -= 1; @@ -393,7 +393,7 @@ void lmm_shrink(lmm_system_t sys, lmm_constraint_t cnst, lmm_variable_t var) void lmm_expand(lmm_system_t sys, lmm_constraint_t cnst, lmm_variable_t var, double value) { - lmm_element_t elem = NULL; + lmm_element_t elem = nullptr; double weight; int i,current_share; @@ -494,7 +494,7 @@ lmm_constraint_t lmm_get_cnst_from_var(lmm_system_t /*sys*/, lmm_variable_t var, if (num < var->cnsts_number) return (var->cnsts[num].constraint); else - return NULL; + return nullptr; } double lmm_get_cnst_weight_from_var(lmm_system_t /*sys*/, lmm_variable_t var, int num) @@ -532,7 +532,7 @@ lmm_variable_t lmm_get_var_from_cnst(lmm_system_t /*sys*/, lmm_constraint_t cnst if (*elem) return (*elem)->variable; else - return NULL; + return nullptr; } //if we modify the swag between calls, normal version may loop forever @@ -550,7 +550,7 @@ lmm_variable_t lmm_get_var_from_cnst_safe(lmm_system_t /*sys*/, lmm_constraint_t if(*numelem>0){ (*numelem) --; }else - return NULL; + return nullptr; } if (*elem){ //elem is not null, so we carry on @@ -564,7 +564,7 @@ lmm_variable_t lmm_get_var_from_cnst_safe(lmm_system_t /*sys*/, lmm_constraint_t } return (*elem)->variable; }else - return NULL; + return nullptr; } void *lmm_constraint_id(lmm_constraint_t cnst) @@ -602,10 +602,10 @@ static inline void saturated_variable_set_update(s_lmm_constraint_light_t *cnst_ dyn_light_t saturated_constraint_set, lmm_system_t sys) { /* Add active variables (i.e. variables that need to be set) from the set of constraints to saturate (cnst_light_tab)*/ - lmm_constraint_light_t cnst = NULL; + lmm_constraint_light_t cnst = nullptr; void *_elem; - lmm_element_t elem = NULL; - xbt_swag_t elem_list = NULL; + lmm_element_t elem = nullptr; + xbt_swag_t elem_list = nullptr; int i; for(i = 0; i< saturated_constraint_set->pos; i++){ cnst = &cnst_light_tab[saturated_constraint_set->data[i]]; @@ -623,12 +623,12 @@ static inline void saturated_variable_set_update(s_lmm_constraint_light_t *cnst_ void lmm_print(lmm_system_t sys) { void *_cnst, *_elem, *_var; - lmm_constraint_t cnst = NULL; - lmm_element_t elem = NULL; - lmm_variable_t var = NULL; - xbt_swag_t cnst_list = NULL; - xbt_swag_t var_list = NULL; - xbt_swag_t elem_list = NULL; + lmm_constraint_t cnst = nullptr; + lmm_element_t elem = nullptr; + lmm_variable_t var = nullptr; + xbt_swag_t cnst_list = nullptr; + xbt_swag_t var_list = nullptr; + xbt_swag_t elem_list = nullptr; xbt_strbuff_t buf = xbt_strbuff_new(); double sum = 0.0; @@ -706,12 +706,12 @@ void lmm_print(lmm_system_t sys) void lmm_solve(lmm_system_t sys) { void *_var, *_cnst, *_cnst_next, *_elem; - lmm_variable_t var = NULL; - lmm_constraint_t cnst = NULL; - lmm_element_t elem = NULL; - xbt_swag_t cnst_list = NULL; - xbt_swag_t var_list = NULL; - xbt_swag_t elem_list = NULL; + lmm_variable_t var = nullptr; + lmm_constraint_t cnst = nullptr; + lmm_element_t elem = nullptr; + xbt_swag_t cnst_list = nullptr; + xbt_swag_t var_list = nullptr; + xbt_swag_t elem_list = nullptr; double min_usage = -1; double min_bound = -1; @@ -853,7 +853,7 @@ void lmm_solve(lmm_system_t sys) cnst_light_tab[index]=cnst_light_tab[cnst_light_num-1]; cnst_light_tab[index].cnst->cnst_light = &cnst_light_tab[index]; cnst_light_num--; - cnst->cnst_light = NULL; + cnst->cnst_light = nullptr; } } else { cnst->cnst_light->remaining_over_usage = cnst->remaining / cnst->usage; @@ -882,7 +882,7 @@ void lmm_solve(lmm_system_t sys) cnst_light_tab[index]=cnst_light_tab[cnst_light_num-1]; cnst_light_tab[index].cnst->cnst_light = &cnst_light_tab[index]; cnst_light_num--; - cnst->cnst_light = NULL; + cnst->cnst_light = nullptr; } } else { cnst->cnst_light->remaining_over_usage = cnst->remaining / cnst->usage; @@ -1230,7 +1230,7 @@ double lmm_constraint_get_usage(lmm_constraint_t cnst) { double usage = 0.0; xbt_swag_t elem_list = &(cnst->enabled_element_set); void *_elem; - lmm_element_t elem = NULL; + lmm_element_t elem = nullptr; xbt_swag_foreach(_elem, elem_list) { elem = (lmm_element_t)_elem; diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index bb735decf8..3edbdbf033 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -156,10 +156,10 @@ NetworkCm02Model::NetworkCm02Model() if (!maxminSystem_) maxminSystem_ = lmm_system_new(selectiveUpdate_); - routing_model_create(createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE, NULL)); + routing_model_create(createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE, nullptr)); if (updateMechanism_ == UM_LAZY) { - actionHeap_ = xbt_heap_new(8, NULL); + actionHeap_ = xbt_heap_new(8, nullptr); xbt_heap_set_update_callback(actionHeap_, surf_action_lmm_update_index_heap); modifiedSet_ = new ActionLmmList(); maxminSystem_->keep_track = modifiedSet_; @@ -294,7 +294,7 @@ Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst, double size, d int failed = 0; double bandwidth_bound; double latency = 0.0; - std::vector * back_route = NULL; + std::vector * back_route = nullptr; int constraints_per_variable = 0; std::vector *route = new std::vector(); @@ -312,7 +312,7 @@ Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst, double size, d if (sg_network_crosstraffic == 1) { back_route = new std::vector(); - routing_platf->getRouteAndLatency(dst, src, back_route, NULL); + routing_platf->getRouteAndLatency(dst, src, back_route, nullptr); for (auto link: *back_route) if (link->isOff()) failed = 1; @@ -349,7 +349,7 @@ Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst, double size, d } constraints_per_variable = route->size(); - if (back_route != NULL) + if (back_route != nullptr) constraints_per_variable += back_route->size(); if (action->latency_ > 0) { @@ -437,8 +437,8 @@ void NetworkCm02Link::apply_event(tmgr_trace_iterator_t triggered, double value) if (value > 0) turnOn(); else { - lmm_variable_t var = NULL; - lmm_element_t elem = NULL; + lmm_variable_t var = nullptr; + lmm_element_t elem = nullptr; double now = surf_get_clock(); turnOff(); @@ -473,7 +473,7 @@ void NetworkCm02Link::updateBandwidth(double value) { double delta = sg_weight_S_parameter / value - sg_weight_S_parameter / (m_bandwidth.peak * m_bandwidth.scale); lmm_variable_t var; - lmm_element_t elem = NULL, nextelem = NULL; + lmm_element_t elem = nullptr, nextelem = nullptr; int numelem = 0; while ((var = lmm_get_var_from_cnst_safe(getModel()->getMaxminSystem(), getConstraint(), &elem, &nextelem, &numelem))) { NetworkCm02Action *action = (NetworkCm02Action*) lmm_variable_id(var); @@ -486,9 +486,9 @@ void NetworkCm02Link::updateBandwidth(double value) { void NetworkCm02Link::updateLatency(double value){ double delta = value - m_latency.peak; - lmm_variable_t var = NULL; - lmm_element_t elem = NULL; - lmm_element_t nextelem = NULL; + lmm_variable_t var = nullptr; + lmm_element_t elem = nullptr; + lmm_element_t nextelem = nullptr; int numelem = 0; m_latency.peak = value; diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp index bbe31a5237..396b285120 100644 --- a/src/surf/network_constant.cpp +++ b/src/surf/network_constant.cpp @@ -13,11 +13,11 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network); *********/ void surf_network_model_init_Constant() { - xbt_assert(surf_network_model == NULL); + xbt_assert(surf_network_model == nullptr); surf_network_model = new simgrid::surf::NetworkConstantModel(); xbt_dynar_push(all_existing_models, &surf_network_model); - routing_model_create(NULL); + routing_model_create(nullptr); } namespace simgrid { @@ -35,7 +35,7 @@ namespace simgrid { double NetworkConstantModel::next_occuring_event(double /*now*/) { - NetworkConstantAction *action = NULL; + NetworkConstantAction *action = nullptr; double min = -1.0; ActionList *actionSet = getRunningActionSet(); @@ -51,7 +51,7 @@ namespace simgrid { void NetworkConstantModel::updateActionsState(double /*now*/, double delta) { - NetworkConstantAction *action = NULL; + NetworkConstantAction *action = nullptr; ActionList *actionSet = getRunningActionSet(); for(ActionList::iterator it(actionSet->begin()), itNext=it, itend(actionSet->end()) ; it != itend ; it=itNext) { diff --git a/src/surf/network_ib.cpp b/src/surf/network_ib.cpp index 69baee98cc..59e29354b9 100644 --- a/src/surf/network_ib.cpp +++ b/src/surf/network_ib.cpp @@ -19,14 +19,14 @@ static void IB_create_host_callback(simgrid::s4u::Host& host){ static int id=0; // pour t->id -> rajouter une nouvelle struct dans le dict, pour stocker les comms actives - if(((NetworkIBModel*)surf_network_model)->active_nodes==NULL) + if(((NetworkIBModel*)surf_network_model)->active_nodes==nullptr) ((NetworkIBModel*)surf_network_model)->active_nodes=xbt_dict_new(); IBNode* act = new IBNode(id); id++; xbt_dict_set(((NetworkIBModel*)surf_network_model)->active_nodes, - host.name().c_str(), act, NULL); + host.name().c_str(), act, nullptr); } @@ -101,7 +101,7 @@ namespace simgrid { NetworkIBModel::NetworkIBModel() : NetworkSmpiModel() { haveGap_=false; - active_nodes=NULL; + active_nodes=nullptr; const char* IB_factors_string=xbt_cfg_get_string("smpi/IB-penalty-factors"); xbt_dynar_t radical_elements = xbt_str_split(IB_factors_string, ";"); @@ -118,9 +118,9 @@ namespace simgrid { NetworkIBModel::~NetworkIBModel() { - xbt_dict_cursor_t cursor = NULL; - IBNode* instance = NULL; - char *name = NULL; + xbt_dict_cursor_t cursor = nullptr; + IBNode* instance = nullptr; + char *name = nullptr; xbt_dict_foreach(active_nodes, cursor, name, instance) delete instance; xbt_dict_free(&active_nodes); @@ -196,7 +196,7 @@ namespace simgrid { return; bool* updated=(bool*)xbt_malloc0(xbt_dict_size(active_nodes)*sizeof(bool)); - ActiveComm* comm=NULL; + ActiveComm* comm=nullptr; if(remove){ if(to->ActiveCommsDown[from]==1) to->ActiveCommsDown.erase(from); diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp index 512a452391..7194d5d39e 100644 --- a/src/surf/network_interface.cpp +++ b/src/surf/network_interface.cpp @@ -64,7 +64,7 @@ namespace simgrid { boost::unordered_map *Link::links = new boost::unordered_map(); Link *Link::byName(const char* name) { if (links->find(name) == links->end()) - return NULL; + return nullptr; return links->at(name); } /** @brief Returns the amount of links in the platform */ @@ -105,7 +105,7 @@ namespace simgrid { * Model * *********/ -simgrid::surf::NetworkModel *surf_network_model = NULL; +simgrid::surf::NetworkModel *surf_network_model = nullptr; namespace simgrid { namespace surf { @@ -131,7 +131,7 @@ namespace simgrid { double NetworkModel::next_occuring_event_full(double now) { - NetworkAction *action = NULL; + NetworkAction *action = nullptr; ActionList *runningActions = surf_network_model->getRunningActionSet(); double minRes; @@ -230,17 +230,17 @@ namespace simgrid { } } void Link::setStateTrace(tmgr_trace_t trace) { - xbt_assert(m_stateEvent==NULL,"Cannot set a second state trace to Link %s", getName()); + xbt_assert(m_stateEvent==nullptr,"Cannot set a second state trace to Link %s", getName()); m_stateEvent = future_evt_set->add_trace(trace, 0.0, this); } void Link::setBandwidthTrace(tmgr_trace_t trace) { - xbt_assert(m_bandwidth.event==NULL,"Cannot set a second bandwidth trace to Link %s", getName()); + xbt_assert(m_bandwidth.event==nullptr,"Cannot set a second bandwidth trace to Link %s", getName()); m_bandwidth.event = future_evt_set->add_trace(trace, 0.0, this); } void Link::setLatencyTrace(tmgr_trace_t trace) { - xbt_assert(m_latency.event==NULL,"Cannot set a second latency trace to Link %s", getName()); + xbt_assert(m_latency.event==nullptr,"Cannot set a second latency trace to Link %s", getName()); m_latency.event = future_evt_set->add_trace(trace, 0.0, this); } diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index e42338e2ff..e97c67d270 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -80,12 +80,12 @@ static void ns3_add_netcard(simgrid::surf::NetCard* netcard) #include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster) { - const char *groups = NULL; + const char *groups = nullptr; int start, end, i; unsigned int iter; - xbt_dynar_t tab_elements_num = xbt_dynar_new(sizeof(int), NULL); + xbt_dynar_t tab_elements_num = xbt_dynar_new(sizeof(int), nullptr); char *router_id,*host_id; @@ -227,7 +227,7 @@ namespace surf { NetworkNS3Model::NetworkNS3Model() : NetworkModel() { ns3_initialize(ns3_tcp_model.get().c_str()); - routing_model_create(NULL); + routing_model_create(nullptr); simgrid::s4u::Host::onCreation.connect(ns3_add_host); simgrid::surf::netcardCreatedCallbacks.connect(ns3_add_netcard); simgrid::surf::on_cluster.connect (&parse_ns3_add_cluster); @@ -280,7 +280,7 @@ double NetworkNS3Model::next_occuring_event(double now) void NetworkNS3Model::updateActionsState(double now, double delta) { - static xbt_dynar_t socket_to_destroy = xbt_dynar_new(sizeof(char*),NULL); + static xbt_dynar_t socket_to_destroy = xbt_dynar_new(sizeof(char*),nullptr); /* If there are no running flows, advance the NS3 simulator and return */ if (getRunningActionSet()->empty()) { @@ -291,7 +291,7 @@ void NetworkNS3Model::updateActionsState(double now, double delta) return; } - xbt_dict_cursor_t cursor = NULL; + xbt_dict_cursor_t cursor = nullptr; char *ns3Socket; SgFlow *sgFlow; xbt_dict_foreach(flowFromSock,cursor,ns3Socket,sgFlow){ @@ -305,7 +305,7 @@ void NetworkNS3Model::updateActionsState(double now, double delta) std::vector *route = new std::vector(); - routing_platf->getRouteAndLatency (action->src_, action->dst_, route, NULL); + routing_platf->getRouteAndLatency (action->src_, action->dst_, route, nullptr); for (auto link : *route) TRACE_surf_link_set_utilization (link->getName(), action->getCategory(), (data_delta_sent)/delta, now-delta, delta); delete route; @@ -430,7 +430,7 @@ void ns3_create_flow(const char* a,const char *b,double startTime,u_int32_t Tota ns3::Ptr sock = ns3::Socket::CreateSocket (src_node, ns3::TcpSocketFactory::GetTypeId()); - xbt_dict_set(flowFromSock, transformSocketPtr(sock), new SgFlow(TotalBytes, action), NULL); + xbt_dict_set(flowFromSock, transformSocketPtr(sock), new SgFlow(TotalBytes, action), nullptr); sock->Bind(ns3::InetSocketAddress(port_number)); XBT_DEBUG("Create flow starting to %fs + %fs = %fs", diff --git a/src/surf/network_smpi.cpp b/src/surf/network_smpi.cpp index 8fcb6d452c..cb80aeef00 100644 --- a/src/surf/network_smpi.cpp +++ b/src/surf/network_smpi.cpp @@ -15,8 +15,8 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network); -xbt_dynar_t smpi_bw_factor = NULL; -xbt_dynar_t smpi_lat_factor = NULL; +xbt_dynar_t smpi_bw_factor = nullptr; +xbt_dynar_t smpi_lat_factor = nullptr; typedef struct s_smpi_factor *smpi_factor_t; typedef struct s_smpi_factor { // FIXME: s_smpi_factor_multival (defined in smpi_base) should be used instead to dedupplicate this code @@ -24,7 +24,7 @@ typedef struct s_smpi_factor { // FIXME: s_smpi_factor_multival (defined in smpi double value; } s_smpi_factor_t; -xbt_dict_t gap_lookup = NULL; +xbt_dict_t gap_lookup = nullptr; static int factor_cmp(const void *pa, const void *pb) { @@ -35,12 +35,12 @@ static int factor_cmp(const void *pa, const void *pb) #include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area static xbt_dynar_t parse_factor(const char *smpi_coef_string) { - char *value = NULL; + char *value = nullptr; unsigned int iter = 0; s_smpi_factor_t fact; - xbt_dynar_t smpi_factor, radical_elements, radical_elements2 = NULL; + xbt_dynar_t smpi_factor, radical_elements, radical_elements2 = nullptr; - smpi_factor = xbt_dynar_new(sizeof(s_smpi_factor_t), NULL); + smpi_factor = xbt_dynar_new(sizeof(s_smpi_factor_t), nullptr); radical_elements = xbt_str_split(smpi_coef_string, ";"); xbt_dynar_foreach(radical_elements, iter, value) { @@ -117,7 +117,7 @@ namespace simgrid { if (sg_sender_gap > 0.0) { if (!gap_lookup) { - gap_lookup = xbt_dict_new_homogeneous(NULL); + gap_lookup = xbt_dict_new_homogeneous(nullptr); } fifo = (xbt_fifo_t) xbt_dict_get_or_null(gap_lookup, src); action->senderGap_ = 0.0; @@ -138,7 +138,7 @@ namespace simgrid { action->sender.link_name); if (!fifo) { fifo = xbt_fifo_new(); - xbt_dict_set(gap_lookup, action->sender.link_name, fifo, NULL); + xbt_dict_set(gap_lookup, action->sender.link_name, fifo, nullptr); } action->sender.fifo_item = xbt_fifo_push(fifo, action);*/ action->senderSize_ = size; diff --git a/src/surf/plugins/energy.cpp b/src/surf/plugins/energy.cpp index 49b3558d11..76e254de84 100644 --- a/src/surf/plugins/energy.cpp +++ b/src/surf/plugins/energy.cpp @@ -102,9 +102,9 @@ HostEnergy::HostEnergy(simgrid::s4u::Host *ptr) : { initWattsRangeList(); - if (host->properties() != NULL) { + if (host->properties() != nullptr) { char* off_power_str = (char*)xbt_dict_get_or_null(host->properties(), "watt_off"); - if (off_power_str != NULL) { + if (off_power_str != nullptr) { char *msg = bprintf("Invalid value for property watt_off of host %s: %%s",host->name().c_str()); watts_off = xbt_str_parse_double(off_power_str, msg); xbt_free(msg); @@ -163,11 +163,11 @@ double HostEnergy::getConsumedEnergy() void HostEnergy::initWattsRangeList() { - if (host->properties() == NULL) + if (host->properties() == nullptr) return; char* all_power_values_str = (char*)xbt_dict_get_or_null(host->properties(), "watt_per_state"); - if (all_power_values_str == NULL) + if (all_power_values_str == nullptr) return; xbt_dynar_t all_power_values = xbt_str_split(all_power_values_str, ","); @@ -213,7 +213,7 @@ static void onActionStateChange(simgrid::surf::CpuAction *action, simgrid::surf: for(simgrid::surf::Cpu* cpu : action->cpus()) { const char *name = cpu->getName(); sg_host_t sghost = sg_host_by_name(name); - if(sghost == NULL) + if(sghost == nullptr) continue; simgrid::surf::HostImpl *host = sghost->extension(); simgrid::surf::VirtualMachine *vm = dynamic_cast(host); diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp index 9a7179fee8..40049b222e 100644 --- a/src/surf/ptask_L07.cpp +++ b/src/surf/ptask_L07.cpp @@ -39,7 +39,7 @@ HostL07Model::HostL07Model() : HostModel() { surf_network_model = new NetworkL07Model(this,maxminSystem_); surf_cpu_model_pm = new CpuL07Model(this,maxminSystem_); - routing_model_create(surf_network_model->createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE, NULL)); + routing_model_create(surf_network_model->createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE, nullptr)); } HostL07Model::~HostL07Model() { @@ -54,9 +54,9 @@ CpuL07Model::CpuL07Model(HostL07Model *hmodel,lmm_system_t sys) maxminSystem_ = sys; } CpuL07Model::~CpuL07Model() { - surf_cpu_model_pm = NULL; + surf_cpu_model_pm = nullptr; lmm_system_free(maxminSystem_); - maxminSystem_ = NULL; + maxminSystem_ = nullptr; } NetworkL07Model::NetworkL07Model(HostL07Model *hmodel, lmm_system_t sys) : NetworkModel() @@ -66,8 +66,8 @@ NetworkL07Model::NetworkL07Model(HostL07Model *hmodel, lmm_system_t sys) } NetworkL07Model::~NetworkL07Model() { - surf_network_model = NULL; - maxminSystem_ = NULL; // Avoid multi-free + surf_network_model = nullptr; + maxminSystem_ = nullptr; // Avoid multi-free } @@ -147,7 +147,7 @@ void HostL07Model::updateActionsState(double /*now*/, double delta) { action->setState(Action::State::done); } else { /* Need to check that none of the model has failed */ - lmm_constraint_t cnst = NULL; + lmm_constraint_t cnst = nullptr; int i = 0; while ((cnst = lmm_get_cnst_from_var(maxminSystem_, action->getVariable(), i++))) { @@ -184,8 +184,8 @@ L07Action::L07Action(Model *model, int host_nb, sg_host_t*host_list, this->p_netcardList->push_back(host_list[i]->pimpl_netcard); /* Compute the number of affected resources... */ - if(bytes_amount != NULL) { - xbt_dict_t ptask_parallel_task_link_set = xbt_dict_new_homogeneous(NULL); + if(bytes_amount != nullptr) { + xbt_dict_t ptask_parallel_task_link_set = xbt_dict_new_homogeneous(nullptr); for (int i = 0; i < host_nb; i++) { for (int j = 0; j < host_nb; j++) { @@ -198,7 +198,7 @@ L07Action::L07Action(Model *model, int host_nb, sg_host_t*host_list, latency = MAX(latency, lat); for (auto link : *route) - xbt_dict_set(ptask_parallel_task_link_set, link->getName(), link, NULL); + xbt_dict_set(ptask_parallel_task_link_set, link->getName(), link, nullptr); delete route; } } @@ -229,7 +229,7 @@ L07Action::L07Action(Model *model, int host_nb, sg_host_t*host_list, lmm_expand(model->getMaxminSystem(), host_list[i]->pimpl_cpu->getConstraint(), this->getVariable(), flops_amount[i]); - if(bytes_amount != NULL) { + if(bytes_amount != nullptr) { for (int i = 0; i < host_nb; i++) { for (int j = 0; j < host_nb; j++) { @@ -237,7 +237,7 @@ L07Action::L07Action(Model *model, int host_nb, sg_host_t*host_list, continue; std::vector *route = new std::vector(); - routing_platf->getRouteAndLatency((*p_netcardList)[i], (*p_netcardList)[j], route, NULL); + routing_platf->getRouteAndLatency((*p_netcardList)[i], (*p_netcardList)[j], route, nullptr); for (auto link : *route) lmm_expand_add(model->getMaxminSystem(), link->getConstraint(), this->getVariable(), bytes_amount[i * host_nb + j]); @@ -314,7 +314,7 @@ Action *CpuL07::execution_start(double size) flops_amount[0] = size; return static_cast(getModel())->p_hostModel - ->executeParallelTask( 1, host_list, flops_amount, NULL, -1); + ->executeParallelTask( 1, host_list, flops_amount, nullptr, -1); } Action *CpuL07::sleep(double duration) @@ -333,8 +333,8 @@ bool CpuL07::isUsed(){ /** @brief take into account changes of speed (either load or max) */ void CpuL07::onSpeedChange() { - lmm_variable_t var = NULL; - lmm_element_t elem = NULL; + lmm_variable_t var = nullptr; + lmm_element_t elem = nullptr; lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(), speed_.peak * speed_.scale); while ((var = lmm_get_var_from_cnst @@ -403,9 +403,9 @@ void LinkL07::updateBandwidth(double value) void LinkL07::updateLatency(double value) { - lmm_variable_t var = NULL; + lmm_variable_t var = nullptr; L07Action *action; - lmm_element_t elem = NULL; + lmm_element_t elem = nullptr; m_latency.peak = value; while ((var = lmm_get_var_from_cnst(getModel()->getMaxminSystem(), getConstraint(), &elem))) { @@ -432,7 +432,7 @@ void L07Action::updateBound() int hostNb = p_netcardList->size(); - if (p_communicationAmount != NULL) { + if (p_communicationAmount != nullptr) { for (i = 0; i < hostNb; i++) { for (j = 0; j < hostNb; j++) { diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index ef0882175d..0f8a2a75ac 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -35,7 +35,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); -XBT_PRIVATE xbt_dynar_t mount_list = NULL; +XBT_PRIVATE xbt_dynar_t mount_list = nullptr; namespace simgrid { namespace surf { @@ -87,7 +87,7 @@ static std::vector *explodesRadical(const char*radicals){ /** The current AS in the parsing */ -static simgrid::surf::AsImpl *current_routing = NULL; +static simgrid::surf::AsImpl *current_routing = nullptr; static simgrid::surf::AsImpl* routing_get_current() { return current_routing; @@ -125,7 +125,7 @@ void sg_platf_new_host(sg_platf_host_cbarg_t host) if(mount_list){ xbt_lib_set(storage_lib, host->id, ROUTING_STORAGE_HOST_LEVEL, (void *) mount_list); - mount_list = NULL; + mount_list = nullptr; } if (host->coord && strcmp(host->coord, "")) { @@ -137,7 +137,7 @@ void sg_platf_new_host(sg_platf_host_cbarg_t host) xbt_dynar_t ctn_str = xbt_str_split_str(host->coord, " "); xbt_assert(xbt_dynar_length(ctn_str)==3,"Coordinates of %s must have 3 dimensions", host->id); - xbt_dynar_t ctn = xbt_dynar_new(sizeof(double),NULL); + xbt_dynar_t ctn = xbt_dynar_new(sizeof(double),nullptr); xbt_dynar_foreach(ctn_str,cursor, str) { double val = xbt_str_parse_double(str, "Invalid coordinate: %s"); xbt_dynar_push(ctn,&val); @@ -155,7 +155,7 @@ void sg_platf_new_host(sg_platf_host_cbarg_t host) surf_host_model->createHost(host->id, netcard, cpu)->attach(h); if (host->properties) { - xbt_dict_cursor_t cursor=NULL; + xbt_dict_cursor_t cursor=nullptr; char *key,*data; xbt_dict_foreach(host->properties,cursor,key,data) h->setProperty(key,data); @@ -194,7 +194,7 @@ void sg_platf_new_router(sg_platf_router_cbarg_t router) /* Pre-parse the host coordinates */ xbt_dynar_t ctn_str = xbt_str_split_str(router->coord, " "); xbt_assert(xbt_dynar_length(ctn_str)==3,"Coordinates of %s must have 3 dimensions", router->id); - xbt_dynar_t ctn = xbt_dynar_new(sizeof(double),NULL); + xbt_dynar_t ctn = xbt_dynar_new(sizeof(double),nullptr); xbt_dynar_foreach(ctn_str,cursor, str) { double val = xbt_str_parse_double(str, "Invalid coordinate: %s"); xbt_dynar_push(ctn,&val); @@ -281,8 +281,8 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) s_sg_platf_host_cbarg_t host; memset(&host, 0, sizeof(host)); host.id = host_id; - if ((cluster->properties != NULL) && (!xbt_dict_is_empty(cluster->properties))) { - xbt_dict_cursor_t cursor=NULL; + if ((cluster->properties != nullptr) && (!xbt_dict_is_empty(cluster->properties))) { + xbt_dict_cursor_t cursor=nullptr; char *key,*data; host.properties = xbt_dict_new(); @@ -291,7 +291,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) } } - host.speed_per_pstate = xbt_dynar_new(sizeof(double), NULL); + host.speed_per_pstate = xbt_dynar_new(sizeof(double), nullptr); xbt_dynar_push(host.speed_per_pstate,&cluster->speed); host.pstate = 0; host.core_amount = cluster->core_amount; @@ -361,7 +361,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) // and it's very useful to connect clusters together XBT_DEBUG(" "); XBT_DEBUG("", cluster->router_id); - char *newid = NULL; + char *newid = nullptr; s_sg_platf_router_cbarg_t router; memset(&router, 0, sizeof(router)); router.id = cluster->router_id; @@ -413,7 +413,7 @@ void sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet) host.pstate = 0; host.core_amount = 1; host.id = hostname; - host.speed_per_pstate = xbt_dynar_new(sizeof(double), NULL); + host.speed_per_pstate = xbt_dynar_new(sizeof(double), nullptr); xbt_dynar_push(host.speed_per_pstate,&cabinet->speed); sg_platf_new_host(&host); xbt_dynar_free(&host.speed_per_pstate); @@ -575,13 +575,13 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) std::function code = simgrid::xbt::wrapMain(parse_code, process->argc, process->argv); - smx_process_arg_t arg = NULL; - smx_process_t process_created = NULL; + smx_process_arg_t arg = nullptr; + smx_process_t process_created = nullptr; arg = new simgrid::simix::ProcessArg(); arg->name = std::string(process->argv[0]); arg->code = code; - arg->data = NULL; + arg->data = nullptr; arg->hostname = sg_host_get_name(host); arg->kill_time = kill_time; arg->properties = current_property_set; @@ -595,7 +595,7 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) arg = new simgrid::simix::ProcessArg(); arg->name = std::string(process->argv[0]); arg->code = std::move(code); - arg->data = NULL; + arg->data = nullptr; arg->hostname = sg_host_get_name(host); arg->kill_time = kill_time; arg->properties = current_property_set; @@ -611,7 +611,7 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) arg->kill_time, arg->properties, arg->auto_restart, - NULL); + nullptr); delete arg; }); } else { // start_time <= SIMIX_get_clock() @@ -620,12 +620,12 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) if (simix_global->create_process_function) process_created = simix_global->create_process_function( - arg->name.c_str(), std::move(code), NULL, + arg->name.c_str(), std::move(code), nullptr, sg_host_get_name(host), kill_time, - current_property_set, auto_restart, NULL); + current_property_set, auto_restart, nullptr); else process_created = simcall_process_create( - arg->name.c_str(), std::move(code), NULL, sg_host_get_name(host), kill_time, + arg->name.c_str(), std::move(code), nullptr, sg_host_get_name(host), kill_time, current_property_set,auto_restart); /* verify if process has been created (won't be the case if the host is currently dead, but that's fine) */ @@ -633,7 +633,7 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) return; } } - current_property_set = NULL; + current_property_set = nullptr; } void sg_platf_new_peer(sg_platf_peer_cbarg_t peer) @@ -657,7 +657,7 @@ void sg_platf_new_peer(sg_platf_peer_cbarg_t peer) memset(&host, 0, sizeof(host)); host.id = host_id; - host.speed_per_pstate = xbt_dynar_new(sizeof(double), NULL); + host.speed_per_pstate = xbt_dynar_new(sizeof(double), nullptr); xbt_dynar_push(host.speed_per_pstate,&peer->speed); host.pstate = 0; host.speed_trace = peer->availability_trace; @@ -722,10 +722,10 @@ static void surf_config_models_setup() const char *vm_model_name; int host_id = -1; int vm_id = -1; - char *network_model_name = NULL; - char *cpu_model_name = NULL; + char *network_model_name = nullptr; + char *cpu_model_name = nullptr; int storage_id = -1; - char *storage_model_name = NULL; + char *storage_model_name = nullptr; host_model_name = xbt_cfg_get_string("host/model"); vm_model_name = xbt_cfg_get_string("vm/model"); @@ -818,7 +818,7 @@ simgrid::s4u::As * sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) /* search the routing model */ - simgrid::surf::AsImpl *new_as = NULL; + simgrid::surf::AsImpl *new_as = nullptr; switch(AS->routing){ case A_surfxml_AS_routing_Cluster: new_as = new simgrid::surf::AsCluster(AS->id); break; case A_surfxml_AS_routing_ClusterTorus: new_as = new simgrid::surf::AsClusterTorus(AS->id); break; @@ -835,9 +835,9 @@ simgrid::s4u::As * sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) /* make a new routing component */ simgrid::surf::NetCard *netcard = new simgrid::surf::NetCardImpl(new_as->name(), simgrid::surf::NetCard::Type::As, current_routing); - if (current_routing == NULL && routing_platf->root_ == NULL) { /* it is the first one */ + if (current_routing == nullptr && routing_platf->root_ == nullptr) { /* it is the first one */ routing_platf->root_ = new_as; - } else if (current_routing != NULL && routing_platf->root_ != NULL) { + } else if (current_routing != nullptr && routing_platf->root_ != nullptr) { xbt_assert(!xbt_dict_get_or_null(current_routing->children(), AS->id), "The AS \"%s\" already exists", AS->id); @@ -847,7 +847,7 @@ simgrid::s4u::As * sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) if (current_routing->hierarchy_ == simgrid::surf::AsImpl::RoutingMode::unset) current_routing->hierarchy_ = simgrid::surf::AsImpl::RoutingMode::recursive; /* add to the sons dictionary */ - xbt_dict_set(current_routing->children(), AS->id, (void *) new_as, NULL); + xbt_dict_set(current_routing->children(), AS->id, (void *) new_as, nullptr); } else { THROWF(arg_error, 0, "All defined components must belong to a AS"); } diff --git a/src/surf/storage_interface.cpp b/src/surf/storage_interface.cpp index 88860dc55a..8fd56a833a 100644 --- a/src/surf/storage_interface.cpp +++ b/src/surf/storage_interface.cpp @@ -18,7 +18,7 @@ int ROUTING_STORAGE_HOST_LEVEL = -1; int SURF_STORAGE_LEVEL = -1; xbt_lib_t storage_type_lib; int ROUTING_STORAGE_TYPE_LEVEL = -1; //Routing for storage_type level -simgrid::surf::StorageModel *surf_storage_model = NULL; +simgrid::surf::StorageModel *surf_storage_model = nullptr; namespace simgrid { namespace surf { @@ -39,12 +39,12 @@ simgrid::xbt::signal storage StorageModel::StorageModel() : Model() { - p_storageList = NULL; + p_storageList = nullptr; } StorageModel::~StorageModel(){ lmm_system_free(maxminSystem_); - surf_storage_model = NULL; + surf_storage_model = nullptr; xbt_dynar_free(&p_storageList); } @@ -60,7 +60,7 @@ Storage::Storage(Model *model, const char *name, xbt_dict_t props, , p_contentType(xbt_strdup(content_type)) , m_size(size), m_usedSize(0) , p_typeId(xbt_strdup(type_id)) - , p_writeActions(xbt_dynar_new(sizeof(Action*),NULL)) + , p_writeActions(xbt_dynar_new(sizeof(Action*),nullptr)) { p_content = parseContent(content_name); turnOn(); @@ -75,7 +75,7 @@ Storage::Storage(Model *model, const char *name, xbt_dict_t props, , p_contentType(xbt_strdup(content_type)) , m_size(size), m_usedSize(0) , p_typeId(xbt_strdup(type_id)) - , p_writeActions(xbt_dynar_new(sizeof(Action*),NULL)) + , p_writeActions(xbt_dynar_new(sizeof(Action*),nullptr)) { p_content = parseContent(content_name); p_attach = xbt_strdup(attach); @@ -98,14 +98,14 @@ xbt_dict_t Storage::parseContent(const char *filename) { m_usedSize = 0; if ((!filename) || (strcmp(filename, "") == 0)) - return NULL; + return nullptr; xbt_dict_t parse_content = xbt_dict_new_homogeneous(xbt_free_f); FILE *file = surf_fopen(filename, "r"); xbt_assert(file, "Cannot open file '%s' (path=%s)", filename, xbt_str_join(surf_path, ":")); - char *line = NULL; + char *line = nullptr; size_t len = 0; ssize_t read; char path[1024]; @@ -118,7 +118,7 @@ xbt_dict_t Storage::parseContent(const char *filename) m_usedSize += size; sg_size_t *psize = xbt_new(sg_size_t, 1); *psize = size; - xbt_dict_set(parse_content,path,psize,NULL); + xbt_dict_set(parse_content,path,psize,nullptr); } } free(line); @@ -154,13 +154,13 @@ xbt_dict_t Storage::getContent() { /* For the moment this action has no cost, but in the future we could take in account access latency of the disk */ - xbt_dict_t content_dict = xbt_dict_new_homogeneous(NULL); - xbt_dict_cursor_t cursor = NULL; + xbt_dict_t content_dict = xbt_dict_new_homogeneous(nullptr); + xbt_dict_cursor_t cursor = nullptr; char *file; sg_size_t *psize; xbt_dict_foreach(p_content, cursor, file, psize){ - xbt_dict_set(content_dict,file,psize,NULL); + xbt_dict_set(content_dict,file,psize,nullptr); } return content_dict; } @@ -183,14 +183,14 @@ sg_size_t Storage::getUsedSize(){ StorageAction::StorageAction(Model *model, double cost, bool failed, Storage *storage, e_surf_action_storage_type_t type) : Action(model, cost, failed) -, m_type(type), p_storage(storage), p_file(NULL){ +, m_type(type), p_storage(storage), p_file(nullptr){ progress = 0; }; StorageAction::StorageAction(Model *model, double cost, bool failed, lmm_variable_t var, Storage *storage, e_surf_action_storage_type_t type) : Action(model, cost, failed, var) - , m_type(type), p_storage(storage), p_file(NULL){ + , m_type(type), p_storage(storage), p_file(nullptr){ progress = 0; } diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp index 3b270eb2b7..a0d281d876 100644 --- a/src/surf/storage_n11.cpp +++ b/src/surf/storage_n11.cpp @@ -10,7 +10,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage); static int storage_selective_update = 0; -static xbt_swag_t storage_running_action_set_that_does_not_need_being_checked = NULL; +static xbt_swag_t storage_running_action_set_that_does_not_need_being_checked = nullptr; /************* * CallBacks * @@ -64,7 +64,7 @@ namespace simgrid { namespace surf { StorageN11Model::StorageN11Model() : StorageModel() { - Action *action = NULL; + Action *action = nullptr; XBT_DEBUG("surf_storage_model_init_internal"); @@ -77,7 +77,7 @@ StorageN11Model::StorageN11Model() : StorageModel() { StorageN11Model::~StorageN11Model(){ xbt_swag_free(storage_running_action_set_that_does_not_need_being_checked); - storage_running_action_set_that_does_not_need_being_checked = NULL; + storage_running_action_set_that_does_not_need_being_checked = nullptr; } #include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area @@ -112,7 +112,7 @@ Storage *StorageN11Model::createStorage(const char* id, const char* type_id, Bread); if(!p_storageList) - p_storageList = xbt_dynar_new(sizeof(char *),NULL); + p_storageList = xbt_dynar_new(sizeof(char *),nullptr); xbt_dynar_push(p_storageList, &storage); return storage; @@ -149,7 +149,7 @@ double StorageN11Model::next_occuring_event(double /*now*/) void StorageN11Model::updateActionsState(double /*now*/, double delta) { - StorageAction *action = NULL; + StorageAction *action = nullptr; ActionList *actionSet = getRunningActionSet(); for(ActionList::iterator it(actionSet->begin()), itNext=it, itend(actionSet->end()) @@ -188,7 +188,7 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta) sg_size_t *psize = xbt_new(sg_size_t,1); *psize = action->p_file->size; xbt_dict_t content_dict = action->p_storage->p_content; - xbt_dict_set(content_dict, action->p_file->name, psize, NULL); + xbt_dict_set(content_dict, action->p_file->name, psize, nullptr); } action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta); @@ -243,7 +243,7 @@ StorageAction *StorageN11::open(const char* mount, const char* path) psize = xbt_new(sg_size_t,1); size = 0; *psize = size; - xbt_dict_set(p_content, path, psize, NULL); + xbt_dict_set(p_content, path, psize, nullptr); XBT_DEBUG("File '%s' was not found, file created.",path); } surf_file_t file = xbt_new0(s_surf_file_t,1); diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index e536732d2d..e52b0872b8 100644 --- a/src/surf/surf_c_bindings.cpp +++ b/src/surf/surf_c_bindings.cpp @@ -30,10 +30,10 @@ extern double NOW; void surf_presolve(void) { double next_event_date = -1.0; - tmgr_trace_iterator_t event = NULL; + tmgr_trace_iterator_t event = nullptr; double value = -1.0; - simgrid::surf::Resource *resource = NULL; - simgrid::surf::Model *model = NULL; + simgrid::surf::Resource *resource = nullptr; + simgrid::surf::Model *model = nullptr; unsigned int iter; XBT_DEBUG ("Consume all trace events occurring before the starting time."); @@ -59,9 +59,9 @@ double surf_solve(double max_date) double next_event_date = -1.0; double model_next_action_end = -1.0; double value = -1.0; - simgrid::surf::Resource *resource = NULL; - simgrid::surf::Model *model = NULL; - tmgr_trace_iterator_t event = NULL; + simgrid::surf::Resource *resource = nullptr; + simgrid::surf::Model *model = nullptr; + tmgr_trace_iterator_t event = nullptr; unsigned int iter; if (max_date > 0.0) { @@ -76,7 +76,7 @@ double surf_solve(double max_date) if ((time_delta < 0.0 || next_event_phy < time_delta) && next_event_phy >= 0.0) { time_delta = next_event_phy; } - if (surf_vm_model != NULL) { + if (surf_vm_model != nullptr) { XBT_DEBUG("Looking for next event in virtual models"); double next_event_virt = surf_vm_model->next_occuring_event(NOW); if ((time_delta < 0.0 || next_event_virt < time_delta) && next_event_virt >= 0.0) @@ -162,7 +162,7 @@ double surf_solve(double max_date) surf_action_t surf_model_extract_done_action_set(surf_model_t model){ if (model->getDoneActionSet()->empty()) - return NULL; + return nullptr; surf_action_t res = &model->getDoneActionSet()->front(); model->getDoneActionSet()->pop_front(); return res; @@ -170,7 +170,7 @@ surf_action_t surf_model_extract_done_action_set(surf_model_t model){ surf_action_t surf_model_extract_failed_action_set(surf_model_t model){ if (model->getFailedActionSet()->empty()) - return NULL; + return nullptr; surf_action_t res = &model->getFailedActionSet()->front(); model->getFailedActionSet()->pop_front(); return res; diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index c48de1d6db..b3de241734 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -27,12 +27,12 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, "Logging specific to SURF (ke /* model_list_invoke contains only surf_host and surf_vm. * The callback functions of cpu_model and network_model will be called from those of these host models. */ -xbt_dynar_t all_existing_models = NULL; /* to destroy models correctly */ -xbt_dynar_t model_list_invoke = NULL; /* to invoke callbacks */ +xbt_dynar_t all_existing_models = nullptr; /* to destroy models correctly */ +xbt_dynar_t model_list_invoke = nullptr; /* to invoke callbacks */ simgrid::trace_mgr::future_evt_set *future_evt_set = nullptr; -xbt_dynar_t surf_path = NULL; -xbt_dynar_t host_that_restart = xbt_dynar_new(sizeof(char*), NULL); +xbt_dynar_t surf_path = nullptr; +xbt_dynar_t host_that_restart = xbt_dynar_new(sizeof(char*), nullptr); xbt_dict_t watched_hosts_lib; namespace simgrid { @@ -47,7 +47,7 @@ simgrid::xbt::signal surfExitCallbacks; s_surf_model_description_t surf_plugin_description[] = { {"Energy", "Cpu energy consumption.", sg_energy_plugin_init}, - {NULL, NULL, NULL} /* this array must be NULL terminated */ + {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */ }; /* Don't forget to update the option description in smx_config when you change this */ @@ -72,40 +72,40 @@ s_surf_model_description_t surf_network_model_description[] = { surf_network_model_init_Reno2}, {"Vegas", "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).", surf_network_model_init_Vegas}, - {NULL, NULL, NULL} /* this array must be NULL terminated */ + {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */ }; s_surf_model_description_t surf_cpu_model_description[] = { {"Cas01", "Simplistic CPU model (time=size/power).", surf_cpu_model_init_Cas01}, - {NULL, NULL, NULL} /* this array must be NULL terminated */ + {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */ }; s_surf_model_description_t surf_host_model_description[] = { {"default", "Default host model. Currently, CPU:Cas01 and network:LV08 (with cross traffic enabled)", surf_host_model_init_current_default}, {"compound", "Host model that is automatically chosen if you change the network and CPU models", surf_host_model_init_compound}, {"ptask_L07", "Host model somehow similar to Cas01+CM02 but allowing parallel tasks", surf_host_model_init_ptask_L07}, - {NULL, NULL, NULL} /* this array must be NULL terminated */ + {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */ }; s_surf_model_description_t surf_vm_model_description[] = { {"default", "Default vm model.", surf_vm_model_init_HL13}, - {NULL, NULL, NULL} /* this array must be NULL terminated */ + {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */ }; s_surf_model_description_t surf_optimization_mode_description[] = { - {"Lazy", "Lazy action management (partial invalidation in lmm + heap in action remaining).", NULL}, - {"TI", "Trace integration. Highly optimized mode when using availability traces (only available for the Cas01 CPU model for now).", NULL}, - {"Full", "Full update of remaining and variables. Slow but may be useful when debugging.", NULL}, - {NULL, NULL, NULL} /* this array must be NULL terminated */ + {"Lazy", "Lazy action management (partial invalidation in lmm + heap in action remaining).", nullptr}, + {"TI", "Trace integration. Highly optimized mode when using availability traces (only available for the Cas01 CPU model for now).", nullptr}, + {"Full", "Full update of remaining and variables. Slow but may be useful when debugging.", nullptr}, + {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */ }; s_surf_model_description_t surf_storage_model_description[] = { {"default", "Simplistic storage model.", surf_storage_model_init_default}, - {NULL, NULL, NULL} /* this array must be NULL terminated */ + {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */ }; #if HAVE_THREAD_CONTEXTS -static xbt_parmap_t surf_parmap = NULL; /* parallel map on models */ +static xbt_parmap_t surf_parmap = nullptr; /* parallel map on models */ #endif double NOW = 0; @@ -124,9 +124,9 @@ double surf_get_clock(void) FILE *surf_fopen(const char *name, const char *mode) { unsigned int cpt; - char *path_elm = NULL; + char *path_elm = nullptr; char *buff; - FILE *file = NULL; + FILE *file = nullptr; xbt_assert(name); @@ -142,7 +142,7 @@ FILE *surf_fopen(const char *name, const char *mode) if (file) return file; } - return NULL; + return nullptr; } #ifdef _WIN32 @@ -171,7 +171,7 @@ const char *__surf_get_initial_path(void) char root[4] = { 0 }; if (!len) - return NULL; + return nullptr; strncpy(root, current_directory, 3); @@ -180,7 +180,7 @@ const char *__surf_get_initial_path(void) return disk_drives_letter_table[i]; } - return NULL; + return nullptr; #else return "./"; #endif @@ -218,7 +218,7 @@ int find_model_description(s_surf_model_description_t * table, const char *name) { int i; - char *name_list = NULL; + char *name_list = nullptr; for (i = 0; table[i].name; i++) if (!strcmp(name, table[i].name)) { @@ -276,16 +276,16 @@ void surf_init(int *argc, char **argv) simgrid::s4u::Host::onDestruction(*host); delete host; }); - USER_HOST_LEVEL = simgrid::s4u::Host::extension_create(NULL); + USER_HOST_LEVEL = simgrid::s4u::Host::extension_create(nullptr); as_router_lib = xbt_lib_new(); storage_lib = xbt_lib_new(); storage_type_lib = xbt_lib_new(); file_lib = xbt_lib_new(); - watched_hosts_lib = xbt_dict_new_homogeneous(NULL); + watched_hosts_lib = xbt_dict_new_homogeneous(nullptr); XBT_DEBUG("Add routing levels"); - ROUTING_PROP_ASR_LEVEL = xbt_lib_add_level(as_router_lib, NULL); + ROUTING_PROP_ASR_LEVEL = xbt_lib_add_level(as_router_lib, nullptr); ROUTING_ASR_LEVEL = xbt_lib_add_level(as_router_lib, [](void* p) { delete static_cast(p); }); @@ -296,9 +296,9 @@ void surf_init(int *argc, char **argv) xbt_init(argc, argv); if (!all_existing_models) - all_existing_models = xbt_dynar_new(sizeof(simgrid::surf::Model*), NULL); + all_existing_models = xbt_dynar_new(sizeof(simgrid::surf::Model*), nullptr); if (!model_list_invoke) - model_list_invoke = xbt_dynar_new(sizeof(simgrid::surf::Model*), NULL); + model_list_invoke = xbt_dynar_new(sizeof(simgrid::surf::Model*), nullptr); if (!future_evt_set) future_evt_set = new simgrid::trace_mgr::future_evt_set(); @@ -314,7 +314,7 @@ void surf_init(int *argc, char **argv) void surf_exit(void) { unsigned int iter; - simgrid::surf::Model *model = NULL; + simgrid::surf::Model *model = nullptr; TRACE_end(); /* Just in case it was not called by the upper * layer (or there is no upper layer) */ @@ -364,15 +364,15 @@ namespace simgrid { namespace surf { Model::Model() - : maxminSystem_(NULL) + : maxminSystem_(nullptr) { readyActionSet_ = new ActionList(); runningActionSet_ = new ActionList(); failedActionSet_ = new ActionList(); doneActionSet_ = new ActionList(); - modifiedSet_ = NULL; - actionHeap_ = NULL; + modifiedSet_ = nullptr; + actionHeap_ = nullptr; updateMechanism_ = UM_UNDEFINED; selectiveUpdate_ = 0; } @@ -397,7 +397,7 @@ double Model::next_occuring_event(double now) double Model::next_occuring_event_lazy(double now) { - Action *action = NULL; + Action *action = nullptr; double min = -1; double share; @@ -480,7 +480,7 @@ double Model::shareResourcesMaxMin(ActionList *running_actions, lmm_system_t sys, void (*solve) (lmm_system_t)) { - Action *action = NULL; + Action *action = nullptr; double min = -1; double value = -1; @@ -697,7 +697,7 @@ void Action::setState(Action::State state) stateSet_ = getModel()->getDoneActionSet(); break; default: - stateSet_ = NULL; + stateSet_ = nullptr; break; } if (stateSet_) diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp index 35df0801cc..315e71293e 100644 --- a/src/surf/surf_routing.cpp +++ b/src/surf/surf_routing.cpp @@ -52,14 +52,14 @@ int ROUTING_PROP_ASR_LEVEL = -1; //Where the properties are stored simgrid::surf::NetCard *sg_netcard_by_name_or_null(const char *name) { sg_host_t h = sg_host_by_name(name); - simgrid::surf::NetCard *netcard = h==NULL ? NULL: h->pimpl_netcard; + simgrid::surf::NetCard *netcard = h==nullptr ? nullptr: h->pimpl_netcard; if (!netcard) netcard = (simgrid::surf::NetCard*) xbt_lib_get_or_null(as_router_lib, name, ROUTING_ASR_LEVEL); return netcard; } /* Global vars */ -simgrid::surf::RoutingPlatf *routing_platf = NULL; +simgrid::surf::RoutingPlatf *routing_platf = nullptr; void sg_platf_new_trace(sg_platf_trace_cbarg_t trace) @@ -72,7 +72,7 @@ void sg_platf_new_trace(sg_platf_trace_cbarg_t trace) "Trace '%s' must have either a content, or point to a file on disk.",trace->id); tmgr_trace = tmgr_trace_new_from_string(trace->id, trace->pc_data, trace->periodicity); } - xbt_dict_set(traces_set_list, trace->id, (void *) tmgr_trace, NULL); + xbt_dict_set(traces_set_list, trace->id, (void *) tmgr_trace, nullptr); } namespace simgrid { @@ -84,10 +84,10 @@ namespace surf { * \param src the network_element_t for src host * \param dst the network_element_t for dst host * \param route where to store the list of links. - * If *route=NULL, create a short lived dynar. Else, fill the provided dynar - * \param latency where to store the latency experienced on the path (or NULL if not interested) + * If *route=nullptr, create a short lived dynar. Else, fill the provided dynar + * \param latency where to store the latency experienced on the path (or nullptr if not interested) * It is the caller responsability to initialize latency to 0 (we add to provided route) - * \pre route!=NULL + * \pre route!=nullptr * * walk through the routing components tree and find a route between hosts * by calling each "get_route" function in each routing component. @@ -110,7 +110,7 @@ static xbt_dynar_t _recursiveGetOneLinkRoutes(surf::AsImpl *as) //recursing char *key; - xbt_dict_cursor_t cursor = NULL; + xbt_dict_cursor_t cursor = nullptr; AsImpl *rc_child; xbt_dict_foreach(as->children(), cursor, key, rc_child) { xbt_dynar_t onelink_child = _recursiveGetOneLinkRoutes(rc_child); @@ -143,7 +143,7 @@ static void check_disk_attachment() void **data; simgrid::surf::NetCard *host_elm; xbt_lib_foreach(storage_lib, cursor, key, data) { - if(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL) != NULL) { + if(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL) != nullptr) { simgrid::surf::Storage *storage = static_cast(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL)); host_elm = sg_netcard_by_name_or_null(storage->p_attach); if(!host_elm) diff --git a/src/surf/trace_mgr.cpp b/src/surf/trace_mgr.cpp index 838b9e75cd..b216946385 100644 --- a/src/surf/trace_mgr.cpp +++ b/src/surf/trace_mgr.cpp @@ -20,7 +20,7 @@ static std::unordered_map trace_list; simgrid::trace_mgr::trace::trace() { - event_list = xbt_dynar_new(sizeof(s_tmgr_event_t), NULL); + event_list = xbt_dynar_new(sizeof(s_tmgr_event_t), nullptr); } simgrid::trace_mgr::trace::~trace() @@ -39,7 +39,7 @@ simgrid::trace_mgr::future_evt_set::~future_evt_set() tmgr_trace_t tmgr_trace_new_from_string(const char *name, const char *input, double periodicity) { int linecount = 0; - tmgr_event_t last_event = NULL; + tmgr_event_t last_event = nullptr; unsigned int cpt; char *val; @@ -94,7 +94,7 @@ tmgr_trace_t tmgr_trace_new_from_file(const char *filename) xbt_assert(trace_list.find(filename) == trace_list.end(), "Refusing to define trace %s twice", filename); FILE *f = surf_fopen(filename, "r"); - xbt_assert(f != NULL, + xbt_assert(f != nullptr, "Cannot open file '%s' (path=%s)", filename, xbt_str_join(surf_path, ":")); char *tstr = xbt_str_from_file(f); @@ -124,7 +124,7 @@ void tmgr_trace_free(tmgr_trace_t trace) /** @brief Registers a new trace into the future event set, and get an iterator over the integrated trace */ tmgr_trace_iterator_t simgrid::trace_mgr::future_evt_set::add_trace(tmgr_trace_t trace, double start_time, surf::Resource *resource) { - tmgr_trace_iterator_t trace_iterator = NULL; + tmgr_trace_iterator_t trace_iterator = nullptr; trace_iterator = xbt_new0(s_tmgr_trace_event_t, 1); trace_iterator->trace = trace; @@ -147,17 +147,17 @@ double simgrid::trace_mgr::future_evt_set::next_date() const return -1.0; } -/** @brief Retrieves the next occurring event, or NULL if none happens before #date */ +/** @brief Retrieves the next occurring event, or nullptr if none happens before #date */ tmgr_trace_iterator_t simgrid::trace_mgr::future_evt_set::pop_leq( double date, double *value, simgrid::surf::Resource **resource) { double event_date = next_date(); if (event_date > date) - return NULL; + return nullptr; tmgr_trace_iterator_t trace_iterator = (tmgr_trace_iterator_t)xbt_heap_pop(p_heap); - if (trace_iterator == NULL) - return NULL; + if (trace_iterator == nullptr) + return nullptr; tmgr_trace_t trace = trace_iterator->trace; *resource = trace_iterator->resource; diff --git a/src/surf/virtual_machine.cpp b/src/surf/virtual_machine.cpp index 75017d8790..43fa47e1f4 100644 --- a/src/surf/virtual_machine.cpp +++ b/src/surf/virtual_machine.cpp @@ -9,7 +9,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_vm, surf, "Logging specific to the SURF VM module"); -simgrid::surf::VMModel *surf_vm_model = NULL; +simgrid::surf::VMModel *surf_vm_model = nullptr; namespace simgrid { namespace surf { @@ -33,7 +33,7 @@ VMModel::vm_list_t VMModel::ws_vms; ************/ VirtualMachine::VirtualMachine(HostModel *model, const char *name, simgrid::s4u::Host *hostPM) -: HostImpl(model, name, NULL, NULL, NULL) +: HostImpl(model, name, nullptr, nullptr, nullptr) , hostPM_(hostPM) { VMModel::ws_vms.push_back(*this); diff --git a/src/surf/vm_hl13.cpp b/src/surf/vm_hl13.cpp index e6551279b4..399d2ce02a 100644 --- a/src/surf/vm_hl13.cpp +++ b/src/surf/vm_hl13.cpp @@ -97,7 +97,7 @@ VMHL13::VMHL13(VMModel *model, const char* name, sg_host_t host_PM) : VirtualMachine(model, name, host_PM) { /* Currently, we assume a VM has no storage. */ - p_storage = NULL; + p_storage = nullptr; /* Currently, a VM uses the network resource of its physical host. In * host_lib, this network resource object is referred from two different keys. diff --git a/src/surf/xml/surfxml_parseplatf.cpp b/src/surf/xml/surfxml_parseplatf.cpp index a63728748c..95a8a103e6 100644 --- a/src/surf/xml/surfxml_parseplatf.cpp +++ b/src/surf/xml/surfxml_parseplatf.cpp @@ -32,10 +32,10 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); */ /* This buffer is used to store the original buffer before substituting it by out own buffer. Useful for the cluster tag */ -static xbt_dynar_t surfxml_bufferstack_stack = NULL; +static xbt_dynar_t surfxml_bufferstack_stack = nullptr; int surfxml_bufferstack_size = 2048; -static char *old_buff = NULL; +static char *old_buff = nullptr; XBT_IMPORT_NO_EXPORT(unsigned int) surfxml_buffer_stack_stack_ptr; XBT_IMPORT_NO_EXPORT(unsigned int) surfxml_buffer_stack_stack[1024]; @@ -64,12 +64,12 @@ void surfxml_bufferstack_pop(int new_one) * Trace related stuff */ -xbt_dict_t traces_set_list = NULL; -XBT_PRIVATE xbt_dict_t trace_connect_list_host_avail = NULL; -XBT_PRIVATE xbt_dict_t trace_connect_list_host_speed = NULL; -XBT_PRIVATE xbt_dict_t trace_connect_list_link_avail = NULL; -XBT_PRIVATE xbt_dict_t trace_connect_list_link_bw = NULL; -XBT_PRIVATE xbt_dict_t trace_connect_list_link_lat = NULL; +xbt_dict_t traces_set_list = nullptr; +XBT_PRIVATE xbt_dict_t trace_connect_list_host_avail = nullptr; +XBT_PRIVATE xbt_dict_t trace_connect_list_host_speed = nullptr; +XBT_PRIVATE xbt_dict_t trace_connect_list_link_avail = nullptr; +XBT_PRIVATE xbt_dict_t trace_connect_list_link_bw = nullptr; +XBT_PRIVATE xbt_dict_t trace_connect_list_link_lat = nullptr; void sg_platf_trace_connect(sg_platf_trace_connect_cbarg_t trace_connect) { @@ -82,25 +82,25 @@ void sg_platf_trace_connect(sg_platf_trace_connect_cbarg_t trace_connect) case SURF_TRACE_CONNECT_KIND_HOST_AVAIL: xbt_dict_set(trace_connect_list_host_avail, trace_connect->trace, - xbt_strdup(trace_connect->element), NULL); + xbt_strdup(trace_connect->element), nullptr); break; case SURF_TRACE_CONNECT_KIND_SPEED: xbt_dict_set(trace_connect_list_host_speed, trace_connect->trace, - xbt_strdup(trace_connect->element), NULL); + xbt_strdup(trace_connect->element), nullptr); break; case SURF_TRACE_CONNECT_KIND_LINK_AVAIL: xbt_dict_set(trace_connect_list_link_avail, trace_connect->trace, - xbt_strdup(trace_connect->element), NULL); + xbt_strdup(trace_connect->element), nullptr); break; case SURF_TRACE_CONNECT_KIND_BANDWIDTH: xbt_dict_set(trace_connect_list_link_bw, trace_connect->trace, - xbt_strdup(trace_connect->element), NULL); + xbt_strdup(trace_connect->element), nullptr); break; case SURF_TRACE_CONNECT_KIND_LATENCY: xbt_dict_set(trace_connect_list_link_lat, trace_connect->trace, - xbt_strdup(trace_connect->element), NULL); + xbt_strdup(trace_connect->element), nullptr); break; default: surf_parse_error("Cannot connect trace %s to %s: kind of trace unknown", @@ -129,7 +129,7 @@ void parse_after_config() { void parse_platform_file(const char *file) { #if HAVE_LUA - int is_lua = (file != NULL && strlen(file) > 3 && file[strlen(file)-3] == 'l' && file[strlen(file)-2] == 'u' + int is_lua = (file != nullptr && strlen(file) > 3 && file[strlen(file)-3] == 'l' && file[strlen(file)-2] == 'u' && file[strlen(file)-1] == 'a'); #endif @@ -164,7 +164,7 @@ void parse_platform_file(const char *file) after_config_done = 0; surf_parse_open(file); - traces_set_list = xbt_dict_new_homogeneous(NULL); + traces_set_list = xbt_dict_new_homogeneous(nullptr); trace_connect_list_host_avail = xbt_dict_new_homogeneous(free); trace_connect_list_host_speed = xbt_dict_new_homogeneous(free); trace_connect_list_link_avail = xbt_dict_new_homogeneous(free); @@ -173,13 +173,13 @@ void parse_platform_file(const char *file) /* Init my data */ if (!surfxml_bufferstack_stack) - surfxml_bufferstack_stack = xbt_dynar_new(sizeof(char *), NULL); + surfxml_bufferstack_stack = xbt_dynar_new(sizeof(char *), nullptr); /* Do the actual parsing */ parse_status = surf_parse(); /* connect all traces relative to hosts */ - xbt_dict_cursor_t cursor = NULL; + xbt_dict_cursor_t cursor = nullptr; char *trace_name, *elm; xbt_dict_foreach(trace_connect_list_host_avail, cursor, trace_name, elm) { diff --git a/src/surf/xml/surfxml_sax_cb.cpp b/src/surf/xml/surfxml_sax_cb.cpp index 68ff3721a0..4a75fdb0f0 100644 --- a/src/surf/xml/surfxml_sax_cb.cpp +++ b/src/surf/xml/surfxml_sax_cb.cpp @@ -462,8 +462,8 @@ void ETag_surfxml_host(void) { XBT_DEBUG("pstate: %s", A_surfxml_host_pstate); host.core_amount = surf_parse_get_int(A_surfxml_host_core); - host.speed_trace = A_surfxml_host_availability___file[0] ? tmgr_trace_new_from_file(A_surfxml_host_availability___file) : NULL; - host.state_trace = A_surfxml_host_state___file[0] ? tmgr_trace_new_from_file(A_surfxml_host_state___file) : NULL; + host.speed_trace = A_surfxml_host_availability___file[0] ? tmgr_trace_new_from_file(A_surfxml_host_availability___file) : nullptr; + host.state_trace = A_surfxml_host_state___file[0] ? tmgr_trace_new_from_file(A_surfxml_host_state___file) : nullptr; host.pstate = surf_parse_get_int(A_surfxml_host_pstate); host.coord = A_surfxml_host_coordinates; @@ -598,8 +598,8 @@ void STag_surfxml_peer(void){ peer.bw_out = surf_parse_get_bandwidth(A_surfxml_peer_bw___out, "bw_out of peer", peer.id); peer.lat = surf_parse_get_time(A_surfxml_peer_lat, "lat of peer", peer.id); peer.coord = A_surfxml_peer_coordinates; - peer.availability_trace = A_surfxml_peer_availability___file[0] ? tmgr_trace_new_from_file(A_surfxml_peer_availability___file) : NULL; - peer.state_trace = A_surfxml_peer_state___file[0] ? tmgr_trace_new_from_file(A_surfxml_peer_state___file) : NULL; + peer.availability_trace = A_surfxml_peer_availability___file[0] ? tmgr_trace_new_from_file(A_surfxml_peer_availability___file) : nullptr; + peer.state_trace = A_surfxml_peer_state___file[0] ? tmgr_trace_new_from_file(A_surfxml_peer_state___file) : nullptr; sg_platf_new_peer(&peer); } @@ -616,10 +616,10 @@ void ETag_surfxml_link(void){ link.properties = current_property_set; link.id = A_surfxml_link_id; link.bandwidth = surf_parse_get_bandwidth(A_surfxml_link_bandwidth, "bandwidth of link", link.id); - link.bandwidth_trace = A_surfxml_link_bandwidth___file[0] ? tmgr_trace_new_from_file(A_surfxml_link_bandwidth___file) : NULL; + link.bandwidth_trace = A_surfxml_link_bandwidth___file[0] ? tmgr_trace_new_from_file(A_surfxml_link_bandwidth___file) : nullptr; link.latency = surf_parse_get_time(A_surfxml_link_latency, "latency of link", link.id); - link.latency_trace = A_surfxml_link_latency___file[0] ? tmgr_trace_new_from_file(A_surfxml_link_latency___file) : NULL; - link.state_trace = A_surfxml_link_state___file[0] ? tmgr_trace_new_from_file(A_surfxml_link_state___file):NULL; + link.latency_trace = A_surfxml_link_latency___file[0] ? tmgr_trace_new_from_file(A_surfxml_link_latency___file) : nullptr; + link.state_trace = A_surfxml_link_state___file[0] ? tmgr_trace_new_from_file(A_surfxml_link_state___file):nullptr; switch (A_surfxml_link_sharing___policy) { case A_surfxml_link_sharing___policy_SHARED: @@ -992,7 +992,7 @@ void ETag_surfxml_model___prop(void){} void surf_parse_open(const char *file) { - xbt_assert(file, "Cannot parse the NULL file. Bypassing the parser is strongly deprecated nowadays."); + xbt_assert(file, "Cannot parse the nullptr file. Bypassing the parser is strongly deprecated nowadays."); if (!surf_input_buffer_stack) surf_input_buffer_stack = xbt_dynar_new(sizeof(YY_BUFFER_STATE), nullptr); -- 2.20.1