summaryrefslogtreecommitdiffstats
path: root/tsak
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-07-25 14:59:54 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-07-25 14:59:54 -0500
commit391a4b2abedb59a0a432be7492ba5612ba4faec5 (patch)
treeaf08c4e48ed396df6cc3d9f6b27a19e26fde4858 /tsak
parentf449d57ba7d97ded6e00cb45edd5a827a5fa8870 (diff)
downloadtdebase-391a4b2abedb59a0a432be7492ba5612ba4faec5.tar.gz
tdebase-391a4b2abedb59a0a432be7492ba5612ba4faec5.zip
Fix tsak not destroying old virtual keyboards
Diffstat (limited to 'tsak')
-rw-r--r--tsak/main.cpp78
1 files changed, 58 insertions, 20 deletions
diff --git a/tsak/main.cpp b/tsak/main.cpp
index e49c0514..2cac66a3 100644
--- a/tsak/main.cpp
+++ b/tsak/main.cpp
@@ -34,6 +34,7 @@ License along with tsak. If not, see http://www.gnu.org/licenses/.
#include <sys/stat.h>
#include <sys/select.h>
#include <sys/time.h>
+#include <sys/wait.h>
#include <termios.h>
#include <signal.h>
extern "C" {
@@ -72,6 +73,9 @@ int keyboard_fds[MAX_KEYBOARDS];
int child_pids[MAX_KEYBOARDS];
int child_led_pids[MAX_KEYBOARDS];
+int current_keyboard = -1;
+int devout[MAX_KEYBOARDS];
+
const char *keycode[256] =
{
"", "<esc>", "1", "2", "3", "4", "5", "6", "7", "8",
@@ -119,6 +123,15 @@ void signal_callback_handler(int signum)
void tsak_friendly_termination() {
int i;
+ if ((current_keyboard >= 0) && (devout[current_keyboard] > 0)) {
+ if (ioctl(devout[current_keyboard],UI_DEV_DESTROY)<0) {
+ fprintf(stderr, "[tsak] Unable to destroy input device with UI_DEV_DESTROY\n");
+ }
+ else {
+ fprintf(stderr, "[tsak] Device destroyed\n");
+ }
+ }
+
// Close down all child processes
for (i=0; i<MAX_KEYBOARDS; i++) {
if (child_pids[i] != 0) {
@@ -378,10 +391,22 @@ void restart_tsak()
// Close down all child processes
for (i=0; i<MAX_KEYBOARDS; i++) {
if (child_pids[i] != 0) {
- kill(child_pids[i], SIGKILL);
+ kill(child_pids[i], SIGTERM);
}
if (child_led_pids[i] != 0) {
- kill(child_led_pids[i], SIGKILL);
+ kill(child_led_pids[i], SIGTERM);
+ }
+ }
+
+ // Wait for child process termination
+ for (i=0; i<MAX_KEYBOARDS; i++) {
+ if (child_pids[i] != 0) {
+ waitpid(child_pids[i], NULL, 0);
+ child_pids[i] = 0;
+ }
+ if (child_led_pids[i] != 0) {
+ waitpid(child_led_pids[i], NULL, 0);
+ child_led_pids[i] = 0;
}
}
@@ -435,7 +460,6 @@ int main (int argc, char *argv[])
struct input_event event;
struct input_event revev;
struct uinput_user_dev devinfo={{0},{0}};
- int devout[MAX_KEYBOARDS];
int rd;
int i;
int size = sizeof (struct input_event);
@@ -446,7 +470,6 @@ int main (int argc, char *argv[])
bool established = false;
bool testrun = false;
bool depcheck = false;
- int current_keyboard;
bool can_proceed;
// Ignore SIGPIPE
@@ -495,6 +518,19 @@ int main (int argc, char *argv[])
}
}
+ if ((testrun == false) && (depcheck == false)) {
+ // fork to background
+ int i=fork();
+ if (i<0) {
+ return 10; // fork failed
+ }
+ if (i>0) {
+ // Terminate parent
+ controlpipe.active = false;
+ return 0;
+ }
+ }
+
while (1) {
if (depcheck == false) {
controlpipe.active = true;
@@ -566,7 +602,7 @@ int main (int argc, char *argv[])
for (current_keyboard=0;current_keyboard<keyboard_fd_num;current_keyboard++) {
if(ioctl(keyboard_fds[current_keyboard], EVIOCGRAB, 2) < 0) {
close(keyboard_fds[current_keyboard]);
- fprintf(stderr, "[tsak] Failed to grab exclusive input device lock");
+ fprintf(stderr, "[tsak] Failed to grab exclusive input device lock\n");
if (established) {
sleep(1);
}
@@ -586,10 +622,12 @@ int main (int argc, char *argv[])
}
if (ioctl(devout[current_keyboard],UI_DEV_CREATE)<0) {
fprintf(stderr, "[tsak] Unable to create input device with UI_DEV_CREATE\n");
- if (established)
+ if (established) {
sleep(1);
- else
+ }
+ else {
return 2;
+ }
}
else {
fprintf(stderr, "[tsak] Device created.\n");
@@ -636,7 +674,14 @@ int main (int argc, char *argv[])
while (1) {
if ((rd = read(keyboard_fds[current_keyboard], ev, size)) < size) {
fprintf(stderr, "[tsak] Read failed.\n");
- return 13;
+ if (ioctl(devout[current_keyboard],UI_DEV_DESTROY)<0) {
+ fprintf(stderr, "[tsak] Unable to destroy input device with UI_DEV_DESTROY\n");
+ return 13;
+ }
+ else {
+ fprintf(stderr, "[tsak] Device destroyed.\n");
+ }
+ return 14;
}
if (ev[0].value == 0 && ev[0].type == 1) { // Read the key release event
@@ -677,17 +722,6 @@ int main (int argc, char *argv[])
}
}
- // fork udev monitor process
- int i=fork();
- if (i<0) {
- return 10; // fork failed
- }
- if (i>0) {
- // Terminate parent
- controlpipe.active = false;
- return 0;
- }
-
// Close all keyboard file descriptors; we don't need them in this process and they can end up dangling/locked during forced restart
for (int current_keyboard=0;current_keyboard<keyboard_fd_num;current_keyboard++) {
close(keyboard_fds[current_keyboard]);
@@ -695,13 +729,17 @@ int main (int argc, char *argv[])
}
keyboard_fd_num = 0;
+ if (testrun == true) {
+ return 0;
+ }
+
// Prevent multiple process instances from starting
setupLockingPipe(true);
// Wait a little bit so that udev hotplug can stabilize before we start monitoring
sleep(1);
- fprintf(stderr, "[tsak] Hotplug monitoring process started (%ld)\n", getpid());
+ fprintf(stderr, "[tsak] Hotplug monitoring process started\n");
// Monitor for hotplugged keyboards
int j;