Make chord_print_circle print to a FILE *

michaelstorm · Jun 3, 2013 · f79d112 · f79d112
1 parent 371b773
commit f79d112
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/include/chord/chord_api.h b/include/chord/chord_api.h
@@ -5,6 +5,8 @@
 extern "C" {
 #endif
 
+#include <stdio.h>
+
 typedef unsigned char uchar;
 typedef unsigned short ushort;
 typedef unsigned long ulong;
@@ -27,7 +29,7 @@ typedef struct Server Server;
 
 void chord_get_range(Server *srv, chordID *l, chordID *r);
 int chord_is_local(Server *srv, chordID *x);
-void chord_print_circle(Server *srv);
+void chord_print_circle(Server *srv, FILE *fp);
 
 #ifdef __cplusplus
 }

diff --git a/src/chord.c b/src/chord.c
@@ -295,7 +295,7 @@ long double id_to_radians(const chordID *id)
 	return rad*2*PI;
 }
 
-void chord_print_circle(Server *srv)
+void chord_print_circle(Server *srv, FILE *fp)
 {
 	return;
 #define ROW_RATIO ((long double)0.5)
@@ -365,7 +365,7 @@ void chord_print_circle(Server *srv)
 
 	StartLog(INFO);
 	PartialLog("\n");
-	print_grid(clog_file_logger()->fp, g);
+	print_grid(fp, g);
 	EndLog();
 
 	free_circle(c);
@@ -384,7 +384,10 @@ void chord_update_range(Server *srv, chordID *l, chordID *r)
 	srv->pred_bound = *l;
 	srv->node.id = *r;
 
-	chord_print_circle(srv);
+	StartLog(INFO);
+	PartialLog("\n");
+	chord_print_circle(srv, clog_file_logger()->fp);
+	EndLog();
 }
 
 /* get_range: returns the range (l,r] that this node is responsible for */

diff --git a/src/finger.c b/src/finger.c
@@ -227,7 +227,11 @@ void activate_finger(Server *srv, Finger *f)
 	if (f->status == F_PASSIVE) {
 		srv->num_passive_fingers--;
 		f->status = F_ACTIVE;
-		chord_print_circle(srv);
+
+		StartLog(INFO);
+		PartialLog("\n");
+		chord_print_circle(srv, clog_file_logger()->fp);
+		EndLog();
 	}
 }