From b3f59f9bb668e1d25e5f59a889dd4c693c565702 Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Tue, 7 Aug 2012 09:31:15 +0200 Subject: [PATCH] ThreadPool added into libtransport --- backends/twitter/Requests/CreateFriendRequest.h | 2 +- backends/twitter/Requests/DestroyFriendRequest.h | 2 +- backends/twitter/Requests/DirectMessageRequest.h | 2 +- backends/twitter/Requests/FetchFriends.h | 2 +- backends/twitter/Requests/HelpMessageRequest.h | 2 +- backends/twitter/Requests/OAuthFlow.h | 2 +- backends/twitter/Requests/PINExchangeProcess.h | 2 +- backends/twitter/Requests/ProfileImageRequest.h | 2 +- backends/twitter/Requests/RetweetRequest.h | 2 +- backends/twitter/Requests/StatusUpdateRequest.h | 2 +- backends/twitter/Requests/TimelineRequest.h | 2 +- backends/twitter/TwitterPlugin.h | 2 +- backends/twitter/ThreadPool.h => include/transport/threadpool.h | 0 backends/twitter/ThreadPool.cpp => src/threadpool.cpp | 2 +- 14 files changed, 13 insertions(+), 13 deletions(-) rename backends/twitter/ThreadPool.h => include/transport/threadpool.h (100%) rename backends/twitter/ThreadPool.cpp => src/threadpool.cpp (98%) diff --git a/backends/twitter/Requests/CreateFriendRequest.h b/backends/twitter/Requests/CreateFriendRequest.h index cf3fd04f..bc8cc583 100644 --- a/backends/twitter/Requests/CreateFriendRequest.h +++ b/backends/twitter/Requests/CreateFriendRequest.h @@ -1,7 +1,7 @@ #ifndef CREATE_FRIEND #define CREATE_FRIEND -#include "../ThreadPool.h" +#include "transport/threadpool.h" #include "../TwitterResponseParser.h" #include "../libtwitcurl/twitcurl.h" #include "transport/logging.h" diff --git a/backends/twitter/Requests/DestroyFriendRequest.h b/backends/twitter/Requests/DestroyFriendRequest.h index f1706c4d..031e4958 100644 --- a/backends/twitter/Requests/DestroyFriendRequest.h +++ b/backends/twitter/Requests/DestroyFriendRequest.h @@ -1,7 +1,7 @@ #ifndef DESTROY_FRIEND #define DESTROY_FRIEND -#include "../ThreadPool.h" +#include "transport/threadpool.h" #include "../TwitterResponseParser.h" #include "../libtwitcurl/twitcurl.h" #include "transport/logging.h" diff --git a/backends/twitter/Requests/DirectMessageRequest.h b/backends/twitter/Requests/DirectMessageRequest.h index 6ae27f5c..19357759 100644 --- a/backends/twitter/Requests/DirectMessageRequest.h +++ b/backends/twitter/Requests/DirectMessageRequest.h @@ -1,7 +1,7 @@ #ifndef DIRECT_MESSAGE #define DIRECT_MESSAGE -#include "../ThreadPool.h" +#include "transport/threadpool.h" #include "../TwitterResponseParser.h" #include "../libtwitcurl/twitcurl.h" #include "transport/logging.h" diff --git a/backends/twitter/Requests/FetchFriends.h b/backends/twitter/Requests/FetchFriends.h index 936465cd..7acc2819 100644 --- a/backends/twitter/Requests/FetchFriends.h +++ b/backends/twitter/Requests/FetchFriends.h @@ -1,7 +1,7 @@ #ifndef FRIENDS_H #define FRIENDS_H -#include "../ThreadPool.h" +#include "transport/threadpool.h" #include "../libtwitcurl/twitcurl.h" #include "../TwitterResponseParser.h" #include "transport/logging.h" diff --git a/backends/twitter/Requests/HelpMessageRequest.h b/backends/twitter/Requests/HelpMessageRequest.h index c1c8b85b..14188eb3 100644 --- a/backends/twitter/Requests/HelpMessageRequest.h +++ b/backends/twitter/Requests/HelpMessageRequest.h @@ -1,7 +1,7 @@ #ifndef HELPMESSAGE_H #define HELPMESSAGE_H -#include "../ThreadPool.h" +#include "transport/threadpool.h" #include "../libtwitcurl/twitcurl.h" #include "transport/networkplugin.h" #include "transport/logging.h" diff --git a/backends/twitter/Requests/OAuthFlow.h b/backends/twitter/Requests/OAuthFlow.h index bbc730c6..cbf7d019 100644 --- a/backends/twitter/Requests/OAuthFlow.h +++ b/backends/twitter/Requests/OAuthFlow.h @@ -1,7 +1,7 @@ #ifndef OAUTH_FLOW #define OAUTH_FLOW -#include "../ThreadPool.h" +#include "transport/threadpool.h" #include "../libtwitcurl/twitcurl.h" #include "../TwitterPlugin.h" #include "transport/logging.h" diff --git a/backends/twitter/Requests/PINExchangeProcess.h b/backends/twitter/Requests/PINExchangeProcess.h index 6d94085c..8007c305 100644 --- a/backends/twitter/Requests/PINExchangeProcess.h +++ b/backends/twitter/Requests/PINExchangeProcess.h @@ -1,7 +1,7 @@ #ifndef PIN_EXCHANGE #define PIN_EXCHANGE -#include "../ThreadPool.h" +#include "transport/threadpool.h" #include "../libtwitcurl/twitcurl.h" #include "../TwitterPlugin.h" #include "transport/networkplugin.h" diff --git a/backends/twitter/Requests/ProfileImageRequest.h b/backends/twitter/Requests/ProfileImageRequest.h index 1a172117..fb26e204 100644 --- a/backends/twitter/Requests/ProfileImageRequest.h +++ b/backends/twitter/Requests/ProfileImageRequest.h @@ -1,7 +1,7 @@ #ifndef PROFILEIMAGE_H #define PROFILEIMAGE_H -#include "../ThreadPool.h" +#include "transport/threadpool.h" #include "../TwitterResponseParser.h" #include "transport/logging.h" #include "transport/config.h" diff --git a/backends/twitter/Requests/RetweetRequest.h b/backends/twitter/Requests/RetweetRequest.h index 04a48ffc..b514b94d 100644 --- a/backends/twitter/Requests/RetweetRequest.h +++ b/backends/twitter/Requests/RetweetRequest.h @@ -1,7 +1,7 @@ #ifndef RETWEET_H #define RETWEET_H -#include "../ThreadPool.h" +#include "transport/threadpool.h" #include "../TwitterResponseParser.h" #include "../libtwitcurl/twitcurl.h" #include "transport/networkplugin.h" diff --git a/backends/twitter/Requests/StatusUpdateRequest.h b/backends/twitter/Requests/StatusUpdateRequest.h index f2dd8f40..8491abb1 100644 --- a/backends/twitter/Requests/StatusUpdateRequest.h +++ b/backends/twitter/Requests/StatusUpdateRequest.h @@ -1,7 +1,7 @@ #ifndef STATUS_UPDATE #define STATUS_UPDATE -#include "../ThreadPool.h" +#include "transport/threadpool.h" #include "../libtwitcurl/twitcurl.h" #include "transport/networkplugin.h" #include "transport/logging.h" diff --git a/backends/twitter/Requests/TimelineRequest.h b/backends/twitter/Requests/TimelineRequest.h index de39aa52..05bcc8c0 100644 --- a/backends/twitter/Requests/TimelineRequest.h +++ b/backends/twitter/Requests/TimelineRequest.h @@ -1,7 +1,7 @@ #ifndef TIMELINE_H #define TIMELINE_H -#include "../ThreadPool.h" +#include "transport/threadpool.h" #include "../libtwitcurl/twitcurl.h" #include "../TwitterResponseParser.h" #include "transport/logging.h" diff --git a/backends/twitter/TwitterPlugin.h b/backends/twitter/TwitterPlugin.h index e470723a..41bfc8ca 100644 --- a/backends/twitter/TwitterPlugin.h +++ b/backends/twitter/TwitterPlugin.h @@ -8,6 +8,7 @@ #include "transport/mysqlbackend.h" #include "transport/pqxxbackend.h" #include "transport/storagebackend.h" +#include "transport/threadpool.h" #include "Swiften/Swiften.h" #include "unistd.h" @@ -31,7 +32,6 @@ #include #include -#include "ThreadPool.h" #include "Swiften/StringCodecs/SHA1.h" using namespace boost::filesystem; diff --git a/backends/twitter/ThreadPool.h b/include/transport/threadpool.h similarity index 100% rename from backends/twitter/ThreadPool.h rename to include/transport/threadpool.h diff --git a/backends/twitter/ThreadPool.cpp b/src/threadpool.cpp similarity index 98% rename from backends/twitter/ThreadPool.cpp rename to src/threadpool.cpp index a7344dbc..23f6be52 100644 --- a/backends/twitter/ThreadPool.cpp +++ b/src/threadpool.cpp @@ -1,4 +1,4 @@ -#include "ThreadPool.h" +#include "transport/threadpool.h" DEFINE_LOGGER(logger, "ThreadPool") boost::signals2::signal< void (Thread*, int) > onWorkCompleted;