diff options
author | Gabor X Toth <*@tg-x.net> | 2016-08-20 17:39:50 +0000 |
---|---|---|
committer | Gabor X Toth <*@tg-x.net> | 2016-08-20 17:39:50 +0000 |
commit | 88c23c83c71ff83bd67ce371176531a99a1be8d3 (patch) | |
tree | e63bfe1b69a57db5fde2ed23c5599360457d2a6d /src/psyc | |
parent | d3e09b0fc04a2cf632271ff986c2411d76e4a9de (diff) | |
download | gnunet-88c23c83c71ff83bd67ce371176531a99a1be8d3.tar.gz gnunet-88c23c83c71ff83bd67ce371176531a99a1be8d3.zip |
test_psyc: log level
Diffstat (limited to 'src/psyc')
-rw-r--r-- | src/psyc/test_psyc.c | 88 |
1 files changed, 46 insertions, 42 deletions
diff --git a/src/psyc/test_psyc.c b/src/psyc/test_psyc.c index 4bcf90fc9..d1846b8cc 100644 --- a/src/psyc/test_psyc.c +++ b/src/psyc/test_psyc.c | |||
@@ -192,7 +192,7 @@ end_normally (void *cls) | |||
192 | static void | 192 | static void |
193 | end () | 193 | end () |
194 | { | 194 | { |
195 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Ending tests.\n"); | 195 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Ending tests.\n"); |
196 | 196 | ||
197 | if (end_badly_task != NULL) | 197 | if (end_badly_task != NULL) |
198 | { | 198 | { |
@@ -208,7 +208,7 @@ static void | |||
208 | master_message_cb (void *cls, const struct GNUNET_PSYC_MessageHeader *msg) | 208 | master_message_cb (void *cls, const struct GNUNET_PSYC_MessageHeader *msg) |
209 | { | 209 | { |
210 | GNUNET_assert (NULL != msg); | 210 | GNUNET_assert (NULL != msg); |
211 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 211 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
212 | "Test #%d: Master got PSYC message fragment of size %u " | 212 | "Test #%d: Master got PSYC message fragment of size %u " |
213 | "belonging to message ID %" PRIu64 " with flags %x\n", | 213 | "belonging to message ID %" PRIu64 " with flags %x\n", |
214 | test, ntohs (msg->header.size), | 214 | test, ntohs (msg->header.size), |
@@ -229,7 +229,7 @@ master_message_part_cb (void *cls, const struct GNUNET_PSYC_MessageHeader *msg, | |||
229 | uint16_t type = ntohs (pmsg->type); | 229 | uint16_t type = ntohs (pmsg->type); |
230 | uint16_t size = ntohs (pmsg->size); | 230 | uint16_t size = ntohs (pmsg->size); |
231 | 231 | ||
232 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 232 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
233 | "Test #%d: Master got message part of type %u and size %u " | 233 | "Test #%d: Master got message part of type %u and size %u " |
234 | "belonging to message ID %" PRIu64 " with flags %x\n", | 234 | "belonging to message ID %" PRIu64 " with flags %x\n", |
235 | test, type, size, message_id, flags); | 235 | test, type, size, message_id, flags); |
@@ -278,7 +278,7 @@ static void | |||
278 | slave_message_cb (void *cls, const struct GNUNET_PSYC_MessageHeader *msg) | 278 | slave_message_cb (void *cls, const struct GNUNET_PSYC_MessageHeader *msg) |
279 | { | 279 | { |
280 | GNUNET_assert (NULL != msg); | 280 | GNUNET_assert (NULL != msg); |
281 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 281 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
282 | "Test #%d: Slave got PSYC message fragment of size %u " | 282 | "Test #%d: Slave got PSYC message fragment of size %u " |
283 | "belonging to message ID %" PRIu64 " with flags %x\n", | 283 | "belonging to message ID %" PRIu64 " with flags %x\n", |
284 | test, ntohs (msg->header.size), | 284 | test, ntohs (msg->header.size), |
@@ -300,7 +300,7 @@ slave_message_part_cb (void *cls, | |||
300 | uint16_t type = ntohs (pmsg->type); | 300 | uint16_t type = ntohs (pmsg->type); |
301 | uint16_t size = ntohs (pmsg->size); | 301 | uint16_t size = ntohs (pmsg->size); |
302 | 302 | ||
303 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 303 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
304 | "Test #%d: Slave got message part of type %u and size %u " | 304 | "Test #%d: Slave got message part of type %u and size %u " |
305 | "belonging to message ID %" PRIu64 " with flags %x\n", | 305 | "belonging to message ID %" PRIu64 " with flags %x\n", |
306 | test, type, size, message_id, flags); | 306 | test, type, size, message_id, flags); |
@@ -349,9 +349,9 @@ static void | |||
349 | slave_state_get_prefix_result (void *cls, int64_t result, | 349 | slave_state_get_prefix_result (void *cls, int64_t result, |
350 | const void *err_msg, uint16_t err_msg_size) | 350 | const void *err_msg, uint16_t err_msg_size) |
351 | { | 351 | { |
352 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 352 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
353 | "slave_state_get_prefix:\t%" PRId64 " (%.*s)\n", | 353 | "Test #%d: slave_state_get_prefix:\t%" PRId64 " (%.*s)\n", |
354 | result, | 354 | test, result, |
355 | (int) err_msg_size, | 355 | (int) err_msg_size, |
356 | (const char *) err_msg); | 356 | (const char *) err_msg); |
357 | // FIXME: GNUNET_assert (2 == result); | 357 | // FIXME: GNUNET_assert (2 == result); |
@@ -375,8 +375,9 @@ static void | |||
375 | master_state_get_prefix_result (void *cls, int64_t result, | 375 | master_state_get_prefix_result (void *cls, int64_t result, |
376 | const void *err_msg, uint16_t err_msg_size) | 376 | const void *err_msg, uint16_t err_msg_size) |
377 | { | 377 | { |
378 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 378 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
379 | "master_state_get_prefix:\t%" PRId64 " (%s)\n", result, (char *) err_msg); | 379 | "Test #%d: master_state_get_prefix:\t%" PRId64 " (%s)\n", |
380 | test, result, (char *) err_msg); | ||
380 | // FIXME: GNUNET_assert (2 == result); | 381 | // FIXME: GNUNET_assert (2 == result); |
381 | slave_state_get_prefix (); | 382 | slave_state_get_prefix (); |
382 | } | 383 | } |
@@ -398,9 +399,9 @@ static void | |||
398 | slave_state_get_result (void *cls, int64_t result, | 399 | slave_state_get_result (void *cls, int64_t result, |
399 | const void *err_msg, uint16_t err_msg_size) | 400 | const void *err_msg, uint16_t err_msg_size) |
400 | { | 401 | { |
401 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 402 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
402 | "slave_state_get:\t%" PRId64 " (%.*s)\n", | 403 | "Test #%d: slave_state_get:\t%" PRId64 " (%.*s)\n", |
403 | result, err_msg_size, (char *) err_msg); | 404 | test, result, err_msg_size, (char *) err_msg); |
404 | // FIXME: GNUNET_assert (2 == result); | 405 | // FIXME: GNUNET_assert (2 == result); |
405 | master_state_get_prefix (); | 406 | master_state_get_prefix (); |
406 | } | 407 | } |
@@ -422,9 +423,9 @@ static void | |||
422 | master_state_get_result (void *cls, int64_t result, | 423 | master_state_get_result (void *cls, int64_t result, |
423 | const void *err_msg, uint16_t err_msg_size) | 424 | const void *err_msg, uint16_t err_msg_size) |
424 | { | 425 | { |
425 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 426 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
426 | "master_state_get:\t%" PRId64 " (%.*s)\n", | 427 | "Test #%d: master_state_get:\t%" PRId64 " (%.*s)\n", |
427 | result, err_msg_size, (char *) err_msg); | 428 | test, result, err_msg_size, (char *) err_msg); |
428 | // FIXME: GNUNET_assert (1 == result); | 429 | // FIXME: GNUNET_assert (1 == result); |
429 | slave_state_get (); | 430 | slave_state_get (); |
430 | } | 431 | } |
@@ -445,9 +446,9 @@ static void | |||
445 | slave_history_replay_result (void *cls, int64_t result, | 446 | slave_history_replay_result (void *cls, int64_t result, |
446 | const void *err_msg, uint16_t err_msg_size) | 447 | const void *err_msg, uint16_t err_msg_size) |
447 | { | 448 | { |
448 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 449 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
449 | "slave_history_replay:\t%" PRId64 " (%.*s)\n", | 450 | "Test #%d: slave_history_replay:\t%" PRId64 " (%.*s)\n", |
450 | result, | 451 | test, result, |
451 | (int) err_msg_size, | 452 | (int) err_msg_size, |
452 | (const char *) err_msg); | 453 | (const char *) err_msg); |
453 | GNUNET_assert (9 == result); | 454 | GNUNET_assert (9 == result); |
@@ -475,9 +476,9 @@ static void | |||
475 | master_history_replay_result (void *cls, int64_t result, | 476 | master_history_replay_result (void *cls, int64_t result, |
476 | const void *err_msg, uint16_t err_msg_size) | 477 | const void *err_msg, uint16_t err_msg_size) |
477 | { | 478 | { |
478 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 479 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
479 | "master_history_replay:\t%" PRId64 " (%.*s)\n", | 480 | "Test #%d: master_history_replay:\t%" PRId64 " (%.*s)\n", |
480 | result, | 481 | test, result, |
481 | (int) err_msg_size, | 482 | (int) err_msg_size, |
482 | (const char *) err_msg); | 483 | (const char *) err_msg); |
483 | GNUNET_assert (9 == result); | 484 | GNUNET_assert (9 == result); |
@@ -505,9 +506,9 @@ static void | |||
505 | slave_history_replay_latest_result (void *cls, int64_t result, | 506 | slave_history_replay_latest_result (void *cls, int64_t result, |
506 | const void *err_msg, uint16_t err_msg_size) | 507 | const void *err_msg, uint16_t err_msg_size) |
507 | { | 508 | { |
508 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 509 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
509 | "slave_history_replay_latest:\t%" PRId64 " (%.*s)\n", | 510 | "Test #%d: slave_history_replay_latest:\t%" PRId64 " (%.*s)\n", |
510 | result, | 511 | test, result, |
511 | (int) err_msg_size, | 512 | (int) err_msg_size, |
512 | (const char *) err_msg); | 513 | (const char *) err_msg); |
513 | GNUNET_assert (9 == result); | 514 | GNUNET_assert (9 == result); |
@@ -536,9 +537,9 @@ static void | |||
536 | master_history_replay_latest_result (void *cls, int64_t result, | 537 | master_history_replay_latest_result (void *cls, int64_t result, |
537 | const void *err_msg, uint16_t err_msg_size) | 538 | const void *err_msg, uint16_t err_msg_size) |
538 | { | 539 | { |
539 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 540 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
540 | "master_history_replay_latest:\t%" PRId64 " (%.*s)\n", | 541 | "Test #%d: master_history_replay_latest:\t%" PRId64 " (%.*s)\n", |
541 | result, err_msg_size, (char *) err_msg); | 542 | test, result, err_msg_size, (char *) err_msg); |
542 | GNUNET_assert (9 == result); | 543 | GNUNET_assert (9 == result); |
543 | 544 | ||
544 | slave_history_replay_latest (); | 545 | slave_history_replay_latest (); |
@@ -561,7 +562,8 @@ master_history_replay_latest () | |||
561 | static void | 562 | static void |
562 | transmit_resume (void *cls) | 563 | transmit_resume (void *cls) |
563 | { | 564 | { |
564 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Transmission resumed.\n"); | 565 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
566 | "Test #%d: Transmission resumed.\n", test); | ||
565 | struct TransmitClosure *tmit = cls; | 567 | struct TransmitClosure *tmit = cls; |
566 | if (NULL != tmit->mst_tmit) | 568 | if (NULL != tmit->mst_tmit) |
567 | GNUNET_PSYC_master_transmit_resume (tmit->mst_tmit); | 569 | GNUNET_PSYC_master_transmit_resume (tmit->mst_tmit); |
@@ -697,7 +699,7 @@ static void | |||
697 | slave_transmit () | 699 | slave_transmit () |
698 | { | 700 | { |
699 | test = TEST_SLAVE_TRANSMIT; | 701 | test = TEST_SLAVE_TRANSMIT; |
700 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 702 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
701 | "Test #%d: Slave sending request to master.\n", test); | 703 | "Test #%d: Slave sending request to master.\n", test); |
702 | 704 | ||
703 | tmit = GNUNET_new (struct TransmitClosure); | 705 | tmit = GNUNET_new (struct TransmitClosure); |
@@ -721,9 +723,9 @@ static void | |||
721 | slave_remove_cb (void *cls, int64_t result, | 723 | slave_remove_cb (void *cls, int64_t result, |
722 | const void *err_msg, uint16_t err_msg_size) | 724 | const void *err_msg, uint16_t err_msg_size) |
723 | { | 725 | { |
724 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 726 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
725 | "slave_remove:\t%" PRId64 " (%.*s)\n", | 727 | "Test #%d: slave_remove:\t%" PRId64 " (%.*s)\n", |
726 | result, err_msg_size, (char *) err_msg); | 728 | test, result, err_msg_size, (char *) err_msg); |
727 | 729 | ||
728 | slave_transmit (); | 730 | slave_transmit (); |
729 | } | 731 | } |
@@ -743,9 +745,9 @@ static void | |||
743 | slave_add_cb (void *cls, int64_t result, | 745 | slave_add_cb (void *cls, int64_t result, |
744 | const void *err_msg, uint16_t err_msg_size) | 746 | const void *err_msg, uint16_t err_msg_size) |
745 | { | 747 | { |
746 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 748 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
747 | "slave_add:\t%" PRId64 " (%.*s)\n", | 749 | "Test #%d: slave_add:\t%" PRId64 " (%.*s)\n", |
748 | result, err_msg_size, (char *) err_msg); | 750 | test, result, err_msg_size, (char *) err_msg); |
749 | slave_remove (); | 751 | slave_remove (); |
750 | } | 752 | } |
751 | 753 | ||
@@ -780,7 +782,7 @@ join_decision_cb (void *cls, | |||
780 | int is_admitted, | 782 | int is_admitted, |
781 | const struct GNUNET_PSYC_Message *join_msg) | 783 | const struct GNUNET_PSYC_Message *join_msg) |
782 | { | 784 | { |
783 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 785 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
784 | "Test #%d: Slave got join decision: %d\n", test, is_admitted); | 786 | "Test #%d: Slave got join decision: %d\n", test, is_admitted); |
785 | 787 | ||
786 | switch (test) | 788 | switch (test) |
@@ -812,7 +814,7 @@ join_request_cb (void *cls, | |||
812 | { | 814 | { |
813 | struct GNUNET_HashCode slave_key_hash; | 815 | struct GNUNET_HashCode slave_key_hash; |
814 | GNUNET_CRYPTO_hash (slave_key, sizeof (*slave_key), &slave_key_hash); | 816 | GNUNET_CRYPTO_hash (slave_key, sizeof (*slave_key), &slave_key_hash); |
815 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 817 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
816 | "Test #%d: Got join request #%u from %s.\n", | 818 | "Test #%d: Got join request #%u from %s.\n", |
817 | test, join_req_count, GNUNET_h2s (&slave_key_hash)); | 819 | test, join_req_count, GNUNET_h2s (&slave_key_hash)); |
818 | 820 | ||
@@ -825,7 +827,7 @@ join_request_cb (void *cls, | |||
825 | static void | 827 | static void |
826 | slave_connect_cb (void *cls, int result, uint64_t max_message_id) | 828 | slave_connect_cb (void *cls, int result, uint64_t max_message_id) |
827 | { | 829 | { |
828 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 830 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
829 | "Test #%d: Slave connected: %d, max_message_id: %" PRIu64 "\n", | 831 | "Test #%d: Slave connected: %d, max_message_id: %" PRIu64 "\n", |
830 | test, result, max_message_id); | 832 | test, result, max_message_id); |
831 | GNUNET_assert (TEST_SLAVE_JOIN_REJECT == test || TEST_SLAVE_JOIN_ACCEPT == test); | 833 | GNUNET_assert (TEST_SLAVE_JOIN_REJECT == test || TEST_SLAVE_JOIN_ACCEPT == test); |
@@ -837,7 +839,8 @@ static void | |||
837 | slave_join (int t) | 839 | slave_join (int t) |
838 | { | 840 | { |
839 | test = t; | 841 | test = t; |
840 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Test #%d: Joining slave.\n", t); | 842 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
843 | "Test #%d: Joining slave.\n", t); | ||
841 | 844 | ||
842 | struct GNUNET_PeerIdentity origin = this_peer; | 845 | struct GNUNET_PeerIdentity origin = this_peer; |
843 | struct GNUNET_PSYC_Environment *env = GNUNET_PSYC_env_create (); | 846 | struct GNUNET_PSYC_Environment *env = GNUNET_PSYC_env_create (); |
@@ -864,7 +867,7 @@ static void | |||
864 | master_transmit () | 867 | master_transmit () |
865 | { | 868 | { |
866 | test = TEST_MASTER_TRANSMIT; | 869 | test = TEST_MASTER_TRANSMIT; |
867 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 870 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
868 | "Test #%d: Master sending message to all.\n", test); | 871 | "Test #%d: Master sending message to all.\n", test); |
869 | end_count = 0; | 872 | end_count = 0; |
870 | 873 | ||
@@ -931,7 +934,8 @@ static void | |||
931 | master_start () | 934 | master_start () |
932 | { | 935 | { |
933 | test = TEST_MASTER_START; | 936 | test = TEST_MASTER_START; |
934 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Test #%d: Starting master.\n", test); | 937 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
938 | "Test #%d: Starting master.\n", test); | ||
935 | mst = GNUNET_PSYC_master_start (cfg, channel_key, GNUNET_PSYC_CHANNEL_PRIVATE, | 939 | mst = GNUNET_PSYC_master_start (cfg, channel_key, GNUNET_PSYC_CHANNEL_PRIVATE, |
936 | &master_start_cb, &join_request_cb, | 940 | &master_start_cb, &join_request_cb, |
937 | &master_message_cb, &master_message_part_cb, | 941 | &master_message_cb, &master_message_part_cb, |