Author: remi
Date: 2008-07-03 14:27:28 +0200 (Thu, 03 Jul 2008)
New Revision: 1306
Modified:
software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c
software_suite_v2/middleware/tuxdriver/trunk/src/version.h
Log:
* added svn:keywords on version.h
* updated status setters functions.
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c
2008-07-03 08:25:45 UTC (rev 1305)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_sw_status.c
2008-07-03 12:27:28 UTC (rev 1306)
@@ -212,13 +212,13 @@
LIBLOCAL void
tux_sw_status_init(void)
{
- char driver_symbolic_version[128] = "";
+ static char driver_symbolic_version[128] = "";
#ifdef USE_MUTEX
mutex_init(__status_mutex);
#endif
- sprintf(driver_symbolic_version, "Tux_driver_%d.%d.%d - b%.3d (%s) (%s)",
+ sprintf(driver_symbolic_version, "libtuxdriver-%d.%d.%d-b%.3d(%s)(%s)",
VER_MAJOR,
VER_MINOR,
VER_UPDATE,
@@ -444,12 +444,28 @@
{
if (delta >= sw_status_table[id].event_threshold)
{
+#ifdef USE_MUTEX
+ mutex_lock(__status_mutex);
+#endif
sw_status_table[id].intvalue = value;
+#ifdef USE_MUTEX
+ mutex_unlock(__status_mutex);
+#endif
tux_sw_status_get_state_str(id, state_str);
event_funct(state_str);
}
}
}
+ else
+ {
+#ifdef USE_MUTEX
+ mutex_lock(__status_mutex);
+#endif
+ sw_status_table[id].intvalue = value;
+#ifdef USE_MUTEX
+ mutex_unlock(__status_mutex);
+#endif
+ }
#ifdef USE_MUTEX
mutex_lock(__status_mutex);
@@ -491,12 +507,28 @@
{
if ((1000*delta) >= sw_status_table[id].event_threshold)
{
+#ifdef USE_MUTEX
+ mutex_lock(__status_mutex);
+#endif
sw_status_table[id].floatvalue = value;
+#ifdef USE_MUTEX
+ mutex_unlock(__status_mutex);
+#endif
tux_sw_status_get_state_str(id, state_str);
event_funct(state_str);
}
}
}
+ else
+ {
+#ifdef USE_MUTEX
+ mutex_lock(__status_mutex);
+#endif
+ sw_status_table[id].floatvalue = value;
+#ifdef USE_MUTEX
+ mutex_unlock(__status_mutex);
+#endif
+ }
#ifdef USE_MUTEX
mutex_lock(__status_mutex);
@@ -538,12 +570,28 @@
if (sw_status_table[id].event_threshold &&
(value != sw_status_table[id].strvalue))
{
+#ifdef USE_MUTEX
+ mutex_lock(__status_mutex);
+#endif
sw_status_table[id].strvalue = value;
+#ifdef USE_MUTEX
+ mutex_unlock(__status_mutex);
+#endif
tux_sw_status_get_state_str(id, state_str);
event_funct(state_str);
}
}
}
+ else
+ {
+#ifdef USE_MUTEX
+ mutex_lock(__status_mutex);
+#endif
+ sw_status_table[id].strvalue = value;
+#ifdef USE_MUTEX
+ mutex_unlock(__status_mutex);
+#endif
+ }
#ifdef USE_MUTEX
mutex_lock(__status_mutex);
Modified: software_suite_v2/middleware/tuxdriver/trunk/src/version.h
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/version.h 2008-07-03
08:25:45 UTC (rev 1305)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/version.h 2008-07-03
12:27:28 UTC (rev 1306)
@@ -17,6 +17,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
+ /* SVN : $Id$ */
#ifndef _VERSION_H_
#define _VERSION_H_
@@ -24,7 +25,7 @@
#define VER_MAJOR 0
#define VER_MINOR 0
#define VER_UPDATE 1
-#define VER_BUILD 10
+#define VER_BUILD 11
#define VER_STATE "BETA"
#ifdef WIN32
# define VER_ARCH "WIN32"
Property changes on: software_suite_v2/middleware/tuxdriver/trunk/src/version.h
___________________________________________________________________
Name: svn:keywords
+ Revision Date Id
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
