diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/basic/logchecks-messages.h | 84 | ||||
| -rw-r--r-- | tests/utils/changelog/changelog.h | 107 | 
2 files changed, 108 insertions, 83 deletions
diff --git a/tests/basic/logchecks-messages.h b/tests/basic/logchecks-messages.h index 6344037b44a..1ae68646445 100644 --- a/tests/basic/logchecks-messages.h +++ b/tests/basic/logchecks-messages.h @@ -35,44 +35,70 @@   *    holes.   */ -#define GLFS_COMP_BASE          1000 -#define GLFS_NUM_MESSAGES       19 -#define GLFS_MSGID_END          (GLFS_COMP_BASE + GLFS_NUM_MESSAGES + 1) +#define GLFS_COMP_BASE 1000 +#define GLFS_NUM_MESSAGES 19 +#define GLFS_MSGID_END (GLFS_COMP_BASE + GLFS_NUM_MESSAGES + 1)  /* Messaged with message IDs */  #define glfs_msg_start_x GLFS_COMP_BASE, "Invalid: Start of messages"  /*------------*/ -#define logchecks_msg_1 (GLFS_COMP_BASE + 1), "Informational: Testing logging" \ -                                " in gluster" -#define logchecks_msg_2 (GLFS_COMP_BASE + 2), "Informational: Format testing:" \ -                                " %d:%s:%x" -#define logchecks_msg_3 (GLFS_COMP_BASE + 3), "Critical: Testing logging" \ -                                " in gluster" -#define logchecks_msg_4 (GLFS_COMP_BASE + 4), "Critical: Format testing:" \ -                                " %d:%s:%x" +#define logchecks_msg_1                                                        \ +    (GLFS_COMP_BASE + 1),                                                      \ +        "Informational: Testing logging"                                       \ +        " in gluster" +#define logchecks_msg_2                                                        \ +    (GLFS_COMP_BASE + 2),                                                      \ +        "Informational: Format testing:"                                       \ +        " %d:%s:%x" +#define logchecks_msg_3                                                        \ +    (GLFS_COMP_BASE + 3),                                                      \ +        "Critical: Testing logging"                                            \ +        " in gluster" +#define logchecks_msg_4                                                        \ +    (GLFS_COMP_BASE + 4),                                                      \ +        "Critical: Format testing:"                                            \ +        " %d:%s:%x"  #define logchecks_msg_5 (GLFS_COMP_BASE + 5), "Critical: Rotated the log"  #define logchecks_msg_6 (GLFS_COMP_BASE + 6), "Critical: Flushed the log"  #define logchecks_msg_7 (GLFS_COMP_BASE + 7), "Informational: gf_msg_callingfn" -#define logchecks_msg_8 (GLFS_COMP_BASE + 8), "Informational: " \ -                                "gf_msg_callingfn: Format testing: %d:%s:%x" +#define logchecks_msg_8                                                        \ +    (GLFS_COMP_BASE + 8),                                                      \ +        "Informational: "                                                      \ +        "gf_msg_callingfn: Format testing: %d:%s:%x"  #define logchecks_msg_9 (GLFS_COMP_BASE + 9), "Critical: gf_msg_callingfn" -#define logchecks_msg_10 (GLFS_COMP_BASE + 10), "Critical: " \ -                                "gf_msg_callingfn: Format testing: %d:%s:%x" +#define logchecks_msg_10                                                       \ +    (GLFS_COMP_BASE + 10),                                                     \ +        "Critical: "                                                           \ +        "gf_msg_callingfn: Format testing: %d:%s:%x"  #define logchecks_msg_11 (GLFS_COMP_BASE + 11), "==========================" -#define logchecks_msg_12 (GLFS_COMP_BASE + 12), "Test 1: Only stderr and" \ -                                " partial syslog" -#define logchecks_msg_13 (GLFS_COMP_BASE + 13), "Test 2: Only checklog and" \ -                                " partial syslog" -#define logchecks_msg_14 (GLFS_COMP_BASE + 14), "Test 5: Changing to" \ -                                " traditional format" -#define logchecks_msg_15 (GLFS_COMP_BASE + 15), "Test 6: Changing log level" \ -                                " to critical and above" +#define logchecks_msg_12                                                       \ +    (GLFS_COMP_BASE + 12),                                                     \ +        "Test 1: Only stderr and"                                              \ +        " partial syslog" +#define logchecks_msg_13                                                       \ +    (GLFS_COMP_BASE + 13),                                                     \ +        "Test 2: Only checklog and"                                            \ +        " partial syslog" +#define logchecks_msg_14                                                       \ +    (GLFS_COMP_BASE + 14),                                                     \ +        "Test 5: Changing to"                                                  \ +        " traditional format" +#define logchecks_msg_15                                                       \ +    (GLFS_COMP_BASE + 15),                                                     \ +        "Test 6: Changing log level"                                           \ +        " to critical and above"  #define logchecks_msg_16 (GLFS_COMP_BASE + 16), "Test 7: Only to syslog" -#define logchecks_msg_17 (GLFS_COMP_BASE + 17), "Test 8: Only to syslog," \ -                                " traditional format" -#define logchecks_msg_18 (GLFS_COMP_BASE + 18), "Test 9: Only to syslog," \ -                                " only critical and above" -#define logchecks_msg_19 (GLFS_COMP_BASE + 19), "Pre init message, not to be" \ -                                " seen in logs" +#define logchecks_msg_17                                                       \ +    (GLFS_COMP_BASE + 17),                                                     \ +        "Test 8: Only to syslog,"                                              \ +        " traditional format" +#define logchecks_msg_18                                                       \ +    (GLFS_COMP_BASE + 18),                                                     \ +        "Test 9: Only to syslog,"                                              \ +        " only critical and above" +#define logchecks_msg_19                                                       \ +    (GLFS_COMP_BASE + 19),                                                     \ +        "Pre init message, not to be"                                          \ +        " seen in logs"  /*------------*/  #define glfs_msg_end_x GLFS_MSGID_END, "Invalid: End of messages" diff --git a/tests/utils/changelog/changelog.h b/tests/utils/changelog/changelog.h index 14094cf3681..969a1f370c2 100644 --- a/tests/utils/changelog/changelog.h +++ b/tests/utils/changelog/changelog.h @@ -16,105 +16,104 @@ struct gf_brick_spec;  /**   * Max bit shiter for event selection   */ -#define CHANGELOG_EV_SELECTION_RANGE  5 - -#define CHANGELOG_OP_TYPE_JOURNAL    (1<<0) -#define CHANGELOG_OP_TYPE_OPEN       (1<<1) -#define CHANGELOG_OP_TYPE_CREATE     (1<<2) -#define CHANGELOG_OP_TYPE_RELEASE    (1<<3) -#define CHANGELOG_OP_TYPE_BR_RELEASE (1<<4)  /* logical release (last close()), -                                                sent by bitrot stub */ -#define CHANGELOG_OP_TYPE_MAX        (1<<CHANGELOG_EV_SELECTION_RANGE) +#define CHANGELOG_EV_SELECTION_RANGE 5 +#define CHANGELOG_OP_TYPE_JOURNAL (1 << 0) +#define CHANGELOG_OP_TYPE_OPEN (1 << 1) +#define CHANGELOG_OP_TYPE_CREATE (1 << 2) +#define CHANGELOG_OP_TYPE_RELEASE (1 << 3) +#define CHANGELOG_OP_TYPE_BR_RELEASE                                           \ +    (1 << 4) /* logical release (last close()),                                \ +                sent by bitrot stub */ +#define CHANGELOG_OP_TYPE_MAX (1 << CHANGELOG_EV_SELECTION_RANGE)  struct ev_open { -        unsigned char gfid[16]; -        int32_t flags; +    unsigned char gfid[16]; +    int32_t flags;  };  struct ev_creat { -        unsigned char gfid[16]; -        int32_t flags; +    unsigned char gfid[16]; +    int32_t flags;  };  struct ev_release { -        unsigned char gfid[16]; +    unsigned char gfid[16];  };  struct ev_release_br { -        unsigned long version; -        unsigned char gfid[16]; -        int32_t sign_info; +    unsigned long version; +    unsigned char gfid[16]; +    int32_t sign_info;  };  struct ev_changelog { -        char path[PATH_MAX]; +    char path[PATH_MAX];  };  typedef struct changelog_event { -        unsigned int ev_type; - -        union { -                struct ev_open open; -                struct ev_creat create; -                struct ev_release release; -                struct ev_changelog journal; -                struct ev_release_br releasebr; -        } u; +    unsigned int ev_type; + +    union { +        struct ev_open open; +        struct ev_creat create; +        struct ev_release release; +        struct ev_changelog journal; +        struct ev_release_br releasebr; +    } u;  } changelog_event_t; -#define CHANGELOG_EV_SIZE  (sizeof (changelog_event_t)) +#define CHANGELOG_EV_SIZE (sizeof(changelog_event_t))  /**   * event callback, connected & disconnection defs   */ -typedef void (CALLBACK) (void *, char *, -                        void *, changelog_event_t *); -typedef void *(INIT) (void *, struct gf_brick_spec *); -typedef void (FINI) (void *, char *, void *); -typedef void (CONNECT) (void *, char *, void *); -typedef void (DISCONNECT) (void *, char *, void *); +typedef void(CALLBACK)(void *, char *, void *, changelog_event_t *); +typedef void *(INIT)(void *, struct gf_brick_spec *); +typedef void(FINI)(void *, char *, void *); +typedef void(CONNECT)(void *, char *, void *); +typedef void(DISCONNECT)(void *, char *, void *);  struct gf_brick_spec { -        char         *brick_path; -        unsigned int  filter; +    char *brick_path; +    unsigned int filter; -        INIT       *init; -        FINI       *fini; -        CALLBACK   *callback; -        CONNECT    *connected; -        DISCONNECT *disconnected; +    INIT *init; +    FINI *fini; +    CALLBACK *callback; +    CONNECT *connected; +    DISCONNECT *disconnected; -        void *ptr; +    void *ptr;  };  /* API set */  int -gf_changelog_register (char *brick_path, char *scratch_dir, -                       char *log_file, int log_levl, int max_reconnects); +gf_changelog_register(char *brick_path, char *scratch_dir, char *log_file, +                      int log_levl, int max_reconnects);  ssize_t -gf_changelog_scan (); +gf_changelog_scan();  int -gf_changelog_start_fresh (); +gf_changelog_start_fresh();  ssize_t -gf_changelog_next_change (char *bufptr, size_t maxlen); +gf_changelog_next_change(char *bufptr, size_t maxlen);  int -gf_changelog_done (char *file); +gf_changelog_done(char *file);  /* newer flexible API */  int -gf_changelog_init (void *xl); +gf_changelog_init(void *xl);  int -gf_changelog_register_generic (struct gf_brick_spec *bricks, int count, -                               int ordered, char *logfile, int lvl, void *xl); +gf_changelog_register_generic(struct gf_brick_spec *bricks, int count, +                              int ordered, char *logfile, int lvl, void *xl);  int -gf_history_changelog (char *changelog_dir, unsigned long start, -                      unsigned long end, int n_parallel, -                      unsigned long *actual_end); +gf_history_changelog(char *changelog_dir, unsigned long start, +                     unsigned long end, int n_parallel, +                     unsigned long *actual_end);  #endif  | 
