From e2d5460e11954006dceb228527eb5ed39a292ab9 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Fri, 16 Oct 2020 23:11:41 +0200 Subject: [PATCH] Keep the right definition for type_names[]. --- examples/c/app-bittorrent/bittorrent-peer.c | 11 ++++++----- examples/s4u/app-bittorrent/s4u-peer.cpp | 13 ++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/examples/c/app-bittorrent/bittorrent-peer.c b/examples/c/app-bittorrent/bittorrent-peer.c index 408d3f136d..b015c813a3 100644 --- a/examples/c/app-bittorrent/bittorrent-peer.c +++ b/examples/c/app-bittorrent/bittorrent-peer.c @@ -26,6 +26,9 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(bittorrent_peers, "Messages specific for the peers" #define SLEEP_DURATION 1 #define BITS_TO_BYTES(x) (((x) / 8 + (x) % 8) ? 1 : 0) +const char* const message_type_names[10] = {"HANDSHAKE", "CHOKE", "UNCHOKE", "INTERESTED", "NOTINTERESTED", + "HAVE", "BITFIELD", "REQUEST", "PIECE", "CANCEL"}; + #ifndef MIN #define MIN(a, b) ((a) < (b) ? (a) : (b)) #endif @@ -173,8 +176,7 @@ void send_handshake_to_all_peers(const_peer_t peer) void send_message(const_peer_t peer, sg_mailbox_t mailbox, e_message_type type, uint64_t size) { - const char* type_names[6] = {"HANDSHAKE", "CHOKE", "UNCHOKE", "INTERESTED", "NOTINTERESTED", "CANCEL"}; - XBT_DEBUG("Sending %s to %s", type_names[type], sg_mailbox_get_name(mailbox)); + XBT_DEBUG("Sending %s to %s", message_type_names[type], sg_mailbox_get_name(mailbox)); message_t message = message_other_new(type, peer->id, peer->mailbox, peer->bitfield); sg_comm_t comm = sg_mailbox_put_init(mailbox, message, size); sg_comm_detach(comm, NULL); @@ -364,9 +366,8 @@ void update_active_peers_set(const s_peer_t* peer, connection_t remote_peer) /** @brief Handle a received message sent by another peer */ void handle_message(peer_t peer, message_t message) { - const char* type_names[10] = {"HANDSHAKE", "CHOKE", "UNCHOKE", "INTERESTED", "NOTINTERESTED", - "HAVE", "BITFIELD", "REQUEST", "PIECE", "CANCEL"}; - XBT_DEBUG("Received a %s message from %s", type_names[message->type], sg_mailbox_get_name(message->return_mailbox)); + XBT_DEBUG("Received a %s message from %s", message_type_names[message->type], + sg_mailbox_get_name(message->return_mailbox)); connection_t remote_peer = xbt_dict_get_or_null_ext(peer->connected_peers, (char*)&message->peer_id, sizeof(int)); xbt_assert(remote_peer != NULL || message->type == MESSAGE_HANDSHAKE, diff --git a/examples/s4u/app-bittorrent/s4u-peer.cpp b/examples/s4u/app-bittorrent/s4u-peer.cpp index 2fa42dc4f5..67b6516754 100644 --- a/examples/s4u/app-bittorrent/s4u-peer.cpp +++ b/examples/s4u/app-bittorrent/s4u-peer.cpp @@ -26,6 +26,9 @@ constexpr unsigned long BLOCKS_REQUESTED = 2UL; constexpr double SLEEP_DURATION = 1.0; #define BITS_TO_BYTES(x) (((x) / 8 + (x) % 8) ? 1 : 0) +constexpr std::array message_type_names{ + {"HANDSHAKE", "CHOKE", "UNCHOKE", "INTERESTED", "NOTINTERESTED", "HAVE", "BITFIELD", "REQUEST", "PIECE", "CANCEL"}}; + Peer::Peer(std::vector args) { // Check arguments @@ -115,9 +118,7 @@ void Peer::sendHandshakeToAllPeers() void Peer::sendMessage(simgrid::s4u::Mailbox* mailbox, e_message_type type, uint64_t size) { - constexpr std::array type_names{ - {"HANDSHAKE", "CHOKE", "UNCHOKE", "INTERESTED", "NOTINTERESTED", "CANCEL"}}; - XBT_DEBUG("Sending %s to %s", type_names[type], mailbox->get_cname()); + XBT_DEBUG("Sending %s to %s", message_type_names.at(type), mailbox->get_cname()); mailbox->put_init(new Message(type, id, bitfield_, mailbox_), size)->detach(); } @@ -285,10 +286,8 @@ void Peer::updateActivePeersSet(Connection* remote_peer) void Peer::handleMessage() { - constexpr std::array type_names{{"HANDSHAKE", "CHOKE", "UNCHOKE", "INTERESTED", "NOTINTERESTED", - "HAVE", "BITFIELD", "REQUEST", "PIECE", "CANCEL"}}; - - XBT_DEBUG("Received a %s message from %s", type_names[message->type], message->return_mailbox->get_cname()); + XBT_DEBUG("Received a %s message from %s", message_type_names.at(message->type), + message->return_mailbox->get_cname()); auto known_peer = connected_peers.find(message->peer_id); Connection* remote_peer = (known_peer == connected_peers.end()) ? nullptr : &known_peer->second; -- 2.20.1