[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 01/02: rps profiler: generate output for randomnes
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [gnunet] 01/02: rps profiler: generate output for randomness tests |
|
Date: |
Tue, 12 Jun 2018 23:08:44 +0200 |
This is an automated email from the git hooks/post-receive script.
julius-buenger pushed a commit to branch master
in repository gnunet.
commit f24f95b6664f5e1d2a8e3cd6d03c957b0d2efd74
Author: Julius Bünger <address@hidden>
AuthorDate: Tue Jun 12 23:03:47 2018 +0200
rps profiler: generate output for randomness tests
---
src/rps/gnunet-rps-profiler.c | 21 +++-
src/rps/rps-test_util.c | 219 +++++++++++++++++++++++++++++++++++++++---
src/rps/rps-test_util.h | 8 +-
3 files changed, 233 insertions(+), 15 deletions(-)
diff --git a/src/rps/gnunet-rps-profiler.c b/src/rps/gnunet-rps-profiler.c
index 5ef42187f..4a7a89b15 100644
--- a/src/rps/gnunet-rps-profiler.c
+++ b/src/rps/gnunet-rps-profiler.c
@@ -42,6 +42,11 @@
static uint32_t num_peers;
/**
+ * @brief numer of bits required to represent the largest peer id
+ */
+static unsigned bits_needed;
+
+/**
* How long do we run the test?
* In seconds.
*/
@@ -1698,6 +1703,7 @@ profiler_reply_handle (void *cls,
char *file_name;
char *file_name_dh;
char *file_name_dhr;
+ char *file_name_dhru;
unsigned int i;
struct PendingReply *pending_rep = (struct PendingReply *) cls;
@@ -1706,6 +1712,7 @@ profiler_reply_handle (void *cls,
file_name = "/tmp/rps/received_ids";
file_name_dh = "/tmp/rps/diehard_input";
file_name_dhr = "/tmp/rps/diehard_input_raw";
+ file_name_dhru = "/tmp/rps/diehard_input_raw_aligned";
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"[%s] got %" PRIu64 " peers:\n",
GNUNET_i2s (rps_peer->peer_id),
@@ -1725,8 +1732,12 @@ profiler_reply_handle (void *cls,
"%" PRIu32 "\n",
(uint32_t) rcv_rps_peer->index);
to_file_raw (file_name_dhr,
- &rcv_rps_peer->index,
+ (char *) &rcv_rps_peer->index,
sizeof (uint32_t));
+ to_file_raw_unaligned (file_name_dhru,
+ (char *) &rcv_rps_peer->index,
+ sizeof (uint32_t),
+ bits_needed);
}
default_reply_handle (cls, n, recv_peers);
}
@@ -2626,6 +2637,14 @@ run (void *cls,
GNUNET_DISK_directory_create ("/tmp/rps/");
timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
timeout_s);
+ /* Compute number of bits for representing largest peer id */
+ for (bits_needed = 1; (bits_needed << 1) < num_peers - 1; bits_needed++)
+ ;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Need %u bits to represent largest peer id %" PRIu32 "\n",
+ bits_needed,
+ num_peers - 1);
+
rps_peers = GNUNET_new_array (num_peers, struct RPSPeer);
peer_map = GNUNET_CONTAINER_multipeermap_create (num_peers, GNUNET_NO);
rps_peer_ids = GNUNET_new_array (num_peers, struct GNUNET_PeerIdentity);
diff --git a/src/rps/rps-test_util.c b/src/rps/rps-test_util.c
index ea55deac5..64ef5b986 100644
--- a/src/rps/rps-test_util.c
+++ b/src/rps/rps-test_util.c
@@ -29,13 +29,37 @@
#include <inttypes.h>
-#define LOG(kind, ...) GNUNET_log_from(kind,"rps-sampler",__VA_ARGS__)
+#define LOG(kind, ...) GNUNET_log_from(kind,"rps-test_util",__VA_ARGS__)
#ifndef TO_FILE
#define TO_FILE
#endif /* TO_FILE */
#ifdef TO_FILE
+
+#define B2B_PAT "%c%c%c%c%c%c%c%c"
+#define B2B(byte) \
+ (byte & 0x80 ? '1' : '0'), \
+ (byte & 0x40 ? '1' : '0'), \
+ (byte & 0x20 ? '1' : '0'), \
+ (byte & 0x10 ? '1' : '0'), \
+ (byte & 0x08 ? '1' : '0'), \
+ (byte & 0x04 ? '1' : '0'), \
+ (byte & 0x02 ? '1' : '0'), \
+ (byte & 0x01 ? '1' : '0')
+
+#define min(x,y) ((x) > (y) ? (y) : (x))
+
+/**
+ * @brief buffer for storing the unaligned bits for the next write
+ */
+static char buf_unaligned;
+
+/**
+ * @brief number of bits in unaligned buffer
+ */
+static unsigned num_bits_buf_unaligned;
+
void
to_file_ (const char *file_name, char *line)
{
@@ -108,11 +132,10 @@ to_file_ (const char *file_name, char *line)
}
void
-to_file_raw (const char *file_name, void *buf, size_t size_buf)
+to_file_raw (const char *file_name, const char *buf, size_t size_buf)
{
struct GNUNET_DISK_FileHandle *f;
- size_t size2;
-
+ size_t size_written;
if (NULL == (f = GNUNET_DISK_file_open (file_name,
GNUNET_DISK_OPEN_APPEND |
@@ -129,13 +152,13 @@ to_file_raw (const char *file_name, void *buf, size_t
size_buf)
return;
}
- size2 = GNUNET_DISK_file_write (f, buf, size_buf);
- if (size_buf != size2)
+ size_written = GNUNET_DISK_file_write (f, buf, size_buf);
+ if (size_buf != size_written)
{
LOG (GNUNET_ERROR_TYPE_WARNING,
- "Unable to write to file! (Size: %u, size2: %u)\n",
+ "Unable to write to file! (Size: %u, size_written: %u)\n",
size_buf,
- size2);
+ size_written);
if (GNUNET_YES != GNUNET_DISK_file_close (f))
LOG (GNUNET_ERROR_TYPE_WARNING,
@@ -143,15 +166,185 @@ to_file_raw (const char *file_name, void *buf, size_t
size_buf)
return;
}
+}
- //if (512 < size_buf)
+void
+to_file_raw_unaligned (const char *file_name,
+ const char *buf,
+ size_t size_buf,
+ unsigned bits_needed)
+{
+ // TODO endianness!
+ GNUNET_assert (size_buf >= (bits_needed/8));
+ //if (0 == num_bits_buf_unaligned)
//{
- // GNUNET_free (output_buffer_p);
+ // if (0 == (bits_needed % 8))
+ // {
+ // to_file_raw (file_name, buf, size_buf);
+ // return;
+ // }
+ // to_file_raw (file_name, buf, size_buf - 1);
+ // buf_unaligned = buf[size_buf - 1];
+ // num_bits_buf_unaligned = bits_needed % 8;
+ // return;
//}
- //if (GNUNET_YES != GNUNET_DISK_file_close (f))
- // LOG (GNUNET_ERROR_TYPE_WARNING,
- // "Unable to close file\n");
+ char buf_write[size_buf + 1];
+ const unsigned bytes_iter = (0 != bits_needed % 8?
+ (bits_needed/8)+1:
+ bits_needed/8);
+ // TODO what if no iteration happens?
+ unsigned size_buf_write = 0;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "num_bits_buf_unaligned: %u\n",
+ num_bits_buf_unaligned);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "ua args: size_buf: %u, bits_needed: %u -> iter: %u\n",
+ size_buf,
+ bits_needed,
+ bytes_iter);
+ buf_write[0] = buf_unaligned;
+ /* Iterate over input bytes */
+ for (unsigned i = 0; i < bytes_iter; i++)
+ {
+ /* Number of bits needed in this iteration - 8 for all except last iter */
+ unsigned num_bits_needed_iter;
+ /* Mask for bits to actually use */
+ unsigned mask_bits_needed_iter;
+ char byte_input;
+ /* Number of bits needed to align unaligned byte */
+ unsigned num_bits_to_align;
+ /* Number of bits that are to be moved */
+ unsigned num_bits_to_move;
+ /* Mask for bytes to be moved */
+ char mask_input_to_move;
+ /* Masked bits to be moved */
+ char bits_to_move;
+ /* The amount of bits needed to fit the bits to shift to the nearest spot
*/
+ unsigned distance_shift_bits;
+ /* Shifted bits on the move */
+ char bits_moving;
+ /* (unaligned) byte being filled with bits */
+ char byte_to_fill;
+ /* mask for needed bits of the input byte that have not been moved */
+ char mask_input_leftover;
+ /* needed bits of the input byte that have not been moved */
+ char byte_input_leftover;
+ unsigned num_bits_leftover;
+ unsigned num_bits_discard;
+ char byte_unaligned_new;
+
+ if ( (bits_needed - (i * 8)) <= 8)
+ {
+ /* last iteration */
+ num_bits_needed_iter = bits_needed - (i * 8);
+ }
+ else
+ {
+ num_bits_needed_iter = 8;
+ }
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "number of bits needed in this iteration: %u\n",
+ num_bits_needed_iter);
+ mask_bits_needed_iter = ((char) 1 << num_bits_needed_iter) - 1;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "mask needed bits (current iter): "B2B_PAT"\n",
+ B2B(mask_bits_needed_iter));
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Unaligned byte: "B2B_PAT" (%u bits)\n",
+ B2B(buf_unaligned),
+ num_bits_buf_unaligned);
+ byte_input = buf[i];
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "next whole input byte: "B2B_PAT"\n",
+ B2B(byte_input));
+ byte_input &= mask_bits_needed_iter;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "input byte, needed bits: "B2B_PAT"\n",
+ B2B(byte_input));
+ num_bits_to_align = 8 - num_bits_buf_unaligned;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "number of bits needed to align unaligned bit: %u\n",
+ num_bits_to_align);
+ num_bits_to_move = min (num_bits_to_align, num_bits_needed_iter);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "number of bits of new byte to move: %u\n",
+ num_bits_to_move);
+ mask_input_to_move = ((char) 1 << num_bits_to_move) - 1;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "mask of bits of new byte to take for moving: "B2B_PAT"\n",
+ B2B(mask_input_to_move));
+ bits_to_move = byte_input & mask_input_to_move;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "masked bits of new byte to take for moving: "B2B_PAT"\n",
+ B2B(bits_to_move));
+ distance_shift_bits = num_bits_buf_unaligned;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "distance needed to shift bits to their correct spot: %u\n",
+ distance_shift_bits);
+ bits_moving = bits_to_move << distance_shift_bits;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "shifted, masked bits of new byte being moved: "B2B_PAT"\n",
+ B2B(bits_moving));
+ byte_to_fill = buf_unaligned | bits_moving;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "byte being filled: "B2B_PAT"\n",
+ B2B(byte_to_fill));
+ if (num_bits_buf_unaligned + num_bits_needed_iter > 8)
+ {
+ /* buf_unaligned was aligned by filling
+ * -> can be written to storage */
+ buf_write[i] = byte_to_fill;
+ size_buf_write++;
+
+ /* store the leftover, unaligned bits in buffer */
+ mask_input_leftover = mask_bits_needed_iter & (~ mask_input_to_move);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "mask of leftover bits of new byte: "B2B_PAT"\n",
+ B2B(mask_input_leftover));
+ byte_input_leftover = byte_input & mask_input_leftover;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "masked, leftover bits of new byte: "B2B_PAT"\n",
+ B2B(byte_input_leftover));
+ num_bits_leftover = num_bits_needed_iter - num_bits_to_move;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "number of unaligned bits left: %u\n",
+ num_bits_leftover);
+ num_bits_discard = 8 - num_bits_needed_iter;
+ byte_unaligned_new = byte_input_leftover >> num_bits_to_move;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "new unaligned byte: "B2B_PAT"\n",
+ B2B(byte_unaligned_new));
+ buf_unaligned = byte_unaligned_new;
+ num_bits_buf_unaligned = num_bits_leftover % 8;
+ }
+ else
+ {
+ /* unaligned buffer still unaligned but 'fuller' */
+ buf_unaligned = byte_to_fill;
+ num_bits_buf_unaligned = (num_bits_buf_unaligned + bits_needed) % 8;
+ }
+ ///* Byte to be completed will consist of what is left in the unaligned
+ // * byte and the rest of the input byte */
+ //LOG (GNUNET_ERROR_TYPE_DEBUG,
+ // "ua: %u - %x, %x << %u = %x\n",
+ // i,
+ // buf_unaligned,
+ // num_bits_buf_unaligned,
+ // (char) ((char) buf_unaligned << num_bits_buf_unaligned));
+ //buf_write[i] = buf_write[i] |
+ // (char) ((char) buf_unaligned << num_bits_buf_unaligned);
+ //LOG (GNUNET_ERROR_TYPE_DEBUG,
+ // "ua: %x\n",
+ // buf_write[i]);
+ //buf_unaligned = buf[i] >> num_bits_buf_unaligned;
+ //LOG (GNUNET_ERROR_TYPE_DEBUG,
+ // "ua: %x\n"
+ // "---\n",
+ // buf_unaligned);
+ }
+ to_file_raw (file_name, buf_write, size_buf_write);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "\n");
}
char *
diff --git a/src/rps/rps-test_util.h b/src/rps/rps-test_util.h
index d42422750..577a2b0a7 100644
--- a/src/rps/rps-test_util.h
+++ b/src/rps/rps-test_util.h
@@ -75,7 +75,13 @@ store_prefix_file_name (const struct GNUNET_PeerIdentity
*peer,
const char *prefix);
void
-to_file_raw (const char *file_name, void *buf, size_t size_buf);
+to_file_raw (const char *file_name, const char *buf, size_t size_buf);
+
+void
+to_file_raw_unaligned (const char *file_name,
+ const char *buf,
+ size_t size_buf,
+ unsigned bits_needed);
#endif /* RPS_TEST_UTIL_H */
/* end of gnunet-service-rps.c */
--
To stop receiving notification emails like this one, please contact
address@hidden