X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=src_test%2Ftest_w1_datalog_write.cc;h=a0c0cc238ba707cc8400e4784da957130bd47f80;hb=22f0b4dd0b81bce75ac7a842a72ca86eec02f7bc;hp=141031b50c35fe58134937c9085a633e77da3eb6;hpb=d01194ab9275bc97176071089edc2781bb4de51b;p=lib1wire.git

diff --git a/src_test/test_w1_datalog_write.cc b/src_test/test_w1_datalog_write.cc
index 141031b..a0c0cc2 100644
--- a/src_test/test_w1_datalog_write.cc
+++ b/src_test/test_w1_datalog_write.cc
@@ -13,11 +13,17 @@
 
 #include <plp/log.h>
 
-#include "DeviceConfig.hh"
+#include <plp/DeviceConfig.hh>
+#include <plp/Device.hh>
+
 #include "Factory.hh"
 
 using namespace w1;
 using namespace std;
+using namespace plp;
+
+#define DEFAULT_READ_INTERVAL_SECONDS	600
+#define DEFAULT_MAX_READ_COUNT		-1
 
 bool try_parse_long(const char *str, long *result) {
 	int	new_result;
@@ -43,60 +49,79 @@ bool try_parse_long(const char *str, long *result) {
 }
 
 int main(int argc, char** argv) {
- 	list<W1Device *>		device_list;
-	int				round;
-	long				scan_interval;
-	long				store_interval;
+	int				read_count_total;
+	long				cnt_max_scans;
+	long				read_interval_seconds;
 	string				loc;
-	W1Device 			*device;
-	list<W1Device *>::iterator	iter;
+	Device 				*device;
+	list<Device *>			device_list;
+	list<Device *>::iterator	iter;
 
 	// default values than can be overwritten with parameters
 	loc	= "/tmp/w1data";
-	scan_interval	= 600; //600;
-	store_interval	= 2;
+	read_interval_seconds	= DEFAULT_READ_INTERVAL_SECONDS;
+	cnt_max_scans		= DEFAULT_MAX_READ_COUNT;
 	if (argc > 1) {
 		loc	= argv[1];
-		log_info("storage location: %s\n", loc.c_str());
 	}
 	else {
-		log_warning("No storage location parameter given, using default location: %s\n", loc.c_str());
+		log_info("no parameter given using default values:\n");
+		log_info("\ttest_w1_datalog_write %s %ld %ld\n\n", loc.c_str(), read_interval_seconds, cnt_max_scans);
+		log_info("usage:\n\ttest_w1_datalog_write <result_save_path> <read_interval_seconds> <max_read_count>\n");
+		log_info("\tmax_read_count == -1: read devices until application is terminated\n\n");
 	}
 	if (argc > 2) {
-		try_parse_long(argv[2], &scan_interval);
+		try_parse_long(argv[2], &read_interval_seconds);
 	}
 	if (argc > 3) {
-		try_parse_long(argv[3], &store_interval);
+		try_parse_long(argv[3], &cnt_max_scans);
+	}
+	log_info("searching 1-wire devices\n");
+	if (read_interval_seconds == DEFAULT_READ_INTERVAL_SECONDS) {
+		log_info("\tdevice read interval: %ld seconds (default value)\n", read_interval_seconds);
+	}
+	else {
+		log_info("\tdevice read interval: %ld seconds\n", read_interval_seconds);
+	}
+	log_info("\tdata save dir: %s\n", loc.c_str());
+	if (cnt_max_scans == DEFAULT_MAX_READ_COUNT) {
+		log_info("\tmax read count: %ld (default value, devices will be read until application is terminated)\n\n", cnt_max_scans);
+	}
+	else {
+		log_info("\tmax read count: %ld\n\n", cnt_max_scans);
 	}
-	log_info("scanning 1-wire devices\n");
-	log_info("data save dir: %s, scan interval: %ld, save interval: %ld\n", loc.c_str(), scan_interval, store_interval);
 	DeviceConfig::set_base_dir_name(loc);
-	device_list	= Factory::get_device_list();
-	round		= 0;
+	device_list		= Factory::get_device_list();
+	read_count_total	= 0;
 	if (device_list.size() > 0) {
 		while(1) {
-			round++;
-			for(iter = device_list.begin(); iter != device_list.end(); iter++) {
-				device = (W1Device *)*iter;
-				device->printout();
-				sleep(1);
-				if (round >= store_interval) {
-					device->save_data();
-				}
-			}
-			sleep(scan_interval);
-			if (round >= store_interval) {
-				round = 0;
+			read_count_total++;
+			if ((cnt_max_scans != -1) &&
+			    (read_count_total > cnt_max_scans)) {
+				log_info("closing the application, max read count reached. (%ld)\n", cnt_max_scans);
 				break;
 			}
+			for (iter = device_list.begin(); iter != device_list.end(); iter++) {
+				device = (Device *)*iter;
+				if (device->get_lifecycle_state() == LIFECYCLE_STATUS__AVAILABLE) {
+					device->printout();
+					sleep(1);
+				}
+				else {
+					log_debug("device not available, %s.\n", device->get_id().c_str());
+				}
+			}
+			sleep(read_interval_seconds);
 		}
 	}
 	else {
-		log_debug("could not find 1-wire devices.\n");
+		log_debug("could not find devices.\n");
 	}
+	log_debug("trying to start emptying list\n");
 	while (device_list.empty() == false) {
 		device	= device_list.back();
 		device_list.pop_back();
+		log_debug("calling delete\n");
 		delete(device);
 	}
 	return 0;