diff --git a/libs/main/core/pibase.h b/libs/main/core/pibase.h index c8eff9d8..b066e6cd 100644 --- a/libs/main/core/pibase.h +++ b/libs/main/core/pibase.h @@ -248,6 +248,10 @@ typedef long time_t; #endif +#ifdef POSIX_SIGNALS +# define PIP_INTERRUPT_SIGNAL SIGTERM +#endif + #ifdef LINUX # define environ __environ #endif diff --git a/libs/main/core/piinit.cpp b/libs/main/core/piinit.cpp index 6d29486f..3c768797 100644 --- a/libs/main/core/piinit.cpp +++ b/libs/main/core/piinit.cpp @@ -104,7 +104,8 @@ void pipInitThreadSignals() { sigemptyset(&actions.sa_mask); actions.sa_flags = 0; actions.sa_handler = pipThreadSignalHandler; - sigaction(SIGUSR2, &actions, 0); + if (sigaction(PIP_INTERRUPT_SIGNAL, &actions, 0) != 0) + piCout << "sigaction error:" << errorString(); } #endif diff --git a/libs/main/thread/pithread.cpp b/libs/main/thread/pithread.cpp index dccba139..5b8f372b 100644 --- a/libs/main/thread/pithread.cpp +++ b/libs/main/thread/pithread.cpp @@ -608,7 +608,7 @@ void PIThread::interrupt() { QueueUserAPC(winThreadAPC, PRIVATE->thread, 0); #else # ifdef POSIX_SIGNALS - pthread_kill(PRIVATE->thread, SIGUSR2); + pthread_kill(PRIVATE->thread, PIP_INTERRUPT_SIGNAL); # endif #endif } diff --git a/main.cpp b/main.cpp index f39e4f49..46f90d43 100644 --- a/main.cpp +++ b/main.cpp @@ -80,7 +80,7 @@ public: }; int main(int argc, char * argv[]) { - piCout << "main" << GetCurrentThreadId(); + piCout << "main"; /*for (int i = 0; i < count; ++i) pipes[i].create(); @@ -109,8 +109,8 @@ int main(int argc, char * argv[]) { delete threads[i]; }*/ - PIEthernet eth(PIEthernet::TCP_Client), seth(PIEthernet::TCP_Client); - eth.connect("192.168.1.13", 22); + PIEthernet eth(PIEthernet::UDP), seth(PIEthernet::TCP_Client); + eth.connect("127.0.0.1", 50000); eth.startThreadedRead(); //piCout << eth.open();