diff mbox

alfred: "--update-script" flag for specifying a command for, running when new data piece is receviced.

Message ID 55004A9F.3050908@gmail.com (mailing list archive)
State Superseded, archived
Headers

Commit Message

Anatoliy Lapitskiy March 11, 2015, 2:01 p.m. UTC 
  Added "--update-script" flag for specifying a command for
  running when new data piece is receviced.

Sometimes it's worth to work on data ASAP after they updated and there
is no time to wait for facters.

Signed-off-by: Anatoliy Lapitskiy <anatoliy.lapitskiy@gmail.com>"
---
  alfred.h     | 11 +++++++++++
  main.c       | 10 +++++++++-
  man/alfred.8 |  4 ++++
  recv.c       |  9 ++++++++-
  server.c     | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
  5 files changed, 81 insertions(+), 2 deletions(-)

      }

      netsock_close_all(globals);

Comments

Sven Eckelmann March 12, 2015, 8:47 a.m. UTC | #1 
Applying: alfred: "--update-script" flag for specifying a command for, running 
when new data piece is receviced.
fatal: corrupt patch at line 52
Patch failed at 0001 alfred: "--update-script" flag for specifying a command 
for, running when new data piece is receviced.
The copy of the patch that failed is found in:
   /home/sven/tmp/alfred/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

checkpatch.pl --strict ~/test.eml 
WARNING: please, no spaces at the start of a line
#32: FILE: alfred.h:59:
+    int data_type;$

WARNING: please, no spaces at the start of a line
#33: FILE: alfred.h:60:
+    struct list_head list;$

WARNING: please, no spaces at the start of a line
#43: FILE: alfred.h:126:
+    const char *update_script;$

WARNING: please, no spaces at the start of a line
#44: FILE: alfred.h:127:
+    struct list_head changed_data_types;$

WARNING: please, no spaces at the start of a line
#45: FILE: alfred.h:128:
+    int changed_data_type_count;$

ERROR: patch seems to be corrupt (line wrapped?)
#66: FILE: main.c:62:
used for client-server\n");

