A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Kill useless hack (and its union).
[simgrid.git]
/
src
/
mc
/
mc_hash.cpp
diff --git
a/src/mc/mc_hash.cpp
b/src/mc/mc_hash.cpp
index
72dd93c
..
7cdd3fa
100644
(file)
--- a/
src/mc/mc_hash.cpp
+++ b/
src/mc/mc_hash.cpp
@@
-1,5
+1,4
@@
-/* Copyright (c) 2014-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2014-2019. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-8,12
+7,12
@@
#include <cstdint>
#include <cstdint>
-#include
<xbt/log.h>
+#include
"xbt/log.h"
-#include "src/mc/mc_private.h"
-#include "src/mc/mc_snapshot.h"
#include "mc/datatypes.h"
#include "src/mc/mc_hash.hpp"
#include "mc/datatypes.h"
#include "src/mc/mc_hash.hpp"
+#include "src/mc/mc_private.hpp"
+#include "src/mc/sosp/mc_snapshot.hpp"
#include <mc/mc.h>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_hash, mc, "Logging specific to mc_hash");
#include <mc/mc.h>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_hash, mc, "Logging specific to mc_hash");
@@
-24,12
+23,13
@@
namespace mc {
namespace {
class djb_hash {
namespace {
class djb_hash {
- hash_type state_ = 5381ll;
+ hash_type state_ = 5381LL;
+
public:
template<class T>
void update(T& x)
{
public:
template<class T>
void update(T& x)
{
- state_ = (state_ << 5) + state_ +
state_
;
+ state_ = (state_ << 5) + state_ +
x
;
}
hash_type value()
{
}
hash_type value()
{
@@
-43,11
+43,12
@@
hash_type hash(Snapshot const& snapshot)
{
XBT_DEBUG("START hash %i", snapshot.num_state);
djb_hash hash;
{
XBT_DEBUG("START hash %i", snapshot.num_state);
djb_hash hash;
- // TODO, nb_processes
- // TODO, heap_bytes_used
- // TODO, root variables
- // TODO, basic stack frame information
- // TODO, stack frame local variables
+ // TODO:
+ // * nb_processes
+ // * heap_bytes_used
+ // * root variables
+ // * basic stack frame information
+ // * stack frame local variables
XBT_DEBUG("END hash %i", snapshot.num_state);
return hash.value();
}
XBT_DEBUG("END hash %i", snapshot.num_state);
return hash.value();
}