diff options
author | Omar Tarabai <tarabai@devegypt.com> | 2014-09-03 11:20:29 +0000 |
---|---|---|
committer | Omar Tarabai <tarabai@devegypt.com> | 2014-09-03 11:20:29 +0000 |
commit | 057e1a35d8663d4139dc0af4de3404dba8a69eb7 (patch) | |
tree | 38a62091adf1d07e7741e892b8408c52f0d5d5d1 /src/sensor | |
parent | d600389e863d823981efbb1a2f1646fe13cbc7df (diff) | |
download | gnunet-057e1a35d8663d4139dc0af4de3404dba8a69eb7.tar.gz gnunet-057e1a35d8663d4139dc0af4de3404dba8a69eb7.zip |
sensor profiler fix
Diffstat (limited to 'src/sensor')
-rw-r--r-- | src/sensor/gnunet-sensor-profiler.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/sensor/gnunet-sensor-profiler.c b/src/sensor/gnunet-sensor-profiler.c index 2a04eaae7..ad8b43290 100644 --- a/src/sensor/gnunet-sensor-profiler.c +++ b/src/sensor/gnunet-sensor-profiler.c | |||
@@ -464,8 +464,8 @@ sensor_dir_scanner (void *cls, const char *filename) | |||
464 | GNUNET_CONFIGURATION_parse (sensor_cfg, filename)); | 464 | GNUNET_CONFIGURATION_parse (sensor_cfg, filename)); |
465 | GNUNET_CONFIGURATION_set_value_string (sensor_cfg, file_basename, | 465 | GNUNET_CONFIGURATION_set_value_string (sensor_cfg, file_basename, |
466 | "COLLECTION_POINT", | 466 | "COLLECTION_POINT", |
467 | GNUNET_i2s_full (&all_peers_info[0]. | 467 | GNUNET_i2s_full (&all_peers_info |
468 | peer_id)); | 468 | [0].peer_id)); |
469 | if (sensors_interval > 0) | 469 | if (sensors_interval > 0) |
470 | { | 470 | { |
471 | GNUNET_CONFIGURATION_set_value_number (sensor_cfg, file_basename, | 471 | GNUNET_CONFIGURATION_set_value_number (sensor_cfg, file_basename, |
@@ -544,10 +544,11 @@ peerstore_watch_cb (void *cls, struct GNUNET_PEERSTORE_Record *record, | |||
544 | GNUNET_assert (0 == | 544 | GNUNET_assert (0 == |
545 | GNUNET_CRYPTO_cmp_peer_identity (&peer->peer_id, | 545 | GNUNET_CRYPTO_cmp_peer_identity (&peer->peer_id, |
546 | record->peer)); | 546 | record->peer)); |
547 | printf ("Anomaly report:\n" " Peer: `%s'\n" " Sensor: `%s'\n" | 547 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
548 | " Anomalous: `%d'\n" " Anomalous neighbors: %f.\n\n", | 548 | "Anomaly report:\n" " Peer: `%s'\n" " Sensor: `%s'\n" |
549 | GNUNET_i2s (&peer->peer_id), record->key, anomaly->anomalous, | 549 | " Anomalous: `%d'\n" " Anomalous neighbors: %f.\n\n", |
550 | anomaly->anomalous_neighbors); | 550 | GNUNET_i2s (&peer->peer_id), record->key, anomaly->anomalous, |
551 | anomaly->anomalous_neighbors); | ||
551 | return GNUNET_YES; | 552 | return GNUNET_YES; |
552 | } | 553 | } |
553 | 554 | ||
@@ -633,16 +634,17 @@ prompt_peer_disconnection () | |||
633 | int p2; | 634 | int p2; |
634 | char line[10]; | 635 | char line[10]; |
635 | 636 | ||
636 | printf ("Disconnect peers (e.g. '0,2') or empty line to execute: "); | 637 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
638 | "Disconnect peers (e.g. '0,2') or empty line to execute:\n"); | ||
637 | if (NULL == fgets (line, sizeof (line), stdin) || 1 == strlen (line)) | 639 | if (NULL == fgets (line, sizeof (line), stdin) || 1 == strlen (line)) |
638 | { | 640 | { |
639 | printf ("Continuing.\n"); | 641 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Continuing.\n"); |
640 | return; | 642 | return; |
641 | } | 643 | } |
642 | if (2 != sscanf (line, "%d,%d", &p1, &p2) || p1 >= num_peers || | 644 | if (2 != sscanf (line, "%d,%d", &p1, &p2) || p1 >= num_peers || |
643 | p2 >= num_peers || p1 < 0 || p2 < 0 || p1 == p2) | 645 | p2 >= num_peers || p1 < 0 || p2 < 0 || p1 == p2) |
644 | { | 646 | { |
645 | printf ("Invalid input.\n"); | 647 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Invalid input.\n"); |
646 | prompt_peer_disconnection (); | 648 | prompt_peer_disconnection (); |
647 | return; | 649 | return; |
648 | } | 650 | } |
@@ -660,7 +662,7 @@ simulate_anomalies (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
660 | delayed_task = GNUNET_SCHEDULER_NO_TASK; | 662 | delayed_task = GNUNET_SCHEDULER_NO_TASK; |
661 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 663 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
662 | "Training period over, simulating anomalies now.\n"); | 664 | "Training period over, simulating anomalies now.\n"); |
663 | prompt_peer_disconnection (); | 665 | //TODO: |
664 | } | 666 | } |
665 | 667 | ||
666 | 668 | ||
@@ -693,6 +695,7 @@ peers_ready (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
693 | GNUNET_NO)); | 695 | GNUNET_NO)); |
694 | delayed_task = | 696 | delayed_task = |
695 | GNUNET_SCHEDULER_add_delayed (training_period, &simulate_anomalies, NULL); | 697 | GNUNET_SCHEDULER_add_delayed (training_period, &simulate_anomalies, NULL); |
698 | prompt_peer_disconnection (); //TODO: move to simulate_anomalies() | ||
696 | } | 699 | } |
697 | 700 | ||
698 | 701 | ||