Skip to content

Commit

Permalink
fix pisces empty epoch bug
Browse files Browse the repository at this point in the history
  • Loading branch information
jjwilke committed Sep 28, 2020
1 parent 0a5c150 commit 7758fbf
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 7 deletions.
50 changes: 43 additions & 7 deletions sstmac/hardware/pisces/pisces_arbitrator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -50,24 +50,31 @@ Questions? Contact [email protected]
#define one_indent " "
#define two_indent " "

#if 0
#if PISCES_DEBUG_INDIVIDUAL_HISTORY
#define dprintf(flag, ...) \
history_.push_back(sprockit::sprintf(__VA_ARGS__))
#else
#define dprintf(flag, ...) debug_printf(flag, __VA_ARGS__)
#endif

#if PISCES_DETAILED_DEBUG
#define pflow_arb_debug_printf_l0(format_str, ...) \
debug_printf(sprockit::dbg::pisces, \
dprintf(sprockit::dbg::pisces, \
" [arbitrator] " format_str , \
__VA_ARGS__)

#define pflow_arb_debug_printf_l1(format_str, ...) \
debug_printf(sprockit::dbg::pisces, \
dprintf(sprockit::dbg::pisces, \
one_indent " [arbitrator] " format_str , \
__VA_ARGS__)

#define pflow_arb_debug_printf_l2(format_str, ...) \
debug_printf(sprockit::dbg::pisces, \
dprintf(sprockit::dbg::pisces, \
two_indent " [arbitrator] " format_str , \
__VA_ARGS__)

#define pflow_arb_debug_print_l2(format_str) \
debug_printf(sprockit::dbg::pisces, \
dprintf(sprockit::dbg::pisces, \
two_indent " [arbitrator] " format_str "%s", "")
#else
#define pflow_arb_debug_printf_l0(format_str, ...)
Expand Down Expand Up @@ -188,6 +195,10 @@ PiscesCutThroughArbitrator::clearOut(Timestamp now)
cut_through_epoch_debug("clearing at %9.5e", now.sec());
Timestamp end = epoch->start + epoch->numCycles * cycleLength_;
if (now <= epoch->start){
if (!epoch->next){
//this is the last epoch, restore it to full size
epoch->numCycles = std::numeric_limits<uint32_t>::max();
}
return;
} else if (now < end){
if (epoch->next){
Expand All @@ -205,6 +216,16 @@ PiscesCutThroughArbitrator::clearOut(Timestamp now)
Epoch* next = epoch->next;
delete epoch;
head_ = next;
#if SSTMAC_SANITY_CHECK
if (head_ == nullptr){
#if PISCES_DEBUG_INDIVIDUAL_HISTORY
for (auto& str : history_){
std::cerr << str << std::endl;
}
#endif
spkt_abort_printf("internal error: head epoch is null in PiscesCutThroughArbitrator");
}
#endif
epoch = next;
} else {
//this is the last epoch - restore it to "full size"
Expand All @@ -223,6 +244,16 @@ PiscesCutThroughArbitrator::advance(Epoch* epoch, Epoch* prev)
if (prev) prev->next = epoch->next;
else head_ = next;
delete epoch;
#if SSTMAC_SANITY_CHECK
if (head_ == nullptr){
#if PISCES_DEBUG_INDIVIDUAL_HISTORY
for (auto& str : history_){
std::cerr << str << std::endl;
}
#endif
spkt_abort_printf("internal error: head epoch is null in PiscesCutThroughArbitrator");
}
#endif
return next;
}

Expand All @@ -232,7 +263,7 @@ PiscesCutThroughArbitrator::arbitrate(IncomingPacket &st)
pflow_arb_debug_printf_l0("Cut-through: arbitrator %p starting packet %p:%llu of size %u with byte_delay=%9.5e epoch_delay=%9.5e start=%9.5e: %s",
this, st.pkt, st.pkt->flowId(), st.pkt->numBytes(), st.pkt->byteDelay().sec(),
byteDelay_.sec(), st.now.sec(),
(st.pkt->orig() ? sprockit::toString(st.pkt->orig()).c_str() : "null payload"));
(st.pkt->flow() ? sprockit::toString(st.pkt->flow()).c_str() : "null payload"));

#define PRINT_EPOCHS 0
#if PRINT_EPOCHS
Expand All @@ -257,6 +288,11 @@ PiscesCutThroughArbitrator::arbitrate(IncomingPacket &st)
while (bytesLeft > 2){ //we often end up with 1,2 byte stragglers - ignore them for efficiency
#if SSTMAC_SANITY_CHECK
if (!epoch){
#if PISCES_DEBUG_INDIVIDUAL_HISTORY
for (auto& str : history_){
std::cerr << str << std::endl;
}
#endif
spkt_abort_printf("ran out of epochs on arbitrator %p: this should not be possible", this);
}
#endif
Expand All @@ -265,7 +301,7 @@ PiscesCutThroughArbitrator::arbitrate(IncomingPacket &st)
if (st.pkt->byteDelay() <= cycleLength_){
//every cycle gets used, arriving faster than leaving
if (epoch->numCycles <= bytesLeft){
cut_through_arb_debug_noargs("used all cycles")
cut_through_arb_debug_noargs("used all cycles");
//epoch is completely busy
bytesSent += epoch->numCycles;
bytesLeft -= epoch->numCycles;
Expand Down
6 changes: 6 additions & 0 deletions sstmac/hardware/pisces/pisces_arbitrator.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ Questions? Contact [email protected]
#include <sprockit/factory.h>
#include <sstmac/hardware/noise/noise.h>

#define PISCES_DEBUG_INDIVIDUAL_HISTORY 0
#define PISCES_DETAILED_DEBUG 0

namespace sstmac {
namespace hw {

Expand Down Expand Up @@ -99,6 +102,9 @@ class PiscesBandwidthArbitrator

protected:
TimeDelta byteDelay_;
#if PISCES_DEBUG_INDIVIDUAL_HISTORY
std::vector<std::string> history_;
#endif

};

Expand Down

0 comments on commit 7758fbf

Please sign in to comment.