Changeset - 1aba0d0d2eed
Parent rev.
Child rev.
[Not reviewed]
0 7 0
Vitaly Takmazov - 13 years ago 2013-02-03 13:10:17
vitalyster@gmail.com
Fixed osx compilation
7 files changed with 51 insertions and 5 deletions:
CMakeLists.txt
11
1
backends/swiften/main.cpp
4
spectrum/src/main.cpp
4
spectrum_manager/src/CMakeLists.txt
3
src/CMakeLists.txt
4
1
src/memoryusage.cpp
21
3
src/usermanager.cpp
4
0 comments (0 inline, 0 general)
CMakeLists.txt
➞
Show inline comments
 
@@ -100,25 +100,25 @@ endif(WIN32)
 
message( STATUS "Found Boost: ${Boost_LIBRARIES}, ${Boost_INCLUDE_DIR}")
 

			




	
	
	
		
 
# FIND POPT

			




	
	
	
		
 
if (NOT WIN32)

			




	
	
	
		
 
	set(popt_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")

			




	
	
	
		
 
	find_package(popt REQUIRED)

			




	
	
	
		
 
endif()

			




	
	
	
		
 

			




	
	
	
		
 
###### Database ######

			




	
	
	
		
 

			




	
	
	
		
 
# FIND SQLITE3

			




	
	
	
		
 
if (ENABLE_SQLITE3)

			




	
	
	
		
 
	if (NOT CMAKE_COMPILER_IS_GNUCXX)

			




	
	
	
		
 
	if (MSVC)

			




	
	
	
		
 
		ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/msvc-deps)

			




	
	
	
		
 
	else()

			




	
	
	
		
 
		if (WIN32)

			




	
	
	
		
 
			ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/msvc-deps/sqlite3)

			




	
	
	
		
 
		else()

			




	
	
	
		
 
			set(sqlite3_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")

			




	
	
	
		
 
			find_package(sqlite3)

			




	
	
	
		
 
		endif()

			




	
	
	
		
 
	endif()

			




	
	
	
		
 
endif()

			




	
	
	
		
 

			




	
	
	
		
 
# FIND MYSQL

			




	
	
		
 
@@ -239,24 +239,34 @@ endif()

			




	
	
	
		
 
# FIND CPPUNIT

			




	
	
	
		
 
if(ENABLE_TESTS)

			




	
	
	
		
 
	set(cppunit_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")

			




	
	
	
		
 
	find_package(cppunit)

			




	
	
	
		
 

			




	
	
	
		
 
	if(NOT CPPUNIT_FOUND AND CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARY)

			




	
	
	
		
 
		set(CCPUNIT_LIBRARIES ${CPPUNIT_LIBRARY})

			




	
	
	
		
 
		set(CPPUNIT_FOUND 1)

			




	
	
	
		
 
		message(STATUS "Using cppunit: ${CPPUNIT_INCLUDE_DIR} ${CPPUNIT_LIBRARIES}")

			




	
	
	
		
 
	endif()

			




	
	
	
		
 
endif()

			




	
	
	
		
 

			




	
	
	
		
 
if (APPLE)

			




	
	
	
		
 
        FIND_LIBRARY(IOKIT_FRAMEWORK IOKit)

			




	
	
	
		
 
        FIND_LIBRARY(SECURITY_FRAMEWORK Security)

			




	
	
	
		
 
        FIND_LIBRARY(APPKIT_FRAMEWORK AppKit)

			




	
	
	
		
 
        FIND_LIBRARY(SYSTEMCONFIGURATION_FRAMEWORK SystemConfiguration)

			




	
	
	
		
 
        FIND_LIBRARY(SECURITYINTERFACE_FRAMEWORK SecurityInterface)

			




	
	
	
		
 
        MARK_AS_ADVANCED(IOKIT_FRAMEWORK APPKIT_FRAMEWORK SYSTEMCONFIGURATION_FRAMEWORK SECURITY_FRAMEWORK SECURITYINTERFACE_FRAMEWORK)

			




	
	
	
		
 
        SET (APPLE_FRAMEWORKS ${IOKIT_FRAMEWORK} ${APPKIT_FRAMEWORK} ${SYSTEMCONFIGURATION_FRAMEWORK} ${SECURITY_FRAMEWORK} ${SECURITYINTERFACE_FRAMEWORK})

			




	
	
	
		
 
endif()

			




	
	
	
		
 

			




	
	
	
		
 
message("  Supported features")

			




	
	
	
		
 
message("-----------------------")

			




	
	
	
		
 

			




	
	
	
		
 
if (SPECTRUM_VERSION)

			




	
	
	
		
 
	ADD_DEFINITIONS(-DSPECTRUM_VERSION="${SPECTRUM_VERSION}")

			




	
	
	
		
 
else (SPECTRUM_VERSION)

			




	
	
	
		
 
	if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)

			




	
	
	
		
 
		if (NOT GIT_EXECUTABLE)

			




	
	
	
		
 
		set (GIT_EXECUTABLE git)

			




	
	
	
		
 
		endif()

			




	
	
	
		
 
		execute_process(COMMAND ${GIT_EXECUTABLE} "--git-dir=${CMAKE_CURRENT_SOURCE_DIR}/.git" rev-parse --short HEAD

			




	
	
	
		
 
						OUTPUT_VARIABLE GIT_REVISION

			




        

    


    
    

    

        

                

                    backends/swiften/main.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -8,27 +8,29 @@

			




	
	
	
		
 
// Swiften

			




	
	
	
		
 
#include "Swiften/Swiften.h"

			




	
	
	
		
 

			




	
	
	
		
 
#ifndef WIN32

			




	
	
	
		
 
// for signal handler

			




	
	
	
		
 
#include "unistd.h"

			




	
	
	
		
 
#include "signal.h"

			




	
	
	
		
 
#include "sys/wait.h"

			




	
	
	
		
 
#include "sys/signal.h"

			




	
	
	
		
 
#endif

			




	
	
	
		
 

			




	
	
	
		
 
#ifndef __FreeBSD__

			




	
	
	
		
 
#ifndef __MACH__

			




	
	
	
		
 
// malloc_trim

			




	
	
	
		
 
#include "malloc.h"

			




	
	
	
		
 
#endif

			




	
	
	
		
 
#endif

			




	
	
	
		
 

			




	
	
	
		
 
// Boost

			




	
	
	
		
 
#include <boost/algorithm/string.hpp>

			




	
	
	
		
 
using namespace boost::filesystem;

			




	
	
	
		
 
using namespace boost::program_options;

			




	
	
	
		
 
using namespace Transport;

			




	
	
	
		
 

			




	
	
	
		
 
DEFINE_LOGGER(logger, "Swiften");

			




	
	
	
		
 

			




	
	
	
		
 
// eventloop

			




	
	
	
		
 
Swift::SimpleEventLoop *loop_;

			




	
	
	
		
 

			




	
	
		
 
@@ -180,27 +182,29 @@ class SwiftenPlugin : public NetworkPlugin {

			




	
	
	
		
 

			




	
	
	
		
 
			boost::shared_ptr<Swift::Client> client = m_users[user];

			




	
	
	
		
 
			if (client) {

			




	
	
	
		
 
				client->onConnected.disconnect(boost::bind(&SwiftenPlugin::handleSwiftConnected, this, user));

			




	
	
	
		
 
				client->onDisconnected.disconnect(boost::bind(&SwiftenPlugin::handleSwiftDisconnected, this, user, _1));

			




	
	
	
		
 
				client->onMessageReceived.disconnect(boost::bind(&SwiftenPlugin::handleSwiftMessageReceived, this, user, _1));

			




	
	
	
		
 
				m_users.erase(user);

			




	
	
	
		
 
				m_mucs.erase(user);

			




	
	
	
		
 
			}

			




	
	
	
		
 

			




	
	
	
		
 
#ifndef WIN32

			




	
	
	
		
 
#ifndef __FreeBSD__

			




	
	
	
		
 
#ifndef __MACH__

			




	
	
	
		
 
			// force returning of memory chunks allocated by libxml2 to kernel

			




	
	
	
		
 
			malloc_trim(0);

			




	
	
	
		
 
#endif

			




	
	
	
		
 
#endif

			




	
	
	
		
 
#endif

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		void handleSwiftConnected(const std::string &user) {

			




	
	
	
		
 
			LOG4CXX_INFO(logger, user << ": Connected to XMPP server.");

			




	
	
	
		
 
			handleConnected(user);

			




	
	
	
		
 
			m_users[user]->requestRoster();

			




	
	
	
		
 
			Swift::Presence::ref response = Swift::Presence::create();

			




	
	
	
		
 
			response->setFrom(m_users[user]->getJID());

			




	
	
	
		
 
			m_users[user]->sendPresence(response);

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    spectrum/src/main.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -19,26 +19,28 @@

			




	
	
	
		
 
#include "Swiften/EventLoop/SimpleEventLoop.h"

			




	
	
	
		
 
#include "Swiften/Network/BoostNetworkFactories.h"

			




	
	
	
		
 
#include <boost/filesystem.hpp>

			




	
	
	
		
 
#include <boost/algorithm/string.hpp>

			




	
	
	
		
 
#ifndef WIN32

			




	
	
	
		
 
#include "sys/signal.h"

			




	
	
	
		
 
#include "sys/stat.h"

			




	
	
	
		
 
#include <pwd.h>

			




	
	
	
		
 
#include <grp.h>

			




	
	
	
		
 
#include <sys/resource.h>

			




	
	
	
		
 
#include "libgen.h"

			




	
	
	
		
 
#ifndef __FreeBSD__

			




	
	
	
		
 
#ifndef __MACH__

			




	
	
	
		
 
#include <malloc.h>

			




	
	
	
		
 
#endif

			




	
	
	
		
 
#endif

			




	
	
	
		
 
#else

			




	
	
	
		
 
#include <process.h>

			




	
	
	
		
 
#define getpid _getpid

			




	
	
	
		
 
#include "win32/ServiceWrapper.h"

			




	
	
	
		
 
#endif

			




	
	
	
		
 
#include <sys/stat.h>

			




	
	
	
		
 

			




	
	
	
		
 
using namespace Transport;

			




	
	
	
		
 
using namespace Transport::Util;

			




	
	
	
		
 

			




	
	
	
		
 
DEFINE_LOGGER(logger, "Spectrum");

			




	
	
	
		
 

			




	
	
		
 
@@ -299,28 +301,30 @@ int main(int argc, char **argv)

			




	
	
	
		
 
	std::string config_file;

			




	
	
	
		
 
	std::string jid;

			




	
	
	
		
 
#ifdef WIN32

			




	
	
	
		
 
	std::string install_service_name, uninstall_service_name, run_service_name;

			




	
	
	
		
 
	// determine the name of the currently executing file

			




	
	
	
		
 
	char szFilePath[MAX_PATH];

			




	
	
	
		
 
	GetModuleFileNameA(NULL, szFilePath, sizeof(szFilePath));

			




	
	
	
		
 
	std::string exe_file(szFilePath);					

			




	
	
	
		
 
#endif	

			




	
	
	
		
 
	setlocale(LC_ALL, "");

			




	
	
	
		
 
#ifndef WIN32

			




	
	
	
		
 
#ifndef __FreeBSD__

			




	
	
	
		
 
#ifndef __MACH__

			




	
	
	
		
 
	mallopt(M_CHECK_ACTION, 2);

			




	
	
	
		
 
	mallopt(M_PERTURB, 0xb);

			




	
	
	
		
 
#endif

			




	
	
	
		
 
#endif

			




	
	
	
		
 
#endif

			




	
	
	
		
 

			




	
	
	
		
 
#ifndef WIN32

			




	
	
	
		
 
	if (signal(SIGINT, spectrum_sigint_handler) == SIG_ERR) {

			




	
	
	
		
 
		std::cout << "SIGINT handler can't be set\n";

			




	
	
	
		
 
		return -1;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	if (signal(SIGTERM, spectrum_sigterm_handler) == SIG_ERR) {

			




	
	
	
		
 
		std::cout << "SIGTERM handler can't be set\n";

			




	
	
	
		
 
		return -1;

			




	
	
	
		
 
	}

			




	
	
	
		
 
#else

			




        

    


    
    

    

        

                

                    spectrum_manager/src/CMakeLists.txt
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
cmake_minimum_required(VERSION 2.6)

			




	
	
	
		
 
FILE(GLOB SRC *.cpp *.c)

			




	
	
	
		
 

			




	
	
	
		
 
ADD_EXECUTABLE(spectrum2_manager ${SRC} ../../src/config.cpp ../../src/util.cpp ${CMAKE_CURRENT_SOURCE_DIR}/../../include/transport/protocol.pb.cc)

			




	
	
	
		
 

			




	
	
	
		
 
ADD_DEPENDENCIES(spectrum2_manager pb)

			




	
	
	
		
 
SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/../../include/transport/protocol.pb.cc PROPERTIES GENERATED 1)

			




	
	
	
		
 

			




	
	
	
		
 
target_link_libraries(spectrum2_manager ${SWIFTEN_LIBRARY} ${PROTOBUF_LIBRARIES})

			




	
	
	
		
 

			




	
	
	
		
 
if(APPLE)

			




	
	
	
		
 
target_link_libraries(spectrum2_manager ${APPLE_FRAMEWORKS})

			




	
	
	
		
 
endif()

			




	
	
	
		
 
INSTALL(TARGETS spectrum2_manager RUNTIME DESTINATION bin)

			




	
	
	
		
 

			




	
	
	
		
 
INSTALL(FILES

			




	
	
	
		
 
	spectrum_manager.cfg

			




	
	
	
		
 
	DESTINATION /etc/spectrum2

			




	
	
	
		
 
	)

			




        

    


    
    

    

        

                

                    src/CMakeLists.txt
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
cmake_minimum_required(VERSION 2.6)

			




	
	
	
		
 
FILE(GLOB SRC *.cpp *.h)

			




	
	
	
		
 
FILE(GLOB_RECURSE SWIFTEN_SRC ../include/Swiften/*.cpp)

			




	
	
	
		
 

			




	
	
	
		
 
# Build without openssl on msvc

			




	
	
	
		
 
if (CMAKE_COMPILER_IS_GNUCXX)

			




	
	
	
		
 
if (NOT MSVC)

			




	
	
	
		
 
	string(REGEX REPLACE "[^;]+;?/Schannel/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}") 

			




	
	
	
		
 
else()

			




	
	
	
		
 
	string(REGEX REPLACE "[^;]+;?/OpenSSL/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}") 

			




	
	
	
		
 
endif()

			




	
	
	
		
 

			




	
	
	
		
 
FILE(GLOB HEADERS ../include/transport/*.h)

			




	
	
	
		
 

			




	
	
	
		
 
if (CPPUNIT_FOUND)

			




	
	
	
		
 
	FILE(GLOB SRC_TEST tests/*.cpp)

			




	
	
	
		
 

			




	
	
	
		
 
	ADD_EXECUTABLE(libtransport_test ${SRC_TEST})

			




	
	
	
		
 
	set_target_properties(libtransport_test PROPERTIES COMPILE_DEFINITIONS LIBTRANSPORT_TEST=1)

			




	
	
		
 
@@ -46,17 +46,20 @@ endif(PROTOBUF_FOUND)

			




	
	
	
		
 
# endif()

			




	
	
	
		
 

			




	
	
	
		
 
if (WIN32)

			




	
	
	
		
 
	include_directories("${CMAKE_SOURCE_DIR}/msvc-deps/sqlite3")

			




	
	
	
		
 
	TARGET_LINK_LIBRARIES(transport transport-plugin sqlite3 ${PQXX_LIBRARY} ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARY})

			




	
	
	
		
 
else()

			




	
	
	
		
 
	TARGET_LINK_LIBRARIES(transport transport-plugin ${PQXX_LIBRARY} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY} ${PROTOBUF_LIBRARY})

			




	
	
	
		
 
endif()

			




	
	
	
		
 

			




	
	
	
		
 
SET_TARGET_PROPERTIES(transport PROPERTIES

			




	
	
	
		
 
      VERSION ${TRANSPORT_VERSION} SOVERSION ${TRANSPORT_VERSION}

			




	
	
	
		
 
)

			




	
	
	
		
 
if (APPLE)

			




	
	
	
		
 
	TARGET_LINK_LIBRARIES(transport ${APPLE_FRAMEWORKS})

			




	
	
	
		
 
endif()

			




	
	
	
		
 

			




	
	
	
		
 
INSTALL(TARGETS transport LIBRARY DESTINATION ${LIB_INSTALL_DIR} ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT libraries)

			




	
	
	
		
 

			




	
	
	
		
 
#CONFIGURE_FILE(transport.pc.in "${CMAKE_CURRENT_BINARY_DIR}/transport.pc")

			




	
	
	
		
 
#INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/transport.pc" DESTINATION lib/pkgconfig)

			




        

    


    
    

    

        

                

                    src/memoryusage.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -20,37 +20,55 @@

			




	
	
	
		
 

			




	
	
	
		
 
#include "transport/memoryusage.h"

			




	
	
	
		
 

			




	
	
	
		
 
#include <iostream>

			




	
	
	
		
 
#include <cstring>

			




	
	
	
		
 
#include <sstream>

			




	
	
	
		
 
#include <fstream>

			




	
	
	
		
 
#include <algorithm>

			




	
	
	
		
 
#include <boost/lexical_cast.hpp>

			




	
	
	
		
 
#ifndef WIN32

			




	
	
	
		
 
#include <sys/param.h>

			




	
	
	
		
 
#endif

			




	
	
	
		
 
#ifdef BSD

			




	
	
	
		
 
#ifdef __MACH__

			




	
	
	
		
 
#include <mach/mach.h>

			




	
	
	
		
 
#elif BSD

			




	
	
	
		
 
#include <sys/types.h>

			




	
	
	
		
 
#include <sys/sysctl.h>

			




	
	
	
		
 
#include <sys/param.h>

			




	
	
	
		
 
#include <sys/sysctl.h>

			




	
	
	
		
 
#include <sys/user.h>

			




	
	
	
		
 

			




	
	
	
		
 
#endif

			




	
	
	
		
 

			




	
	
	
		
 
namespace Transport {

			




	
	
	
		
 

			




	
	
	
		
 
#ifndef WIN32

			




	
	
	
		
 
#ifdef BSD

			




	
	
	
		
 
#ifdef __MACH__

			




	
	
	
		
 

			




	
	
	
		
 
void process_mem_usage(double& vm_usage, double& resident_set, pid_t pid) {

			




	
	
	
		
 

			




	
	
	
		
 
	struct task_basic_info t_info;

			




	
	
	
		
 
	mach_msg_type_number_t t_info_count = TASK_BASIC_INFO_COUNT;

			




	
	
	
		
 

			




	
	
	
		
 
	if (KERN_SUCCESS != task_info(mach_task_self(),

			




	
	
	
		
 
                              TASK_BASIC_INFO, (task_info_t)&t_info, 

			




	
	
	
		
 
                              &t_info_count)) {

			




	
	
	
		
 
		vm_usage = 0;

			




	
	
	
		
 
		resident_set = 0;

			




	
	
	
		
 
    		return;

			




	
	
	
		
 
	}

			




	
	
	
		
 
	vm_usage = t_info.virtual_size;

			




	
	
	
		
 
	resident_set = t_info.resident_size;

			




	
	
	
		
 
}

			




	
	
	
		
 
#elif BSD

			




	
	
	
		
 
void process_mem_usage(double& vm_usage, double& resident_set, pid_t pid) {

			




	
	
	
		
 
	int mib[4];

			




	
	
	
		
 
	size_t size;

			




	
	
	
		
 
	mib[0] = CTL_KERN;

			




	
	
	
		
 
	mib[1] = KERN_PROC;

			




	
	
	
		
 
	mib[2] = KERN_PROC_PID;

			




	
	
	
		
 
	if (pid == 0) {

			




	
	
	
		
 
		mib[3] = getpid();

			




	
	
	
		
 
	}

			




	
	
	
		
 
	else {

			




	
	
	
		
 
		mib[3] = pid;

			




	
	
	
		
 
	}

			




        

    


    
    

    

        

                

                    src/usermanager.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -25,26 +25,28 @@

			




	
	
	
		
 
#include "transport/conversationmanager.h"

			




	
	
	
		
 
#include "transport/rostermanager.h"

			




	
	
	
		
 
#include "transport/userregistry.h"

			




	
	
	
		
 
#include "transport/logging.h"

			




	
	
	
		
 
#include "transport/discoitemsresponder.h"

			




	
	
	
		
 
#include "storageresponder.h"

			




	
	
	
		
 

			




	
	
	
		
 
#include "Swiften/Server/ServerStanzaChannel.h"

			




	
	
	
		
 
#include "Swiften/Elements/StreamError.h"

			




	
	
	
		
 
#include "Swiften/Elements/MUCPayload.h"

			




	
	
	
		
 
#include "Swiften/Elements/ChatState.h"

			




	
	
	
		
 
#ifndef __FreeBSD__ 

			




	
	
	
		
 
#ifndef __MACH__

			




	
	
	
		
 
#include "malloc.h"

			




	
	
	
		
 
#endif

			




	
	
	
		
 
#endif

			




	
	
	
		
 
// #include "valgrind/memcheck.h"

			




	
	
	
		
 

			




	
	
	
		
 
namespace Transport {

			




	
	
	
		
 

			




	
	
	
		
 
DEFINE_LOGGER(logger, "UserManager");

			




	
	
	
		
 

			




	
	
	
		
 
UserManager::UserManager(Component *component, UserRegistry *userRegistry, DiscoItemsResponder *discoItemsResponder, StorageBackend *storageBackend) {

			




	
	
	
		
 
	m_cachedUser = NULL;

			




	
	
	
		
 
	m_onlineBuddies = 0;

			




	
	
	
		
 
	m_sentToXMPP = 0;

			




	
	
	
		
 
	m_sentToBackend = 0;

			




	
	
	
		
 
	m_component = component;

			




	
	
		
 
@@ -121,27 +123,29 @@ void UserManager::removeUser(User *user, bool onUserBehalf) {

			




	
	
	
		
 
		// We have to clear all received presences for this user in PresenceOracle.

			




	
	
	
		
 
		m_component->getPresenceOracle()->clearPresences(user->getJID().toBare());

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	if (m_storageBackend && onUserBehalf) {

			




	
	
	
		
 
		m_storageBackend->setUserOnline(user->getUserInfo().id, false);

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	onUserDestroyed(user);

			




	
	
	
		
 
	delete user;

			




	
	
	
		
 
#ifndef WIN32

			




	
	
	
		
 
#ifndef __FreeBSD__

			




	
	
	
		
 
#ifndef __MACH__

			




	
	
	
		
 
	malloc_trim(0);

			




	
	
	
		
 
#endif

			




	
	
	
		
 
#endif

			




	
	
	
		
 
#endif

			




	
	
	
		
 
// 	VALGRIND_DO_LEAK_CHECK;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void UserManager::removeAllUsers(bool onUserBehalf) {

			




	
	
	
		
 
	while(m_users.begin() != m_users.end()) {

			




	
	
	
		
 
		removeUser((*m_users.begin()).second, onUserBehalf);

			




	
	
	
		
 
	}

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
int UserManager::getUserCount() {

			




	
	
	
		
 
	return m_users.size();

			




	
	
	
		
 
}

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: srv01-18765
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support