From 59251e7af20d0483722958523ad33cfa0ad0206b Mon Sep 17 00:00:00 2001 From: vivek-shankar Date: Tue, 31 Jan 2017 03:57:03 -0500 Subject: [PATCH] logger --- src/.buzzuav_closures.cpp.swp | Bin 0 -> 16384 bytes src/buzz_update.cpp | 24 ++++++++++++++---------- src/test1.bzz | 7 ++++--- 3 files changed, 18 insertions(+), 13 deletions(-) create mode 100644 src/.buzzuav_closures.cpp.swp diff --git a/src/.buzzuav_closures.cpp.swp b/src/.buzzuav_closures.cpp.swp new file mode 100644 index 0000000000000000000000000000000000000000..7d1f48f0eb7522d83c634f790f4d91050b2b1434 GIT binary patch literal 16384 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 literal 0 HcmV?d00001 diff --git a/src/buzz_update.cpp b/src/buzz_update.cpp index 6bdb8b7..374362b 100644 --- a/src/buzz_update.cpp +++ b/src/buzz_update.cpp @@ -12,10 +12,10 @@ /*Temp for data collection*/ //static int neigh=-1; -//static struct timeval t1, t2; +static struct timeval t1, t2; static int timer_steps=0; //static clock_t end; -//void collect_data(); +void collect_data(); /*Temp end */ static int fd,wd =0; static int old_update =0; @@ -294,9 +294,11 @@ buzzvm_pushs(VM, buzzvm_string_register(VM, "update_no", 1)); } else{ + gettimeofday(&t1, NULL); if(neigh==0 && (!is_msg_present())){ fprintf(stdout,"Sending code... \n"); code_message_outqueue_append(); + } timer_steps++; buzzvm_pushs(VM, buzzvm_string_register(VM, "barrier_val",1)); @@ -306,7 +308,8 @@ buzzvm_pushs(VM, buzzvm_string_register(VM, "update_no", 1)); fprintf(stdout,"Barrier ..................... %i \n",tObj->i.value); if(tObj->i.value==no_of_robot) { *(int*)(updater->mode) = CODE_RUNNING; - //collect_data(); + gettimeofday(&t2, NULL); + collect_data(); timer_steps=0; //neigh=-1; //buzz_utility::buzz_update_set((updater)->bcode, (char*)dbgfname, *(size_t*)(updater->bcode_size)); @@ -443,12 +446,13 @@ bzz_file=in_bzz_file; } void collect_data(){ //fprintf(stdout,"start and end time in data collection Info : %f,%f",(double)begin,(double)end); -//double time_spent = (t2.tv_sec - t1.tv_sec) * 1000.0; //(double)(end - begin) / CLOCKS_PER_SEC; -//time_spent += (t2.tv_usec - t1.tv_usec) / 1000.0; -//fprintf(stdout,"Data logger Info : %i,%i,%f,%i,%i,%i\n",(int)updater->robotid,neigh,time_spent,(int)updater->bcode_size,(int)no_of_robot,(int)updater->update_no); -FILE *Fileptr; -Fileptr=fopen("/home/ubuntu/ROS_WS/update_logger.csv", "a"); -fprintf(Fileptr,"%i,%i,%i,%i,%i,%u\n",(int)buzz_utility::get_robotid(),neigh,timer_steps,(int)*(size_t*)updater->bcode_size,(int)no_of_robot, *(uint8_t*)updater->update_no); -fclose(Fileptr); +double time_spent = (t2.tv_sec - t1.tv_sec) * 1000.0; //(double)(end - begin) / CLOCKS_PER_SEC; +time_spent += (t2.tv_usec - t1.tv_usec) / 1000.0; +//int bytecodesize=(int); +fprintf(stdout,"Data logger Info : %i , %i , %f , %ld , %i , %d \n",(int)buzz_utility::get_robotid(),neigh,time_spent,*(size_t*)updater->bcode_size,(int)no_of_robot,*(uint8_t*)updater->update_no); +//FILE *Fileptr; +//Fileptr=fopen("/home/ubuntu/ROS_WS/update_logger.csv", "a"); +//fprintf(Fileptr,"%i,%i,%i,%i,%i,%u\n",(int)buzz_utility::get_robotid(),neigh,timer_steps,(int)*(size_t*)updater->bcode_size,(int)no_of_robot, *(uint8_t*)updater->update_no); +//fclose(Fileptr); } diff --git a/src/test1.bzz b/src/test1.bzz index be28813..f70aec6 100644 --- a/src/test1.bzz +++ b/src/test1.bzz @@ -1,7 +1,7 @@ # We need this for 2D vectors # Make sure you pass the correct include path to "bzzc -I ..." -include "/home/ubuntu/buzz/src/include/vec2.bzz" +include "/home/vivek/catkin_ws/src/rosbuzz/src/vec2.bzz" #################################################################################################### # Updater related # This should be here for the updater to work, changing position of code will crash the updater @@ -98,10 +98,11 @@ neighbors.listen("cmd", statef=land } } - if( flight.status == 2 and position.altitude >= TARGET_ALTITUDE-TARGET_ALTITUDE/20.0) - statef=hexagon + ) +if( flight.status == 2 and position.altitude >= TARGET_ALTITUDE-TARGET_ALTITUDE/20.0) + statef=hexagon } function takeoff() {