faubackup2/src/network network_receiver.cpp,1.4,1.5 network_receiver.hpp,1.3,1.4 network_sender.cpp,1.7,1.8 network_sender.hpp,1.4,1.5

Update of /cvsroot/faubackup/faubackup2/src/network
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26134/src/network

Modified Files:
	network_receiver.cpp network_receiver.hpp network_sender.cpp 
	network_sender.hpp 
Log Message:
use private mutex in network class


Index: network_sender.cpp
===================================================================
RCS file: /cvsroot/faubackup/faubackup2/src/network/network_sender.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** network_sender.cpp	26 Jun 2005 23:02:10 -0000	1.7
--- network_sender.cpp	16 Sep 2005 19:11:18 -0000	1.8
***************
*** 11,21 ****
  #include "network/network_item.hpp"
  
! /* have to be global */
! pthread_mutex_t sender_client1_mutex = PTHREAD_MUTEX_INITIALIZER;
! pthread_cond_t sender_client1_cond = PTHREAD_COND_INITIALIZER;
! pthread_mutex_t sender_client2_mutex = PTHREAD_MUTEX_INITIALIZER;
! pthread_cond_t sender_client2_cond = PTHREAD_COND_INITIALIZER;
! pthread_mutex_t sender_network_mutex = PTHREAD_MUTEX_INITIALIZER;
! pthread_cond_t sender_network_cond = PTHREAD_COND_INITIALIZER;
  namespace faubackup
  {
--- 11,15 ----
  #include "network/network_item.hpp"
  
! 
  namespace faubackup
  {
***************
*** 23,27 ****
  NetworkSender::NetworkSender(int newfd)
  {
! 
  	this->fd = newfd;
  	die_on_end = false;
--- 17,33 ----
  NetworkSender::NetworkSender(int newfd)
  {
! 	if(pthread_cond_init(&sender_client1_cond, NULL)) 
! 		output.critical("error initializing sender_client1_cond", errno);
! 	if(pthread_cond_init(&sender_client2_cond, NULL)) 
! 		output.critical("error initializing sender_client2_cond", errno);
! 	if(pthread_cond_init(&sender_network_cond, NULL)) 
! 		output.critical("error initializing sender_network_cond", errno);
! 	if(pthread_mutex_init(&sender_client1_mutex, NULL)) 
! 		output.critical("error initializing sender_client1_mutex", errno);
! 	if(pthread_mutex_init(&sender_client2_mutex, NULL)) 
! 		output.critical("error initializing sender_client2_mutex", errno);
! 	if(pthread_mutex_init(&sender_network_mutex, NULL)) 
! 		output.critical("error initializing sender_network_mutex", errno);
! 	
  	this->fd = newfd;
  	die_on_end = false;

Index: network_sender.hpp
===================================================================
RCS file: /cvsroot/faubackup/faubackup2/src/network/network_sender.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** network_sender.hpp	26 Jun 2005 23:02:10 -0000	1.4
--- network_sender.hpp	16 Sep 2005 19:11:18 -0000	1.5
***************
*** 14,17 ****
--- 14,24 ----
  {
  private:
+ 	pthread_mutex_t sender_client1_mutex;
+ 	pthread_cond_t sender_client1_cond;
+ 	pthread_mutex_t sender_client2_mutex;
+ 	pthread_cond_t sender_client2_cond;
+ 	pthread_mutex_t sender_network_mutex;
+ 	pthread_cond_t sender_network_cond;
+ 
  	XThread thread;
  

Index: network_receiver.hpp
===================================================================
RCS file: /cvsroot/faubackup/faubackup2/src/network/network_receiver.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** network_receiver.hpp	14 Jun 2005 22:10:31 -0000	1.3
--- network_receiver.hpp	16 Sep 2005 19:11:18 -0000	1.4
***************
*** 15,18 ****
--- 15,25 ----
  {
  private:
+ 	pthread_mutex_t receiver_client1_mutex;
+ 	pthread_cond_t receiver_client1_cond;
+ 	pthread_mutex_t receiver_client2_mutex;
+ 	pthread_cond_t receiver_client2_cond;
+ 	pthread_mutex_t receiver_network_mutex;
+ 	pthread_cond_t receiver_network_cond;
+ 	
  	XThread thread;
  	queue<NetworkItem *> queue_client1;

Index: network_receiver.cpp
===================================================================
RCS file: /cvsroot/faubackup/faubackup2/src/network/network_receiver.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** network_receiver.cpp	14 Jun 2005 22:10:31 -0000	1.4
--- network_receiver.cpp	16 Sep 2005 19:11:17 -0000	1.5
***************
*** 12,27 ****
  namespace faubackup
  {
- 
- /* have to be global */
- pthread_mutex_t receiver_client1_mutex = PTHREAD_MUTEX_INITIALIZER;
- pthread_cond_t receiver_client1_cond = PTHREAD_COND_INITIALIZER;
- pthread_mutex_t receiver_client2_mutex = PTHREAD_MUTEX_INITIALIZER;
- pthread_cond_t receiver_client2_cond = PTHREAD_COND_INITIALIZER;
- pthread_mutex_t receiver_network_mutex = PTHREAD_MUTEX_INITIALIZER;
- pthread_cond_t receiver_network_cond = PTHREAD_COND_INITIALIZER;
- 
- 
  NetworkReceiver::NetworkReceiver(int newfd)
  {
  	fd = newfd;
  	total=0;
--- 12,30 ----
  namespace faubackup
  {
  NetworkReceiver::NetworkReceiver(int newfd)
  {
+ 	if(pthread_cond_init(&receiver_client1_cond, NULL)) 
+ 		output.critical("error initializing receiver_client1_cond", errno);
+ 	if(pthread_cond_init(&receiver_client2_cond, NULL)) 
+ 		output.critical("error initializing receiver_client2_cond", errno);
+ 	if(pthread_cond_init(&receiver_network_cond, NULL)) 
+ 		output.critical("error initializing receiver_network_cond", errno);
+ 	if(pthread_mutex_init(&receiver_client1_mutex, NULL)) 
+ 		output.critical("error initializing receiver_client1_mutex", errno);
+ 	if(pthread_mutex_init(&receiver_client2_mutex, NULL)) 
+ 		output.critical("error initializing sender_client2_mutex", errno);
+ 	if(pthread_mutex_init(&receiver_network_mutex, NULL)) 
+ 		output.critical("error initializing sender_network_mutex", errno);
+ 	
  	fd = newfd;
  	total=0;



-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. 
Download it for free - -and be entered to win a 42" plasma tv or your very
own Sony(tm)PSP.  Click here to play: http://sourceforge.net/geronimo.php