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
Better fix for the security warning from sonar: hide the char* buffer
[simgrid.git]
/
src
/
kernel
/
actor
/
SimcallObserver.cpp
diff --git
a/src/kernel/actor/SimcallObserver.cpp
b/src/kernel/actor/SimcallObserver.cpp
index
b977abc
..
aa457e4
100644
(file)
--- a/
src/kernel/actor/SimcallObserver.cpp
+++ b/
src/kernel/actor/SimcallObserver.cpp
@@
-28,6
+28,12
@@
bool RandomSimcall::depends(SimcallObserver* other)
{
return get_issuer() == other->get_issuer();
}
+void RandomSimcall::serialize(Simcall& type, std::stringstream& stream)
+{
+ type = Simcall::RANDOM;
+ stream << min_ << ' ' << max_;
+}
+
bool MutexSimcall::depends(SimcallObserver* other)
{
if (dynamic_cast<RandomSimcall*>(other) != nullptr)
@@
-218,20
+224,17
@@
bool ActivityTestSimcall::depends(SimcallObserver* other)
return true;
}
-void ActivityWaitSimcall::serialize(Simcall& type,
char* buffer
)
+void ActivityWaitSimcall::serialize(Simcall& type,
std::stringstream& stream
)
{
- std::stringstream stream;
if (auto* comm = dynamic_cast<activity::CommImpl*>(activity_)) {
type = Simcall::COMM_WAIT;
- stream <<
timeout_
<< ' ' << comm;
+ stream <<
(timeout_ > 0)
<< ' ' << comm;
stream << ' ' << (comm->src_actor_ != nullptr ? comm->src_actor_->get_pid() : -1);
stream << ' ' << (comm->dst_actor_ != nullptr ? comm->dst_actor_->get_pid() : -1);
- stream << ' ' <<
(comm->get_mailbox() != nullptr ? comm->get_mailbox()->get_id() : 666
);
+ stream << ' ' <<
comm->get_mailbox_id(
);
stream << ' ' << (void*)comm->src_buff_ << ' ' << (void*)comm->dst_buff_ << ' ' << comm->src_buff_size_;
- strcpy(buffer, stream.str().c_str());
} else {
type = Simcall::UNKNOWN;
- strcpy(buffer, stream.str().c_str());
}
}
@@
-342,37
+345,18
@@
void ActivityWaitanySimcall::prepare(int times_considered)
next_value_ = times_considered;
}
-void CommIsendSimcall::serialize(Simcall& type,
char* buffer
)
+void CommIsendSimcall::serialize(Simcall& type,
std::stringstream& stream
)
{
type = Simcall::ISEND;
- std::stringstream stream;
stream << mbox_->get_id() << ' ' << (void*)src_buff_ << ' ' << src_buff_size_;
-
strcpy(buffer, stream.str().c_str()
);
+
XBT_DEBUG("SendObserver mbox:%u buff:%p size:%zu", mbox_->get_id(), src_buff_, src_buff_size_
);
}
-void CommIrecvSimcall::serialize(Simcall& type,
char* buffer
)
+void CommIrecvSimcall::serialize(Simcall& type,
std::stringstream& stream
)
{
type = Simcall::IRECV;
- std::stringstream stream;
stream << mbox_->get_id() << dst_buff_;
- strcpy(buffer, stream.str().c_str());
-}
-
-
-/*
-std::string CommIrecvSimcall::to_string(int times_considered) const
-{
- std::string res = SimcallObserver::to_string(times_considered) + "iRecv(";
- res += xbt::string_printf("dst=(%ld)%s (%s)", get_issuer()->get_pid(), get_issuer()->get_host()->get_cname(),
- get_issuer()->get_cname());
- res += ", buff=" + (XBT_LOG_ISENABLED(mc_observer, xbt_log_priority_verbose) ? xbt::string_printf("%p", dst_buff_)
- : "(verbose only)");
- res += ", size=" + (XBT_LOG_ISENABLED(mc_observer, xbt_log_priority_verbose) ? std::to_string(*dst_buff_size_)
- : "(verbose only)");
- res += ")";
- return res;
}
-*/
} // namespace actor
} // namespace kernel