ERROR: trailing whitespace
#69: FILE: main.c:64:
+    printf("  -c, --update-script                 path to script to $

WARNING: please, no spaces at the start of a line
#69: FILE: main.c:64:
+    printf("  -c, --update-script                 path to script to $

ERROR: code indent should use tabs where possible
#79: FILE: main.c:157:
+        {"update-script",        required_argument,    NULL, 'c'},$

WARNING: please, no spaces at the start of a line
#79: FILE: main.c:157:
+        {"update-script",        required_argument,    NULL, 'c'},$

WARNING: please, no spaces at the start of a line
#88: FILE: main.c:179:
+    globals->update_script = NULL;$

WARNING: please, no spaces at the start of a line
#89: FILE: main.c:180:
+    INIT_LIST_HEAD(&globals->changed_data_types);$

WARNING: please, no spaces at the start of a line
#90: FILE: main.c:181:
+    globals->changed_data_type_count = 0;$

ERROR: trailing whitespace
#96: FILE: main.c:185:
+    while ((opt = getopt_long(argc, argv, "ms:r:hi:b:vV:M:I:u:dc:", $

WARNING: please, no spaces at the start of a line
#96: FILE: main.c:185:
+    while ((opt = getopt_long(argc, argv, "ms:r:hi:b:vV:M:I:u:dc:", $

WARNING: suspect code indent for conditional statements (4, 9)
#96: FILE: main.c:185:
+    while ((opt = getopt_long(argc, argv, "ms:r:hi:b:vV:M:I:u:dc:", 
[...]
          switch (opt) {

CHECK: Alignment should match open parenthesis
#98: FILE: main.c:186:
+    while ((opt = getopt_long(argc, argv, "ms:r:hi:b:vV:M:I:u:dc:", 
                    &opt_ind)) != -1) {

ERROR: code indent should use tabs where possible
#106: FILE: main.c:245:
+        case 'c':$

WARNING: please, no spaces at the start of a line
#106: FILE: main.c:245:
+        case 'c':$

ERROR: code indent should use tabs where possible
#107: FILE: main.c:246:
+            globals->update_script = optarg;$

WARNING: please, no spaces at the start of a line
#107: FILE: main.c:246:
+            globals->update_script = optarg;$

ERROR: code indent should use tabs where possible
#108: FILE: main.c:247:
+            break;$

WARNING: please, no spaces at the start of a line
#108: FILE: main.c:247:
+            break;$

WARNING: please, no spaces at the start of a line
#140: FILE: recv.c:43:
+    int len, data_len, new_entry;$

ERROR: code indent should use tabs where possible
#149: FILE: recv.c:60:
+        new_entry = 0;$

WARNING: please, no spaces at the start of a line
#149: FILE: recv.c:60:
+        new_entry = 0;$

ERROR: code indent should use tabs where possible
#158: FILE: recv.c:75:
+            new_entry = 1;$

WARNING: please, no spaces at the start of a line
#158: FILE: recv.c:75:
+            new_entry = 1;$

ERROR: code indent should use tabs where possible
#167: FILE: recv.c:83:
+        /* check that data was changed */$

ERROR: trailing whitespace
#168: FILE: recv.c:84:
+        if (new_entry || dataset->data.header.length != data_len || $

ERROR: code indent should use tabs where possible
#168: FILE: recv.c:84:
+        if (new_entry || dataset->data.header.length != data_len || $

WARNING: please, no spaces at the start of a line
#168: FILE: recv.c:84:
+        if (new_entry || dataset->data.header.length != data_len || $

WARNING: suspect code indent for conditional statements (8, 12)
#168: FILE: recv.c:84:
+        if (new_entry || dataset->data.header.length != data_len || 
[...]
+            changed_data_type(globals, data->header.type);

ERROR: code indent should use tabs where possible
#170: FILE: recv.c:85:
+            changed_data_type(globals, data->header.type);$

WARNING: please, no spaces at the start of a line
#170: FILE: recv.c:85:
+            changed_data_type(globals, data->header.type);$

ERROR: code indent should use tabs where possible
#171: FILE: recv.c:86:
+        }$

WARNING: please, no spaces at the start of a line
#171: FILE: recv.c:86:
+        }$

WARNING: please, no spaces at the start of a line
#194: FILE: server.c:144:
+    if (!globals->update_script)$

ERROR: code indent should use tabs where possible
#195: FILE: server.c:145:
+        return;$

WARNING: please, no spaces at the start of a line
#195: FILE: server.c:145:
+        return;$

WARNING: please, no spaces at the start of a line
#197: FILE: server.c:147:
+    struct changed_data_type *data_type = NULL;$

WARNING: please, no spaces at the start of a line
#199: FILE: server.c:149:
+    list_for_each_entry(data_type, &globals->changed_data_types, list) {$

ERROR: code indent should use tabs where possible
#200: FILE: server.c:150:
+        if (data_type->data_type == arg)$

WARNING: please, no spaces at the start of a line
#200: FILE: server.c:150:
+        if (data_type->data_type == arg)$

WARNING: suspect code indent for conditional statements (8, 12)
#200: FILE: server.c:150:
+        if (data_type->data_type == arg)
+            return;

ERROR: code indent should use tabs where possible
#201: FILE: server.c:151:
+            return;$

WARNING: please, no spaces at the start of a line
#201: FILE: server.c:151:
+            return;$

WARNING: please, no spaces at the start of a line
#202: FILE: server.c:152:
+    }$

WARNING: please, no spaces at the start of a line
#204: FILE: server.c:154:
+    data_type = malloc(sizeof(*data_type));$

WARNING: please, no spaces at the start of a line
#205: FILE: server.c:155:
+    data_type->data_type = arg;$

WARNING: please, no spaces at the start of a line
#206: FILE: server.c:156:
+    list_add(&data_type->list, &globals->changed_data_types);$

WARNING: please, no spaces at the start of a line
#207: FILE: server.c:157:
+    globals->changed_data_type_count++;$

ERROR: code indent should use tabs where possible
#217: FILE: server.c:175:
+        changed_data_type(globals, dataset->data.header.type);$

WARNING: please, no spaces at the start of a line
#217: FILE: server.c:175:
+        changed_data_type(globals, dataset->data.header.type);$

ERROR: trailing whitespace
#227: FILE: server.c:370:
+        if (globals->update_script && $

ERROR: code indent should use tabs where possible
#227: FILE: server.c:370:
+        if (globals->update_script && $

WARNING: please, no spaces at the start of a line
#227: FILE: server.c:370:
+        if (globals->update_script && $

WARNING: suspect code indent for conditional statements (8, 12)
#227: FILE: server.c:370:
+        if (globals->update_script && 
[...]
+            /* call update script with list of datatypes_changed */

ERROR: code indent should use tabs where possible
#229: FILE: server.c:371:
+            /* call update script with list of datatypes_changed */$

ERROR: trailing whitespace
#230: FILE: server.c:372:
+            char command[strlen(globals->update_script) + $

ERROR: code indent should use tabs where possible
#230: FILE: server.c:372:
+            char command[strlen(globals->update_script) + $

WARNING: please, no spaces at the start of a line
#230: FILE: server.c:372:
+            char command[strlen(globals->update_script) + $

ERROR: code indent should use tabs where possible
#232: FILE: server.c:373:
+            char buf[7];$

WARNING: please, no spaces at the start of a line
#232: FILE: server.c:373:
+            char buf[7];$

ERROR: code indent should use tabs where possible
#233: FILE: server.c:374:
+            strncpy(command, globals->update_script, sizeof(command));$

WARNING: Missing a blank line after declarations
#233: FILE: server.c:374:
+            char buf[7];
+            strncpy(command, globals->update_script, sizeof(command));

WARNING: please, no spaces at the start of a line
#233: FILE: server.c:374:
+            strncpy(command, globals->update_script, sizeof(command));$

ERROR: code indent should use tabs where possible
#235: FILE: server.c:376:
+            struct changed_data_type *data_type, *is;$

WARNING: please, no spaces at the start of a line
#235: FILE: server.c:376:
+            struct changed_data_type *data_type, *is;$

ERROR: trailing whitespace
#236: FILE: server.c:377:
+            list_for_each_entry_safe(data_type, is, $

ERROR: code indent should use tabs where possible
#236: FILE: server.c:377:
+            list_for_each_entry_safe(data_type, is, $

WARNING: Missing a blank line after declarations
#236: FILE: server.c:377:
+            struct changed_data_type *data_type, *is;
+            list_for_each_entry_safe(data_type, is, 

WARNING: please, no spaces at the start of a line
#236: FILE: server.c:377:
+            list_for_each_entry_safe(data_type, is, $

ERROR: code indent should use tabs where possible
#238: FILE: server.c:378:
+                /* append the datatype to command line */$

CHECK: Alignment should match open parenthesis
#238: FILE: server.c:378:
+            list_for_each_entry_safe(data_type, is, 
+                /* append the datatype to command line */

ERROR: code indent should use tabs where possible
#239: FILE: server.c:379:
+                snprintf(buf, sizeof(buf), " %d", data_type->data_type);$

WARNING: please, no spaces at the start of a line
#239: FILE: server.c:379:
+                snprintf(buf, sizeof(buf), " %d", data_type->data_type);$

ERROR: code indent should use tabs where possible
#240: FILE: server.c:380:
+                strncat(command, buf, sizeof(command) - strlen(command));$

WARNING: please, no spaces at the start of a line
#240: FILE: server.c:380:
+                strncat(command, buf, sizeof(command) - strlen(command));$

ERROR: code indent should use tabs where possible
#242: FILE: server.c:382:
+                /* clean the list */$

ERROR: code indent should use tabs where possible
#243: FILE: server.c:383:
+                list_del(&data_type->list);$

WARNING: please, no spaces at the start of a line
#243: FILE: server.c:383:
+                list_del(&data_type->list);$

ERROR: code indent should use tabs where possible
#244: FILE: server.c:384:
+                free(data_type);$

WARNING: please, no spaces at the start of a line
#244: FILE: server.c:384:
+                free(data_type);$

ERROR: code indent should use tabs where possible
#245: FILE: server.c:385:
+            }$

WARNING: please, no spaces at the start of a line
#245: FILE: server.c:385:
+            }$

ERROR: code indent should use tabs where possible
#247: FILE: server.c:387:
+            printf("executing: %s\n", command);$

WARNING: please, no spaces at the start of a line
#247: FILE: server.c:387:
+            printf("executing: %s\n", command);$

ERROR: code indent should use tabs where possible
#249: FILE: server.c:389:
+            signal(SIGCHLD, SIG_IGN);$

WARNING: please, no spaces at the start of a line
#249: FILE: server.c:389:
+            signal(SIGCHLD, SIG_IGN);$

ERROR: code indent should use tabs where possible
#250: FILE: server.c:390:
+            int pid = fork();$

WARNING: please, no spaces at the start of a line
#250: FILE: server.c:390:
+            int pid = fork();$

ERROR: code indent should use tabs where possible
#251: FILE: server.c:391:
+            if (pid == 0) {$

WARNING: Missing a blank line after declarations
#251: FILE: server.c:391:
+            int pid = fork();
+            if (pid == 0) {

WARNING: please, no spaces at the start of a line
#251: FILE: server.c:391:
+            if (pid == 0) {$

ERROR: code indent should use tabs where possible
#252: FILE: server.c:392:
+                system(command);$

WARNING: please, no spaces at the start of a line
#252: FILE: server.c:392:
+                system(command);$

ERROR: code indent should use tabs where possible
#253: FILE: server.c:393:
+                exit(0);$

WARNING: please, no spaces at the start of a line
#253: FILE: server.c:393:
+                exit(0);$

ERROR: code indent should use tabs where possible
#254: FILE: server.c:394:
+            }$

WARNING: please, no spaces at the start of a line
#254: FILE: server.c:394:
+            }$

ERROR: code indent should use tabs where possible
#255: FILE: server.c:395:
+            globals->changed_data_type_count = 0;$

WARNING: please, no spaces at the start of a line
#255: FILE: server.c:395:
+            globals->changed_data_type_count = 0;$

ERROR: code indent should use tabs where possible
#256: FILE: server.c:396:
+        }$

WARNING: please, no spaces at the start of a line
#256: FILE: server.c:396:
+        }$

total: 44 errors, 59 warnings, 2 checks, 200 lines checked

NOTE: whitespace errors detected, you may wish to use scripts/cleanpatch or
      scripts/cleanfile
diff mbox

Patch

diff --git a/alfred.h b/alfred.h
index f26c80c..4eed67c 100644
--- a/alfred.h
+++ b/alfred.h
@@ -55,6 +55,11 @@  struct dataset {
      uint8_t local_data;
  };

+struct changed_data_type {
+    int data_type;
+    struct list_head list;
+};
+
  struct transaction_packet {
      struct alfred_push_data_v0 *push;
      struct list_head list;
@@ -118,6 +123,10 @@  struct globals {
      int unix_sock;
      const char *unix_path;

+    const char *update_script;
+    struct list_head changed_data_types;
+    int changed_data_type_count;
+
      struct timespec if_check;

      struct hashtable_t *data_hash;
@@ -134,6 +143,8 @@  extern const struct in6_addr in6addr_localmcast;
  /* server.c */
  int alfred_server(struct globals *globals);
  int set_best_server(struct globals *globals);
+void changed_data_type(struct globals *globals, int arg);
+
  /* client.c */
  int alfred_client_request_data(struct globals *globals);
  int alfred_client_set_data(struct globals *globals);
diff --git a/main.c b/main.c
index e9821be..6b1a5d1 100644
--- a/main.c
+++ b/main.c
@@ -61,6 +61,7 @@  static void alfred_usage(void)
      printf("\n");
      printf("  -u, --unix-path [path]              path to unix socket 
used for client-server\n");
      printf("                                      communication 
(default: \""ALFRED_SOCK_PATH_DEFAULT"\")\n");
+    printf("  -c, --update-script                 path to script to 
call on data change\n");
      printf("  -v, --version                       print the version\n");
      printf("  -h, --help                          this help\n");
      printf("\n");
@@ -153,6 +154,7 @@  static struct globals *alfred_init(int argc, char 
*argv[])
          {"modeswitch",      required_argument,    NULL,    'M'},
          {"change-interface",    required_argument,    NULL, 'I'},
          {"unix-path",        required_argument,    NULL,    'u'},
+        {"update-script",        required_argument,    NULL, 'c'},
          {"version",        no_argument,        NULL,    'v'},
          {"verbose",        no_argument,        NULL,    'd'},
          {NULL,            0,            NULL,    0},
@@ -174,10 +176,13 @@  static struct globals *alfred_init(int argc, char 
*argv[])
      globals->mesh_iface = "bat0";
      globals->unix_path = ALFRED_SOCK_PATH_DEFAULT;
      globals->verbose = 0;
+    globals->update_script = NULL;
+    INIT_LIST_HEAD(&globals->changed_data_types);
+    globals->changed_data_type_count = 0;

      time_random_seed();

-    while ((opt = getopt_long(argc, argv, "ms:r:hi:b:vV:M:I:u:d", 
long_options,
+    while ((opt = getopt_long(argc, argv, "ms:r:hi:b:vV:M:I:u:dc:", 
long_options,
                    &opt_ind)) != -1) {
          switch (opt) {
          case 'r':
@@ -237,6 +242,9 @@  static struct globals *alfred_init(int argc, char 
*argv[])
          case 'd':
              globals->verbose++;
              break;
+        case 'c':
+            globals->update_script = optarg;
+            break;
          case 'v':
              printf("%s %s\n", argv[0], SOURCE_VERSION);
              printf("A.L.F.R.E.D. - Almighty Lightweight Remote Fact 
Exchange Daemon\n");
diff --git a/man/alfred.8 b/man/alfred.8
index a8050ab..872e200 100644
--- a/man/alfred.8
+++ b/man/alfred.8
@@ -114,6 +114,10 @@  still keeping redundancy (by having multiple 
masters). Obviously, at least one
  master must be present in the network to let any data exchange happen. 
Also
  having all nodes in master mode is possible (for maximum decentrality and
  overhead).
+.TP
+\fB\-c\fP, \fB\-\-update-script\fP \fIscriptname\fP
+Specify path to script to call on data change. The script is called with
+data-type list as arguments
  .
  .SH EXAMPLES
  Start an alfred server listening on bridge br0 (assuming that this bridge
diff --git a/recv.c b/recv.c
index e0252eb..0f6f50c 100644
--- a/recv.c
+++ b/recv.c
@@ -40,7 +40,7 @@  static int finish_alfred_push_data(struct globals 
*globals,
                     struct ether_addr mac,
                     struct alfred_push_data_v0 *push)
  {
-    int len, data_len;
+    int len, data_len, new_entry;
      struct alfred_data *data;
      struct dataset *dataset;
      uint8_t *pos;
@@ -57,6 +57,7 @@  static int finish_alfred_push_data(struct globals 
*globals,
          if ((int)(data_len + sizeof(*data)) > len)
              break;

+        new_entry = 0;
          dataset = hash_find(globals->data_hash, data);
          if (!dataset) {
              dataset = malloc(sizeof(*dataset));
@@ -71,6 +72,7 @@  static int finish_alfred_push_data(struct globals 
*globals,
                  free(dataset);
                  goto err;
              }
+            new_entry = 1;
          }
          /* don't overwrite our own data */
          if (dataset->data_source == SOURCE_LOCAL)
@@ -78,6 +80,11 @@  static int finish_alfred_push_data(struct globals 
*globals,

          clock_gettime(CLOCK_MONOTONIC, &dataset->last_seen);

+        /* check that data was changed */
+        if (new_entry || dataset->data.header.length != data_len || 
memcmp(dataset->buf, data->data, data_len) != 0) {
+            changed_data_type(globals, data->header.type);
+        }
+
          /* free old buffer */
          if (dataset->buf) {
              free(dataset->buf);
diff --git a/server.c b/server.c
index 1a3d876..f397de0 100644
--- a/server.c
+++ b/server.c
@@ -23,6 +23,7 @@ 
  #include <inttypes.h>
  #include <net/ethernet.h>
  #include <net/if.h>
+#include <signal.h>
  #include <stddef.h>
  #include <stdint.h>
  #include <stdio.h>
@@ -138,6 +139,24 @@  int set_best_server(struct globals *globals)
      return 0;
  }

+void changed_data_type(struct globals *globals, int arg)
+{
+    if (!globals->update_script)
+        return;
+
+    struct changed_data_type *data_type = NULL;
+
+    list_for_each_entry(data_type, &globals->changed_data_types, list) {
+        if (data_type->data_type == arg)
+            return;
+    }
+
+    data_type = malloc(sizeof(*data_type));
+    data_type->data_type = arg;
+    list_add(&data_type->list, &globals->changed_data_types);
+    globals->changed_data_type_count++;
+}
+
  static int purge_data(struct globals *globals)
  {
      struct hash_it_t *hashit = NULL;
@@ -153,6 +172,8 @@  static int purge_data(struct globals *globals)
          if (diff.tv_sec < ALFRED_DATA_TIMEOUT)
              continue;

+        changed_data_type(globals, dataset->data.header.type);
+
          hash_remove_bucket(globals->data_hash, hashit);
          free(dataset->buf);
          free(dataset);
@@ -345,6 +366,34 @@  int alfred_server(struct globals *globals)
          }
          purge_data(globals);
          check_if_sockets(globals);
+
+        if (globals->update_script && 
!list_empty(&globals->changed_data_types)) {
+            /* call update script with list of datatypes_changed */
+            char command[strlen(globals->update_script) + 
7*globals->changed_data_type_count];
+            char buf[7];
+            strncpy(command, globals->update_script, sizeof(command));
+
+            struct changed_data_type *data_type, *is;
+            list_for_each_entry_safe(data_type, is, 
&globals->changed_data_types, list) {
+                /* append the datatype to command line */
+                snprintf(buf, sizeof(buf), " %d", data_type->data_type);
+                strncat(command, buf, sizeof(command) - strlen(command));
+
+                /* clean the list */
+                list_del(&data_type->list);
+                free(data_type);
+            }
+
+            printf("executing: %s\n", command);
+
+            signal(SIGCHLD, SIG_IGN);
+            int pid = fork();
+            if (pid == 0) {
+                system(command);
+                exit(0);
+            }
+            globals->changed_data_type_count = 0;
+        }