nanopenguin/verts-twmailer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rewrite to POSIX threads

Browse Source
This commit is contained in:
Benedikt Galbavy 2023-11-15 18:52:22 +01:00
parent 90d338f0a0
commit 4ecd73bed9
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/server.cpp
View File

@ -48,7 +48,7 @@ bool abortRequested = false;
int create_socket = -1; int create_socket = -1;
int new_socket = -1; int new_socket = -1;
std::vector<std::thread> threads; std::vector<pthread_t> threads;
void printUsage(); void printUsage();
inline bool isInteger(const std::string & s); inline bool isInteger(const std::string & s);
@ -59,7 +59,7 @@ std::string saveToFile(fs::path object_dir, std::string message);
std::string getSha1(const std::string& p_arg); std::string getSha1(const std::string& p_arg);
// from myserver.c // from myserver.c
void *clientCommunication(int data); void *clientCommunication(void *data);
void signalHandler(int sig); void signalHandler(int sig);
std::string cmdSEND(std::vector<std::string>& received); std::string cmdSEND(std::vector<std::string>& received);
@ -169,7 +169,9 @@ int main (int argc, char* argv[])
inet_ntoa(cliaddress.sin_addr), inet_ntoa(cliaddress.sin_addr),
ntohs(cliaddress.sin_port)); ntohs(cliaddress.sin_port));
// clientCommunication(&new_socket); // returnValue can be ignored // clientCommunication(&new_socket); // returnValue can be ignored
threads.emplace_back(clientCommunication, new_socket); pthread_t tid;
pthread_create(&tid, NULL, clientCommunication, (void *)new int(new_socket));
threads.push_back(tid);
new_socket = -1; new_socket = -1;
} }
@ -204,11 +206,11 @@ void printUsage()
printf("Usage: <twmailer-server [port] [path spool_directory]>\n"); printf("Usage: <twmailer-server [port] [path spool_directory]>\n");
} }
void *clientCommunication(int data) void *clientCommunication(void *data)
{ {
char buffer[BUF]; char buffer[BUF];
int size; int size;
int *current_socket = &data; int *current_socket = (int *)data;
std::string incomplete_message = ""; std::string incomplete_message = "";
@ -300,6 +302,7 @@ void *clientCommunication(int data)
*current_socket = -1; *current_socket = -1;
} }
delete(current_socket);
return NULL; return NULL;
} }
@ -366,7 +369,7 @@ std::string getSha1(const std::string& str)
inline void exiting() inline void exiting()
{ {
for (auto& thread : threads) { for (auto& thread : threads) {
thread.join(); pthread_join(thread, NULL);
} }
user_handler::getInstance().saveAll(); user_handler::getInstance().saveAll();