[Themis-devcvs] SF.net SVN: themis:[725] trunk/themis

[CVS C. to T. <the...@li...>]

Revision: 725
          http://sourceforge.net/p/themis/code/725
Author:   mark_hellegers
Date:     2015-05-16 21:38:36 +0000 (Sat, 16 May 2015)
Log Message:
-----------
Doing an atomic_add on a volatile variable discards the qualifier and 
fails to compile on Haiku. Reading what volatile is supposed to do, it 
seems that it is not appropriate for what was intended here and not 
needed.

Modified Paths:
--------------
    trunk/themis/common/connection.h
    trunk/themis/common/msgsystem.cpp
    trunk/themis/common/msgsystem.h
    trunk/themis/common/plugclass.h
    trunk/themis/common/tcpmanager.h
    trunk/themis/framework/app.h
    trunk/themis/modules/http/httpv4.h

Modified: trunk/themis/common/connection.h
===================================================================
--- trunk/themis/common/connection.h	2015-05-16 17:09:37 UTC (rev 724)
+++ trunk/themis/common/connection.h	2015-05-16 21:38:36 UTC (rev 725)
@@ -188,9 +188,9 @@
 			int32 last_error;
 			double bytes_per_second;
 			bigtime_t first_data_received_time;
-			volatile int32 notified_connect;
-			volatile int32 notified_disconnect;
-			volatile int32 already_connected;
+			int32 notified_connect;
+			int32 notified_disconnect;
+			int32 already_connected;
 			BufferPool * mBuffers;
 		
 		public:

Modified: trunk/themis/common/msgsystem.cpp
===================================================================
--- trunk/themis/common/msgsystem.cpp	2015-05-16 17:09:37 UTC (rev 724)
+++ trunk/themis/common/msgsystem.cpp	2015-05-16 21:38:36 UTC (rev 725)
@@ -45,7 +45,7 @@
 BLocker MessageSystem::msgsyslock;
 sem_id MessageSystem::process_sem=0;
 sem_id MessageSystem::transmit_sem=0;
-volatile int32 MessageSystem::_Quit_Thread_=0;
+int32 MessageSystem::_Quit_Thread_=0;
 thread_id MessageSystem::_ProcessThread_=0;
 volatile uint32 MessageSystem::_messages_sent_=0;
 volatile uint32 MessageSystem::_message_targets_=0;
@@ -148,7 +148,7 @@
 				broadcaster->broadcast_successful_receives=0;
 				MessageSystem *member;
 				msgsysclient_st *verifier;
-				volatile int32 member_found;
+				int32 member_found;
 				BString member_name;
 //				printf("Message sender is %s\n",broadcaster->MsgSysObjectName());
 				while (cur!=NULL) {

Modified: trunk/themis/common/msgsystem.h
===================================================================
--- trunk/themis/common/msgsystem.h	2015-05-16 17:09:37 UTC (rev 724)
+++ trunk/themis/common/msgsystem.h	2015-05-16 21:38:36 UTC (rev 725)
@@ -185,7 +185,7 @@
 
 
 */
-		static volatile int32 _Quit_Thread_;
+		static int32 _Quit_Thread_;
 /*!
 \brief The main thread function of the broadcast system.
 
@@ -260,12 +260,12 @@
 \brief 
 
 */
-		volatile int32 _ms_receiver_quit_;
+		int32 _ms_receiver_quit_;
 /*!
 \brief 
 
 */
-		volatile int32 _msg_receiver_running_;
+		int32 _msg_receiver_running_;
 /*!
 \brief 
 
@@ -275,7 +275,7 @@
 	
 		BLocker local_msg_sys_lock;
 		
-		volatile int32 _broadcast_complete_;
+		int32 _broadcast_complete_;
 	
 	public:
 		static const int32 DEBUG_INFO_MSG='dbim';

Modified: trunk/themis/common/plugclass.h
===================================================================
--- trunk/themis/common/plugclass.h	2015-05-16 17:09:37 UTC (rev 724)
+++ trunk/themis/common/plugclass.h	2015-05-16 21:38:36 UTC (rev 725)
@@ -130,7 +130,7 @@
 		BMessage *InitInfo;
 		//!This is a reference to the Plug-in Manager. 
 		plugman *PlugMan;
-		volatile int32 Cancel;
+		int32 Cancel;
 		bool uses_heartbeat;
 
 	public:

Modified: trunk/themis/common/tcpmanager.h
===================================================================
--- trunk/themis/common/tcpmanager.h	2015-05-16 17:09:37 UTC (rev 724)
+++ trunk/themis/common/tcpmanager.h	2015-05-16 21:38:36 UTC (rev 725)
@@ -59,7 +59,7 @@
 
 
 */
-			volatile int32 _quitter_;
+			int32 _quitter_;
 /*!
 \brief Initializes the TCPManager object.
 

Modified: trunk/themis/framework/app.h
===================================================================
--- trunk/themis/framework/app.h	2015-05-16 17:09:37 UTC (rev 724)
+++ trunk/themis/framework/app.h	2015-05-16 21:38:36 UTC (rev 725)
@@ -67,7 +67,7 @@
 		//! The Preferences window.
 		PrefsWin * fPrefsWin;
 		//! Checks to see if the QuitRequested function has been called.
-		volatile int32 fQR_called;
+		int32 fQR_called;
 		//! A counter for the generated unique IDs.
 		int32 fIDCounter;
 		//! The SiteHandler object.

Modified: trunk/themis/modules/http/httpv4.h
===================================================================
--- trunk/themis/modules/http/httpv4.h	2015-05-16 17:09:37 UTC (rev 724)
+++ trunk/themis/modules/http/httpv4.h	2015-05-16 21:38:36 UTC (rev 725)
@@ -280,7 +280,7 @@
 		
 		BList *request_queue;//!< BList object containing build_request_st records to be converted into http_request_info_st records by the BuildRequest() function.
 		AuthManager *auth_manager;//!< Pointer to the authorization/authentication manager.
-		volatile int32 _terminate_;//!< A flag to terminate all processing in HTTP, used to prepare for shutdown.
+		int32 _terminate_;//!< A flag to terminate all processing in HTTP, used to prepare for shutdown.
 		/*!
 			\brief Sets the various variables and flags to a known state.
 		*/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.