Merge pull request #6 from alexmohr/dev

Fixed exit 
Closing fds
Changed timeout to ms

Author: alexmohr

PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Alexander Mohr <keyboard_backlight at mohr dot io>
 
 pkgname=tp-kb-backlight-git
-pkgver=1.1
+pkgver=1.2
 pkgrel=1
 pkgdesc='Automated keyboard backlight'
 arch=('x86_64')

README.md

@@ -57,7 +57,7 @@ tp_kbd_backlight help
        This device does not re enable keyboard backlight.
        Separate multiple device by space.
        Default: use all mice and keyboard.
-    -t configure timeout after which the backlight will be turned off
+    -t configure timeout in seconds after which the backlight will be turned off
        Defaults to 30s 
     -m configure mouse mode (0..2)
        0 use all mice (default)

kbd_backlight.cpp

@@ -61,7 +61,7 @@ void help() {
 		 "       This device does not re enable keyboard backlight.\n"
 		 "       Separate multiple device by space.\n"
 		 "       Default: use all mice and keyboard.\n"
-		 "    -t configure timeout after which the backlight will be turned off\n"
+		 "    -t configure timeout in seconds after which the backlight will be turned off\n"
 		 "       Defaults to 30s \n"
 		 "    -m configure mouse mode (0..2)\n"
 		 "       0 use all mice (default)\n"
@@ -155,38 +155,39 @@ std::vector<int> open_devices(const std::vector<std::string> &input_devices) {
   }
   return fds;
 }
-
 void brightness_control(const std::string &brightnessPath,
-						unsigned long timeout) {
+						unsigned long timeoutMs) {
   while (!end_) {
-	auto passedSec =
-		std::chrono::duration_cast<std::chrono::seconds>(
-			std::chrono::system_clock::now() - lastEvent_);
+	auto passedMs = std::chrono::duration_cast<
+		std::chrono::milliseconds>(
+		std::chrono::system_clock::now() - lastEvent_);
 
 	if (lastEvent_ < std::chrono::system_clock::now()) {
-	  auto sleepTime = std::chrono::milliseconds(
-		  (timeout - passedSec.count()) * 1000);
+	  auto sleepTime = std::chrono::milliseconds(timeoutMs - passedMs.count());
 	  if (0 != sleepTime.count()) {
 		std::this_thread::sleep_for(sleepTime);
 	  }
 	}
 
-	passedSec =
-		std::chrono::duration_cast<std::chrono::seconds>(
-			std::chrono::system_clock::now() - lastEvent_);
+	passedMs = std::chrono::duration_cast<
+		std::chrono::milliseconds>(
+		std::chrono::system_clock::now() - lastEvent_);
 #if DEBUG
-	printf("passed: %lu\n", passedSec.count());
+	printf("passed: %lu\n", passedMs.count());
 #endif
-	if (passedSec.count() >= static_cast<long>(timeout)) {
-#if __DEBU
-	  printf("timeout reached \n");
+	if (passedMs.count() >= static_cast<long>(timeoutMs)) {
+
+#if DEBUG
+	  printf("timeoutMs reached \n");
 	  printf("o: %lu c: %lu\n", originalBrightness_, currentBrightness_);
 #endif
+
 	  if (currentBrightness_ != 0) {
 		file_read_uint64(brightnessPath, &originalBrightness_);
 		currentBrightness_ = 0;
 
 		file_write_uint64(brightnessPath, 0);
+
 #if DEBUG
 		printf("o: %lu c: %lu\n", originalBrightness_, currentBrightness_);
 		printf("turning off \n");
@@ -208,6 +209,7 @@ void read_events(int devFd, const std::string &brightnessPath) {
 	  if (currentBrightness_ != originalBrightness_) {
 		file_write_uint64(brightnessPath, originalBrightness_);
 		currentBrightness_ = originalBrightness_;
+
 #if DEBUG
 		printf("on\n");
 #endif
@@ -220,13 +222,24 @@ void read_events(int devFd, const std::string &brightnessPath) {
 void signal_handler(int sig) {
   switch (sig) {
 	case SIGTERM:
+	case SIGKILL:
 	  end_ = true;
 	  break;
 	default:
 	  break;
   }
 }
 
+bool is_brightness_writable(const std::string &brightnessPath) {
+  if (!file_read_uint64(brightnessPath, &originalBrightness_)
+	  || !file_write_uint64(brightnessPath, originalBrightness_)) {
+	std::cout << "Write access to brightness device descriptor failed.\n"
+				 "Please run with root privileges" << std::endl;
+	return false;
+  }
+  return true;
+}
+
 void parse_opts(int argc,
 				char *const *argv,
 				std::vector<std::string> &ignoredDevices,
@@ -338,15 +351,11 @@ int main(int argc, char **argv) {
   }
 
   std::string brightnessPath = backlightPath + "brightness";
-  if (!file_read_uint64(brightnessPath, &originalBrightness_)
-	  || !file_write_uint64(brightnessPath, originalBrightness_)
-	  ) {
-	std::cout << "Write access to brightness device descriptor failed.\n"
-				 "Please run with root privileges" << std::endl;
-	exit(EXIT_FAILURE);
+  if (!is_brightness_writable(brightnessPath)){
+    exit(EXIT_FAILURE);
   }
 
-  if (setBrightness >= 0){
+  if (setBrightness >= 0) {
 	file_write_uint64(brightnessPath, setBrightness);
 	exit(0);
   }
@@ -358,7 +367,7 @@ int main(int argc, char **argv) {
 
   if (!foreground) {
 	if (daemon(0, 0)) {
-	  printf("failed to daemonize");
+	  std::cout << "failed to daemonize" << std::endl;
 	  exit(EXIT_FAILURE);
 	}
   }
@@ -374,8 +383,10 @@ int main(int argc, char **argv) {
 							  brightnessPath));
   }
 
-  brightness_control(brightnessPath, timeout);
+  brightness_control(brightnessPath, timeout * 1000);
 
-  for (auto &t : f)
-	t.wait();
+  for (const auto &fd : fds) {
+	close(fd);
+  }
+  exit(0);
 }