raft.h: Change types of raft_term, raft_index, raft_time and raft_id

Most of these types are encoded using 64bits but the old types only
promise being at least 64bits long, so in exotic cases information could
be lost during encoding. Changed to uint64_t, which has a fixed width.

Author: Mathieu Borderé

include/raft.h

@@ -1,6 +1,7 @@
 #ifndef RAFT_H
 #define RAFT_H
 
+#include <inttypes.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stddef.h>
@@ -48,22 +49,22 @@ enum {
  */
 RAFT_API const char *raft_strerror(int errnum);
 
-typedef unsigned long long raft_id;
+typedef uint64_t raft_id;
 
 /**
- * Hold the value of a raft term. Guaranteed to be at least 64-bit long.
+ * Hold the value of a raft term.
  */
-typedef unsigned long long raft_term;
+typedef uint64_t raft_term;
 
 /**
- * Hold the value of a raft entry index. Guaranteed to be at least 64-bit long.
+ * Hold the value of a raft entry index.
  */
-typedef unsigned long long raft_index;
+typedef uint64_t raft_index;
 
 /**
  * Hold a time value expressed in milliseconds since the epoch.
  */
-typedef unsigned long long raft_time;
+typedef uint64_t raft_time;
 
 /**
  * A data buffer.

src/client.c

@@ -36,7 +36,7 @@ int raft_apply(struct raft *r,
 
     /* Index of the first entry being appended. */
     index = logLastIndex(r->log) + 1;
-    tracef("%u commands starting at %lld", n, index);
+    tracef("%u commands starting at %"PRIu64, n, index);
     req->type = RAFT_COMMAND;
     req->index = index;
     req->cb = cb;
@@ -86,7 +86,7 @@ int raft_barrier(struct raft *r, struct raft_barrier *req, raft_barrier_cb cb)
 
     /* Index of the barrier entry being appended. */
     index = logLastIndex(r->log) + 1;
-    tracef("barrier starting at %lld", index);
+    tracef("barrier starting at %"PRIu64, index);
     req->type = RAFT_BARRIER;
     req->index = index;
     req->cb = cb;
@@ -180,7 +180,7 @@ int raft_add(struct raft *r,
         return rv;
     }
 
-    tracef("add server: id %llu, address %s", id, address);
+    tracef("add server: id %"PRIu64", address %s", id, address);
 
     /* Make a copy of the current configuration, and add the new server to
      * it. */
@@ -224,7 +224,7 @@ int raft_assign(struct raft *r,
     raft_index last_index;
     int rv;
 
-    tracef("raft_assign to id:%llu the role:%d", id, role);
+    tracef("raft_assign to id:%"PRIu64" the role:%d", id, role);
     if (role != RAFT_STANDBY && role != RAFT_VOTER && role != RAFT_SPARE) {
         rv = RAFT_BADROLE;
         ErrMsgFromCode(r->errmsg, rv);
@@ -239,7 +239,7 @@ int raft_assign(struct raft *r,
     server = configurationGet(&r->configuration, id);
     if (server == NULL) {
         rv = RAFT_NOTFOUND;
-        ErrMsgPrintf(r->errmsg, "no server has ID %llu", id);
+        ErrMsgPrintf(r->errmsg, "no server has ID %"PRIu64, id);
         goto err;
     }
 
@@ -305,7 +305,7 @@ int raft_assign(struct raft *r,
     rv = replicationProgress(r, server_index);
     if (rv != 0 && rv != RAFT_NOCONNECTION) {
         /* This error is not fatal. */
-        tracef("failed to send append entries to server %llu: %s (%d)",
+        tracef("failed to send append entries to server %"PRIu64": %s (%d)",
                server->id, raft_strerror(rv), rv);
     }
 
@@ -336,7 +336,7 @@ int raft_remove(struct raft *r,
         goto err;
     }
 
-    tracef("remove server: id %llu", id);
+    tracef("remove server: id %"PRIu64, id);
 
     /* Make a copy of the current configuration, and remove the given server
      * from it. */
@@ -403,7 +403,7 @@ int raft_transfer(struct raft *r,
     unsigned i;
     int rv;
 
-    tracef("transfer to %llu", id);
+    tracef("transfer to %016"PRIu64, id);
     if (r->state != RAFT_LEADER || r->transfer != NULL) {
         tracef("transfer error - state:%d", r->state);
         rv = RAFT_NOTLEADER;

src/configuration.c

@@ -345,7 +345,7 @@ void configurationTrace(const struct raft *r, struct raft_configuration *c, cons
     struct raft_server *s;
     for (i = 0; i < c->n; i++) {
         s = &c->servers[i];
-        tracef("id:%llu address:%s role:%d", s->id, s->address, s->role);
+        tracef("id:%"PRIu64" address:%s role:%d", s->id, s->address, s->role);
     }
     tracef("=== CONFIG END ===");
 }

src/convert.c

@@ -211,7 +211,7 @@ int convertToLeader(struct raft *r)
      * we are the only voter around. */
     size_t n_voters = configurationVoterCount(&r->configuration);
     if (n_voters == 1 && (r->last_stored > r->commit_index)) {
-        tracef("Apply log entries after self election %llu %llu", r->last_stored, r->commit_index);
+        tracef("Apply log entries after self election last_stored: %"PRIu64" commit_index:%"PRId64, r->last_stored, r->commit_index);
         r->commit_index = r->last_stored;
         rv = replicationApply(r);
     }

src/election.c

@@ -165,7 +165,7 @@ int electionStart(struct raft *r)
         rv = electionSend(r, server);
         if (rv != 0) {
             /* This is not a critical failure, let's just log it. */
-            tracef("failed to send vote request to server %llu: %s", server->id,
+            tracef("failed to send vote request to server %"PRIu64": %s", server->id,
                    raft_strerror(rv));
         }
     }
@@ -235,7 +235,7 @@ int electionVote(struct raft *r,
     if (args->last_log_term < local_last_term) {
         /* The requesting server has last entry's log term lower than ours. */
         tracef(
-            "local last entry %llu has term %llu higher than %llu -> not "
+            "local last entry %"PRIu64" has term %"PRId64" higher than %"PRId64" -> not "
             "granting",
             local_last_index, local_last_term, args->last_log_term);
         return 0;
@@ -244,7 +244,7 @@ int electionVote(struct raft *r,
     if (args->last_log_term > local_last_term) {
         /* The requesting server has a more up-to-date log. */
         tracef(
-            "remote last entry %llu has term %llu higher than %llu -> "
+            "remote last entry %"PRIu64" has term %"PRId64" higher than %"PRId64" -> "
             "granting vote",
             args->last_log_index, args->last_log_term, local_last_term);
         goto grant_vote;
@@ -277,7 +277,7 @@ int electionVote(struct raft *r,
         r->election_timer_start = r->io->time(r->io);
     }
 
-    tracef("vote granted to %llu", args->candidate_id);
+    tracef("vote granted to %"PRIu64, args->candidate_id);
     *granted = true;
 
     return 0;

src/fixture.c

@@ -990,7 +990,7 @@ static int serverInit(struct raft_fixture *f, unsigned i, struct raft_fsm *fsm)
     f->servers[i] = s;
     s->alive = true;
     s->id = i + 1;
-    sprintf(s->address, "%llu", s->id);
+    sprintf(s->address, "%"PRIu64, s->id);
     rv = ioInit(&s->io, i, &f->time);
     if (rv != 0) {
         return rv;
@@ -1182,7 +1182,7 @@ static bool updateLeaderAndCheckElectionSafety(struct raft_fixture *f)
 
             if (other->current_term == raft->current_term) {
                 fprintf(stderr,
-                        "server %llu and %llu are both leaders in term %llu",
+                        "server %"PRIu64" and %"PRId64" are both leaders in term %"PRId64,
                         raft->id, other->id, raft->current_term);
                 abort();
             }

src/membership.c

@@ -21,13 +21,13 @@ int membershipCanChangeConfiguration(struct raft *r)
     }
 
     if (r->configuration_uncommitted_index != 0) {
-        tracef("r->configuration_uncommitted_index %llu", r->configuration_uncommitted_index);
+        tracef("r->configuration_uncommitted_index %"PRIu64, r->configuration_uncommitted_index);
         rv = RAFT_CANTCHANGE;
         goto err;
     }
 
     if (r->leader_state.promotee_id != 0) {
-        tracef("r->leader_state.promotee_id %llu", r->leader_state.promotee_id);
+        tracef("r->leader_state.promotee_id %"PRIu64, r->leader_state.promotee_id);
         rv = RAFT_CANTCHANGE;
         goto err;
     }
@@ -75,7 +75,7 @@ bool membershipUpdateCatchUpRound(struct raft *r)
     /* If the server did not reach the target index for this round, it did not
      * catch up. */
     if (match_index < r->leader_state.round_index) {
-        tracef("member (index: %u) not yet caught up match_index:%llu round_index:%llu",
+        tracef("member (index: %u) not yet caught up match_index:%"PRIu64" round_index:%"PRId64,
                 server_index, match_index, r->leader_state.round_index);
         return false;
     }
@@ -125,7 +125,7 @@ int membershipUncommittedChange(struct raft *r,
 
     rv = configurationDecode(&entry->buf, &configuration);
     if (rv != 0) {
-        tracef("failed to decode configuration at index:%llu", index);
+        tracef("failed to decode configuration at index:%"PRIu64, index);
         goto err;
     }
     configurationTrace(r, &configuration, "uncommitted config change");
@@ -209,7 +209,7 @@ int membershipLeadershipTransferStart(struct raft *r)
     r->transfer->send.data = r;
     rv = r->io->send(r->io, &r->transfer->send, &message, NULL);
     if (rv != 0) {
-        ErrMsgTransferf(r->io->errmsg, r->errmsg, "send timeout now to %llu",
+        ErrMsgTransferf(r->io->errmsg, r->errmsg, "send timeout now to %"PRIu64,
                         server->id);
         return rv;
     }

src/progress.c

@@ -235,7 +235,7 @@ bool progressMaybeDecrement(struct raft *r,
     /* The rejection must be stale or spurious if the rejected index does not
      * match the next index minus one. */
     if (rejected != p->next_index - 1) {
-        tracef("rejected index %llu different from next index %lld -> ignore ",
+        tracef("rejected index %"PRIu64" different from next index %"PRId64" -> ignore ",
                rejected, p->next_index);
         return false;
     }

src/recv.c

@@ -119,7 +119,7 @@ int recvBumpCurrentTerm(struct raft *r, raft_term term)
     assert(r != NULL);
     assert(term > r->current_term);
 
-    sprintf(msg, "remote term %lld is higher than %lld -> bump local term",
+    sprintf(msg, "remote term %"PRIu64" is higher than %"PRId64" -> bump local term",
             term, r->current_term);
     if (r->state != RAFT_FOLLOWER) {
         strcat(msg, " and step down");
@@ -165,7 +165,7 @@ int recvEnsureMatchingTerms(struct raft *r, raft_term term, int *match)
     recvCheckMatchingTerms(r, term, match);
 
     if (*match == -1) {
-        tracef("old term - current_term:%llu other_term:%llu", r->current_term, term);
+        tracef("old term - current_term:%"PRIu64" other_term:%"PRId64, r->current_term, term);
         return 0;
     }
 

src/recv_append_entries.c

@@ -33,8 +33,10 @@ int recvAppendEntries(struct raft *r,
     assert(id > 0);
     assert(args != NULL);
     assert(address != NULL);
-    tracef("self:%llu from:%llu@%s leader_commit:%llu n_entries:%d prev_log_index:%llu prev_log_term:%llu, term:%llu",
-            r->id, id, address, args->leader_commit, args->n_entries, args->prev_log_index, args->prev_log_term, args->term);
+    tracef("self:%"PRIu64" from:%"PRId64"@%s leader_commit:%"PRId64" n_entries:%d "
+    	    "prev_log_index:%"PRIu64" prev_log_term:%"PRId64", term:%"PRId64,
+            r->id, id, address, args->leader_commit, args->n_entries,
+            args->prev_log_index, args->prev_log_term, args->term);
 
     result->rejected = args->prev_log_index;
     result->last_log_index = logLastIndex(r->log);

src/recv_append_entries_result.c

@@ -21,7 +21,7 @@ int recvAppendEntriesResult(struct raft *r,
     assert(address != NULL);
     assert(result != NULL);
 
-    tracef("self:%llu from:%llu@%s last_log_index:%llu rejected:%llu term:%llu",
+    tracef("self:%"PRIu64" from:%"PRId64"@%s last_log_index:%"PRId64" rejected:%"PRId64" term:%"PRId64,
             r->id, id, address, result->last_log_index, result->rejected, result->term);
 
     if (r->state != RAFT_LEADER) {

src/recv_install_snapshot.c

@@ -28,7 +28,7 @@ int recvInstallSnapshot(struct raft *r,
     bool async;
 
     assert(address != NULL);
-    tracef("self:%llu from:%llu@%s conf_index:%llu last_index:%llu last_term:%llu term:%llu",
+    tracef("self:%"PRIu64" from:%"PRId64"@%s conf_index:%"PRId64" last_index:%"PRId64" last_term:%"PRId64" term:%"PRId64,
             r->id, id, address, args->conf_index, args->last_index, args->last_term, args->term);
 
     result->rejected = args->last_index;

src/recv_request_vote.c

@@ -29,8 +29,8 @@ int recvRequestVote(struct raft *r,
     assert(id > 0);
     assert(args != NULL);
 
-    tracef("self:%llu from:%llu@%s candidate_id:%llu disrupt_leader:%d last_log_index:%llu "
-           "last_log_term:%llu pre_vote:%d term:%llu",
+    tracef("self:%"PRIu64" from:%"PRId64"@%s candidate_id:%"PRId64" disrupt_leader:%d last_log_index:%"PRId64
+           " last_log_term:%"PRIu64" pre_vote:%d term:%"PRId64,
            r->id, id, address, args->candidate_id, args->disrupt_leader, args->last_log_index,
            args->last_log_term, args->pre_vote, args->term);
     result->vote_granted = false;
@@ -89,7 +89,7 @@ int recvRequestVote(struct raft *r,
      * same as the request term (otherwise we would have rejected the request or
      * bumped our term). */
     if (!args->pre_vote) {
-        tracef("no pre_vote: current_term:%llu term:%llu", r->current_term, args->term);
+        tracef("no pre_vote: current_term:%"PRIu64" term:%"PRId64, r->current_term, args->term);
         assert(r->current_term == args->term);
     }
 

src/recv_request_vote_result.c

@@ -24,7 +24,7 @@ int recvRequestVoteResult(struct raft *r,
     assert(r != NULL);
     assert(id > 0);
 
-    tracef("self:%llu from:%llu@%s term:%llu vote_granted:%d pre_vote:%d",
+    tracef("self:%"PRIu64" from:%"PRId64"@%s term:%"PRId64" vote_granted:%d pre_vote:%d",
     	    r->id, id, address, result->term, result->vote_granted, result->pre_vote);
     votes_index = configurationIndexOfVoter(&r->configuration, id);
     if (votes_index == r->configuration.n) {

src/recv_timeout_now.c

@@ -26,7 +26,8 @@ int recvTimeoutNow(struct raft *r,
 
     (void)address;
 
-    tracef("self:%llu from:%llu@%s last_log_index:%llu last_log_term:%llu term:%llu", r->id, id, address, args->last_log_index, args->last_log_term, args->term);
+    tracef("self:%"PRIu64" from:%"PRId64"@%s last_log_index:%"PRId64" last_log_term:%"PRId64" term:%"PRId64,
+    	    r->id, id, address, args->last_log_index, args->last_log_term, args->term);
     /* Ignore the request if we are not voters. */
     local_server = configurationGet(&r->configuration, r->id);
     if (local_server == NULL || local_server->role != RAFT_VOTER) {
@@ -38,7 +39,7 @@ int recvTimeoutNow(struct raft *r,
      * leader. */
     if (r->state != RAFT_FOLLOWER ||
         r->follower_state.current_leader.id != id) {
-        tracef("Ignore - r->state:%d current_leader.id:%llu", r->state, r->follower_state.current_leader.id);
+        tracef("Ignore - r->state:%d current_leader.id:%"PRIu64, r->state, r->follower_state.current_leader.id);
         return 0;
     }