-/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2021. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "xbt/file.hpp"
#include <algorithm>
+#include <array>
#include <boost/algorithm/string.hpp> /* split */
#include <boost/tokenizer.hpp>
+#include <cerrno>
#include <cinttypes>
#include <cstdint> /* intmax_t */
+#include <cstring> /* strerror */
#include <dlfcn.h>
#include <fcntl.h>
#include <fstream>
#if HAVE_PAPI
std::string papi_default_config_name = "default";
-std::map</* computation unit name */ std::string, papi_process_data> units2papi_setup;
+std::map</* computation unit name */ std::string, papi_process_data, std::less<>> units2papi_setup;
#endif
std::unordered_map<std::string, double> location2speedup;
}
XBT_DEBUG("Successfully added PAPI event '%s' to the event set.", event_name);
- counters2values.push_back(
- // We cannot just pass *events_it, as this is of type const basic_string
- std::make_pair(std::string(*events_it), 0LL));
+ counters2values.emplace_back(*events_it, 0LL);
}
std::string unit_name = *(event_tokens.begin());
{
int fdin = open(src.c_str(), O_RDONLY);
xbt_assert(fdin >= 0, "Cannot read from %s. Please make sure that the file exists and is executable.", src.c_str());
- int fdout = open(target.c_str(), O_CREAT | O_RDWR, S_IRWXU);
- xbt_assert(fdout >= 0, "Cannot write into %s", target.c_str());
+ XBT_ATTRIB_UNUSED int unlink_status = unlink(target.c_str());
+ xbt_assert(unlink_status == 0 || errno == ENOENT, "Failed to unlink file %s: %s", target.c_str(), strerror(errno));
+ int fdout = open(target.c_str(), O_CREAT | O_RDWR | O_EXCL, S_IRWXU);
+ xbt_assert(fdout >= 0, "Cannot write into %s: %s", target.c_str(), strerror(errno));
XBT_DEBUG("Copy %" PRIdMAX " bytes into %s", static_cast<intmax_t>(fdin_size), target.c_str());
#if SG_HAVE_SENDFILE
}
#endif
// If this point is reached, sendfile() actually is not available. Copy file by hand.
- const int bufsize = 1024 * 1024 * 4;
- auto* buf = new char[bufsize];
- while (int got = read(fdin, buf, bufsize)) {
+ std::vector<unsigned char> buf(1024 * 1024 * 4);
+ while (ssize_t got = read(fdin, buf.data(), buf.size())) {
if (got == -1) {
xbt_assert(errno == EINTR, "Cannot read from %s", src.c_str());
} else {
- const char* p = buf;
- int todo = got;
- while (int done = write(fdout, p, todo)) {
+ const unsigned char* p = buf.data();
+ ssize_t todo = got;
+ while (ssize_t done = write(fdout, p, todo)) {
if (done == -1) {
xbt_assert(errno == EINTR, "Cannot write into %s", target.c_str());
} else {
}
}
}
- delete[] buf;
close(fdin);
close(fdout);
}