fixed Alarmsummary and improved performances

src/AlarmHandler.h

@@ -45,7 +45,9 @@
 #include "event_table.h"
 #include "SubscribeThread.h"
 
-#define MAX_ALARMS	10000
+#define MAX_ALARMS	2000
+#define MAX_ATTR_NAME	1000
+#define MAX_ATTR_SUMMARY	10000
 
 //#define _USE_ELETTRA_DB_RW
 
@@ -104,15 +106,26 @@ public:
 	Tango::DevLong attr_AttributeStoppedNumber_read;
 	Tango::DevLong attr_AttributeNumber_read;
 
-	vector<string> normalAlarms_read;
-	vector<string> unacknowledgedAlarms_read;
-	vector<string> acknowledgedAlarms_read;
-	vector<string> unacknowledgedNormalAlarms_read;
-	vector<string> shelvedAlarms_read;
-	vector<string> outOfServiceAlarms_read;
-	vector<string> silencedAlarms_read;
-	vector<string> listAlarms_read;
-	string alarmSummary_read[10000];
+	string normalAlarms_read[MAX_ALARMS];
+	string unacknowledgedAlarms_read[MAX_ALARMS];
+	string acknowledgedAlarms_read[MAX_ALARMS];
+	string unacknowledgedNormalAlarms_read[MAX_ALARMS];
+	string shelvedAlarms_read[MAX_ALARMS];
+	string outOfServiceAlarms_read[MAX_ALARMS];
+	string silencedAlarms_read[MAX_ALARMS];
+	string listAlarms_read[MAX_ALARMS];
+	string alarmSummary_read[MAX_ALARMS];
+
+/*	char c_normalAlarms_read[MAX_ALARMS][MAX_ATTR_NAME];
+	char c_unacknowledgedAlarms_read[MAX_ALARMS][MAX_ATTR_NAME];
+	char c_acknowledgedAlarms_read[MAX_ALARMS][MAX_ATTR_NAME];
+	char c_unacknowledgedNormalAlarms_read[MAX_ALARMS][MAX_ATTR_NAME];
+	char c_shelvedAlarms_read[MAX_ALARMS][MAX_ATTR_NAME];
+	char c_outOfServiceAlarms_read[MAX_ALARMS][MAX_ATTR_NAME];
+	char c_silencedAlarms_read[MAX_ALARMS][MAX_ATTR_NAME];
+	char c_listAlarms_read[MAX_ALARMS][MAX_ATTR_NAME];
+#define MAX_SUMMARY		2*MAX_ATTR_NAME		//TODO: max summary length!!!
+	char c_alarmSummary_read[MAX_ALARMS][MAX_SUMMARY];*/
 
 	size_t normalAlarms_sz;
 	size_t unacknowledgedAlarms_sz;
@@ -126,6 +139,8 @@ public:
 
 	double last_statistics_reset_time;
 
+	omni_mutex *prepare_alm_mtx;
+
 /*----- PROTECTED REGION END -----*/	//	AlarmHandler::Data Members
 
 //	Device property data members

src/event_table.cpp

@@ -124,6 +124,16 @@ list<bei_t> event_list::show(void)
 	return(el);
 }
 
+size_t event_list::size(void)
+{
+	size_t res;
+
+	this->lock();
+	res = l_event.size();
+	this->unlock();
+	return(res);
+}
+
 
 /*
  * event class methods

src/event_table.h

@@ -126,6 +126,7 @@ class event_list : public omni_mutex {
 		const bei_t pop_front(void);
 		void clear(void);
 		list<bei_t> show(void);
+		size_t size();
 	protected:
 		list<bei_t> l_event;
 	private: