X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=src%2FW1Device.cc;h=eb94b24b3039ed611d17f5ba6d2692441b3835bb;hb=f280d6c6383f3642069fac8a490f827195619278;hp=37a02bafaa9c7647118bdef68237590b46936ce2;hpb=da203ad44792ca37320768f4cbe68587c4806910;p=lib1wire.git

diff --git a/src/W1Device.cc b/src/W1Device.cc
index 37a02ba..eb94b24 100644
--- a/src/W1Device.cc
+++ b/src/W1Device.cc
@@ -12,22 +12,24 @@
 #include <time.h>
 #include <plp/log.h>
 
-#include "DeviceConfig.hh"
+#include <plp/DeviceConfig.hh>
+#include <plp/StoreDay.hh>
+
 #include "Factory.hh"
-#include "StoreDay.hh"
 #include "W1Device.hh"
 
 using namespace std;
 using namespace w1;
 using namespace plp;
 
-W1Device::W1Device(string device_type_param,
-		string device_id_param,
-		dirent *direntry_param) {
+W1Device::W1Device(string device_id_param,
+		string device_type_param,
+		dirent *direntry_param) : SensorDevice(device_id_param, device_type_param) {
 	string rootdir;
 	string device_dir;
 	string temp_str;
 
+	pthread_mutex_init(&plock, NULL);
 	type	= device_type_param;
 	id	= device_id_param;
 	if (direntry_param != NULL) {
@@ -41,24 +43,26 @@ W1Device::W1Device(string device_type_param,
 	else {
 		lifecycle_status	= LIFECYCLE_STATUS__UNAVAILABLE;
 	}
-	name		= "";
+	reader	= new DataReader(id);
+	name	= "";
 }
 
 W1Device::~W1Device() {
+	log_debug("started\n");
 	save_and_clean_cache();
-}
-
-string W1Device::get_id() {
-	return id;
+	if (reader != NULL) {
+		delete(reader);
+		reader	= NULL;
+	}
 }
 
 string W1Device::get_name() {
 	DeviceConfig	*cfg;
 
 	if (name.empty() == true) {
-		cfg	= Factory::get_device_config(id);
+		cfg	= DeviceConfig::get_device_config(id);
 		if (cfg != NULL) {
-			name	= cfg->get_cfg_value(DEVICE_CONFIG_VALUE_KEY__NAME);
+			name	= cfg->get_config_value(DEVICE_CONFIG_VALUE_KEY__NAME);
 			delete(cfg);
 		}
 	}
@@ -68,11 +72,13 @@ string W1Device::get_name() {
 void W1Device::set_name(string name_param) {
 	DeviceConfig	*cfg;
 
-	name	= name_param;
-	cfg	= Factory::get_device_config(id);
-	if (cfg != NULL) {
-		cfg->set_cfg_value(DEVICE_CONFIG_VALUE_KEY__NAME, name_param);
-		delete(cfg);
+	if (name.compare(name_param) != 0) {
+		name	= name_param;
+		cfg	= DeviceConfig::get_device_config(id);
+		if (cfg != NULL) {
+			cfg->set_config_value(DEVICE_CONFIG_VALUE_KEY__NAME, name_param);
+			delete(cfg);
+		}
 	}
 }
 
@@ -86,11 +92,12 @@ void W1Device::printout() {
 	if (data != NULL) {
 		text	= data->to_string();
 		cout << text << endl;
+		delete(data);
 	}
 	else {
-		type	= get_device_type();
+		type	= get_type();
 		name	= get_name();
-		log_error("Could not data for %s device: %s\n", type.c_str(), name.c_str());
+		log_error("Could not read data for %s device: %s\n", type.c_str(), name.c_str());
 	}
 }
 
@@ -113,43 +120,51 @@ Data *W1Device::get_data() {
 		ret_val	= new Data(vect, get_unit());
 		cache(ret_val);
 		delete(vect);
+		log_debug("%s returning new data\n", id.c_str());
+	}
+	else {
+		// read old already saved data
+		log_debug("%s returning old saved data\n", id.c_str());
+		ret_val	= reader->get_latest_data();
 	}
 	return ret_val;
 }
 
-void W1Device::cache(Data *data) {
-	// TODO: add mutex for memory_cache
+void W1Device::cache(Data *new_data) {
+	Data	*data;
+	int	dec_precision;
+
+	data	= new_data->clone();
+	pthread_mutex_lock(&plock);
 	memory_cache.push_back(data);
 	if (memory_cache.size() > 5) {
-		save_and_clean_cache();
+		dec_precision	= get_data_decimal_precision();
+		StoreDay::save(id, &memory_cache, dec_precision);
+		while(memory_cache.empty() == false) {
+			data	= memory_cache.back();
+			memory_cache.pop_back();
+			delete(data);
+		}
 	}
+	pthread_mutex_unlock(&plock);
 }
 
 void W1Device::save_and_clean_cache() {
-	list<Data *>::iterator	iter;
-	Data			*data;
-	int			dec_precision;
+	Data	*data;
+	int	dec_precision;
 
 	dec_precision	= get_data_decimal_precision();
+	pthread_mutex_lock(&plock);
+	log_debug("memory cache size: %d\n", memory_cache.size());
 	StoreDay::save(id, &memory_cache, dec_precision);
-	for(iter = memory_cache.begin(); iter != memory_cache.end(); iter++) {
-		data	= (Data *)*iter;
+	while(memory_cache.empty() == false) {
+		data	= memory_cache.back();
+		memory_cache.pop_back();
 		delete(data);
 	}
-	memory_cache.clear();
-}
-
-DataReader *W1Device::get_device_data() {
-	string id;
-
-	id	= get_id();
-	return new DataReader(id);
-}
-
-EnumDeviceLifeCycleStatus W1Device::get_lifecycle_state() {
-	return lifecycle_status;
+	pthread_mutex_unlock(&plock);
 }
 
-string W1Device::get_device_type() {
-	return type;
+const DataReader *W1Device::get_device_data() {
+	return reader;
 }