X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fwirecheck.c;h=254c96eac4a3185112a7694238ef5df65e7bbde6;hb=f01c9cd26f972e98460d7f3609ca575a30b4226e;hp=7397fcbf3584fea74f366cbeeb0b04f75c50da7e;hpb=e74a5707a7977045fc7c4aa3765539c5151340bf;p=fs%2Flustre-release.git diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c index 7397fcb..254c96e 100644 --- a/lustre/utils/wirecheck.c +++ b/lustre/utils/wirecheck.c @@ -2,6 +2,8 @@ * vim:expandtab:shiftwidth=8:tabstop=8: */ #include +#include +#include #include #include #include @@ -20,17 +22,21 @@ do { \ #define CHECK_DEFINE(a) \ do { \ - printf(" LASSERT("#a" == "STRINGIFY(a)");\n"); \ + printf(" LASSERTF("#a" == "STRINGIFY(a) \ + ",\" found %%lld\\n\",\n " \ + "(long long)"#a");\n"); \ } while(0) #define CHECK_VALUE(a) \ do { \ - printf(" LASSERT("#a" == %d);\n", a); \ + printf(" LASSERTF("#a \ + " == %d, \" found %%lld\\n\",\n "\ + "(long long)"#a");\n",a);\ } while(0) #define CHECK_MEMBER_OFFSET(s,m) \ do { \ - CHECK_VALUE(offsetof(struct s, m)); \ + CHECK_VALUE((int)offsetof(struct s, m)); \ } while(0) #define CHECK_MEMBER_SIZEOF(s,m) \ @@ -99,7 +105,7 @@ check_obdo(void) CHECK_MEMBER(obdo, o_ctime); CHECK_MEMBER(obdo, o_size); CHECK_MEMBER(obdo, o_blocks); - CHECK_MEMBER(obdo, o_rdev); + CHECK_MEMBER(obdo, o_grant); CHECK_MEMBER(obdo, o_blksize); CHECK_MEMBER(obdo, o_mode); CHECK_MEMBER(obdo, o_uid); @@ -108,7 +114,7 @@ check_obdo(void) CHECK_MEMBER(obdo, o_nlink); CHECK_MEMBER(obdo, o_generation); CHECK_MEMBER(obdo, o_valid); - CHECK_MEMBER(obdo, o_obdflags); + CHECK_MEMBER(obdo, o_misc); CHECK_MEMBER(obdo, o_easize); CHECK_MEMBER(obdo, o_inline); @@ -124,7 +130,6 @@ check_obdo(void) CHECK_VALUE(OBD_MD_FLUID); CHECK_VALUE(OBD_MD_FLGID); CHECK_VALUE(OBD_MD_FLFLAGS); - CHECK_VALUE(OBD_MD_FLOBDFLG); CHECK_VALUE(OBD_MD_FLNLINK); CHECK_VALUE(OBD_MD_FLGENER); CHECK_VALUE(OBD_MD_FLINLINE); @@ -137,6 +142,13 @@ check_obdo(void) CHECK_VALUE(OBD_MD_FLOSCOPQ); CHECK_VALUE(OBD_MD_FLCOOKIE); CHECK_VALUE(OBD_MD_FLGROUP); + + CHECK_VALUE(OBD_FL_INLINEDATA); + CHECK_VALUE(OBD_FL_OBDMDEXISTS); + CHECK_VALUE(OBD_FL_DELORPHAN); + CHECK_VALUE(OBD_FL_NORPC); + CHECK_VALUE(OBD_FL_IDONLY); + CHECK_VALUE(OBD_FL_RECREATE_OBJS); } void @@ -204,8 +216,8 @@ check_niobuf_remote(void) CHECK_VALUE(OBD_BRW_READ); CHECK_VALUE(OBD_BRW_WRITE); - CHECK_VALUE(OBD_BRW_CREATE); CHECK_VALUE(OBD_BRW_SYNC); + CHECK_VALUE(OBD_BRW_FROM_GRANT); } void @@ -269,6 +281,7 @@ check_mds_body(void) CHECK_VALUE(FMODE_EXEC); CHECK_VALUE(MDS_OPEN_CREAT); CHECK_VALUE(MDS_OPEN_EXCL); + CHECK_VALUE(MDS_OPEN_TRUNC); CHECK_VALUE(MDS_OPEN_APPEND); CHECK_VALUE(MDS_OPEN_SYNC); CHECK_VALUE(MDS_OPEN_DIRECTORY); @@ -393,6 +406,7 @@ check_ldlm_extent(void) CHECK_STRUCT(ldlm_extent); CHECK_MEMBER(ldlm_extent, start); CHECK_MEMBER(ldlm_extent, end); + CHECK_MEMBER(ldlm_extent, gid); } void @@ -402,9 +416,9 @@ check_ldlm_flock(void) CHECK_STRUCT(ldlm_flock); CHECK_MEMBER(ldlm_flock, start); CHECK_MEMBER(ldlm_flock, end); - CHECK_MEMBER(ldlm_flock, blocking_export); - CHECK_MEMBER(ldlm_flock, blocking_pid); CHECK_MEMBER(ldlm_flock, pid); + CHECK_MEMBER(ldlm_flock, blocking_pid); + CHECK_MEMBER(ldlm_flock, blocking_export); } void @@ -422,7 +436,6 @@ check_ldlm_resource_desc(void) CHECK_STRUCT(ldlm_resource_desc); CHECK_MEMBER(ldlm_resource_desc, lr_type); CHECK_MEMBER(ldlm_resource_desc, lr_name); - CHECK_MEMBER(ldlm_resource_desc, lr_version[RES_VERSION_SIZE]); } void @@ -434,7 +447,6 @@ check_ldlm_lock_desc(void) CHECK_MEMBER(ldlm_lock_desc, l_req_mode); CHECK_MEMBER(ldlm_lock_desc, l_granted_mode); CHECK_MEMBER(ldlm_lock_desc, l_policy_data); - CHECK_MEMBER(ldlm_lock_desc, l_version[RES_VERSION_SIZE]); } void @@ -454,15 +466,25 @@ check_ldlm_reply(void) BLANK_LINE(); CHECK_STRUCT(ldlm_reply); CHECK_MEMBER(ldlm_reply, lock_flags); - CHECK_MEMBER(ldlm_reply, lock_mode); - CHECK_MEMBER(ldlm_reply, lock_resource_name); + CHECK_MEMBER(ldlm_request, lock_desc); CHECK_MEMBER(ldlm_reply, lock_handle); - CHECK_MEMBER(ldlm_reply, lock_policy_data); CHECK_MEMBER(ldlm_reply, lock_policy_res1); CHECK_MEMBER(ldlm_reply, lock_policy_res2); } void +check_ldlm_lvb(void) +{ + BLANK_LINE(); + CHECK_STRUCT(ost_lvb); + CHECK_MEMBER(ost_lvb, lvb_size); + CHECK_MEMBER(ost_lvb, lvb_mtime); + CHECK_MEMBER(ost_lvb, lvb_atime); + CHECK_MEMBER(ost_lvb, lvb_ctime); + CHECK_MEMBER(ost_lvb, lvb_blocks); +} + +void check_ptlbd_op(void) { BLANK_LINE(); @@ -508,11 +530,20 @@ check_llog_logid(void) CHECK_VALUE(MDS_UNLINK_REC); CHECK_VALUE(OBD_CFG_REC); CHECK_VALUE(PTL_CFG_REC); + CHECK_VALUE(LLOG_GEN_REC); CHECK_VALUE(LLOG_HDR_MAGIC); CHECK_VALUE(LLOG_LOGID_MAGIC); } void +check_llog_catid(void) +{ + BLANK_LINE(); + CHECK_STRUCT(llog_catid); + CHECK_MEMBER(llog_catid, lci_logid); +} + +void check_llog_rec_hdr(void) { BLANK_LINE(); @@ -532,6 +563,79 @@ check_llog_rec_tail(void) } void +check_llog_logid_rec(void) +{ + BLANK_LINE(); + CHECK_STRUCT(llog_logid_rec); + CHECK_MEMBER(llog_logid_rec, lid_hdr); + CHECK_MEMBER(llog_logid_rec, lid_id); + CHECK_MEMBER(llog_logid_rec, lid_tail); +} + +void +check_llog_create_rec(void) +{ + BLANK_LINE(); + CHECK_STRUCT(llog_create_rec); + CHECK_MEMBER(llog_create_rec, lcr_hdr); + CHECK_MEMBER(llog_create_rec, lcr_fid); + CHECK_MEMBER(llog_create_rec, lcr_oid); + CHECK_MEMBER(llog_create_rec, lcr_ogen); +} + +void +check_llog_orphan_rec(void) +{ + BLANK_LINE(); + CHECK_STRUCT(llog_orphan_rec); + CHECK_MEMBER(llog_orphan_rec, lor_hdr); + CHECK_MEMBER(llog_orphan_rec, lor_oid); + CHECK_MEMBER(llog_orphan_rec, lor_ogen); + CHECK_MEMBER(llog_orphan_rec, lor_tail); +} + +void +check_llog_unlink_rec(void) +{ + BLANK_LINE(); + CHECK_STRUCT(llog_unlink_rec); + CHECK_MEMBER(llog_unlink_rec, lur_hdr); + CHECK_MEMBER(llog_unlink_rec, lur_oid); + CHECK_MEMBER(llog_unlink_rec, lur_ogen); + CHECK_MEMBER(llog_unlink_rec, lur_tail); +} + +void +check_llog_size_change_rec(void) +{ + BLANK_LINE(); + CHECK_STRUCT(llog_size_change_rec); + CHECK_MEMBER(llog_size_change_rec, lsc_hdr); + CHECK_MEMBER(llog_size_change_rec, lsc_fid); + CHECK_MEMBER(llog_size_change_rec, lsc_io_epoch); + CHECK_MEMBER(llog_size_change_rec, lsc_tail); +} + +void +check_llog_gen(void) +{ + BLANK_LINE(); + CHECK_STRUCT(llog_gen); + CHECK_MEMBER(llog_gen, mnt_cnt); + CHECK_MEMBER(llog_gen, conn_cnt); +} + +void +check_llog_gen_rec(void) +{ + BLANK_LINE(); + CHECK_STRUCT(llog_gen_rec); + CHECK_MEMBER(llog_gen_rec, lgr_hdr); + CHECK_MEMBER(llog_gen_rec, lgr_gen); + CHECK_MEMBER(llog_gen_rec, lgr_tail); +} + +void check_llog_log_hdr(void) { BLANK_LINE(); @@ -544,7 +648,6 @@ check_llog_log_hdr(void) CHECK_MEMBER(llog_log_hdr, llh_flags); CHECK_MEMBER(llog_log_hdr, llh_cat_idx); CHECK_MEMBER(llog_log_hdr, llh_tgtuuid); - CHECK_MEMBER(llog_log_hdr, llh_reserved); CHECK_MEMBER(llog_log_hdr, llh_bitmap); CHECK_MEMBER(llog_log_hdr, llh_tail); } @@ -572,20 +675,13 @@ check_llogd_body(void) CHECK_MEMBER(llogd_body, lgd_len); CHECK_MEMBER(llogd_body, lgd_cur_offset); - CHECK_VALUE(LLOG_ORIGIN_HANDLE_CREATE); + CHECK_VALUE(LLOG_ORIGIN_HANDLE_OPEN); CHECK_VALUE(LLOG_ORIGIN_HANDLE_NEXT_BLOCK); CHECK_VALUE(LLOG_ORIGIN_HANDLE_READ_HEADER); CHECK_VALUE(LLOG_ORIGIN_HANDLE_WRITE_REC); CHECK_VALUE(LLOG_ORIGIN_HANDLE_CLOSE); -} - -void -check_llog_ctxt_gen(void) -{ - BLANK_LINE(); - CHECK_STRUCT(llog_ctxt_gen); - CHECK_MEMBER(llog_ctxt_gen, mnt_cnt); - CHECK_MEMBER(llog_ctxt_gen, conn_cnt); + CHECK_VALUE(LLOG_ORIGIN_CONNECT); + CHECK_VALUE(LLOG_CATINFO); } void @@ -598,14 +694,74 @@ check_llogd_conn_body(void) CHECK_MEMBER(llogd_conn_body, lgdc_ctxt_idx); } +void +system_string (char *cmdline, char *str, int len) +{ + int fds[2]; + int rc; + pid_t pid; + + rc = pipe(fds); + if (rc != 0) + abort(); + + pid = fork(); + if (pid == 0) { + /* child */ + int fd = fileno(stdout); + + rc = dup2(fds[1], fd); + if (rc != fd) + abort(); + + exit(system(cmdline)); + /* notreached */ + } else if ((int)pid < 0) { + abort(); + } else { + FILE *f = fdopen(fds[0], "r"); + + if (f == NULL) + abort(); + + close(fds[1]); + + if (fgets(str, len, f) == NULL) + abort(); + + if (waitpid(pid, &rc, 0) != pid) + abort(); + + if (!WIFEXITED(rc) || WEXITSTATUS(rc) != 0) + abort(); + + if (strnlen(str, len) == len) + str[len - 1] = 0; + + if (str[strlen(str) - 1] == '\n') + str[strlen(str) - 1] = 0; + + fclose(f); + } +} + int main(int argc, char **argv) { - printf("void lustre_assert_wire_constants(void)\n" - "{\n"); + char unameinfo[80]; + char gccinfo[80]; - COMMENT("Wire protocol assertions generated by 'wirecheck'"); - BLANK_LINE(); + system_string("uname -a", unameinfo, sizeof(unameinfo)); + system_string("gcc -v 2>&1 | tail -1", gccinfo, sizeof(gccinfo)); + + printf ("void lustre_assert_wire_constants(void)\n" + "{\n" + " /* Wire protocol assertions generated by 'wirecheck'\n" + " * running on %s\n" + " * with %s */\n" + "\n", unameinfo, gccinfo); + + BLANK_LINE (); COMMENT("Constants..."); CHECK_DEFINE(PTLRPC_MSG_MAGIC); @@ -617,6 +773,7 @@ main(int argc, char **argv) CHECK_VALUE(MSG_LAST_REPLAY); CHECK_VALUE(MSG_RESENT); + CHECK_VALUE(MSG_REPLAY); CHECK_VALUE(MSG_CONNECT_RECOVERING); CHECK_VALUE(MSG_CONNECT_RECONNECT); @@ -640,10 +797,6 @@ main(int argc, char **argv) CHECK_VALUE(OST_SAN_WRITE); CHECK_VALUE(OST_SYNC); CHECK_VALUE(OST_LAST_OPC); - CHECK_VALUE(OST_FIRST_OPC); - - CHECK_VALUE(OBD_FL_INLINEDATA); - CHECK_VALUE(OBD_FL_OBDMDEXISTS); CHECK_DEFINE(OBD_OBJECT_EOF); @@ -658,8 +811,11 @@ main(int argc, char **argv) CHECK_VALUE(MDS_DISCONNECT); CHECK_VALUE(MDS_GETSTATUS); CHECK_VALUE(MDS_STATFS); + CHECK_VALUE(MDS_PIN); + CHECK_VALUE(MDS_UNPIN); + CHECK_VALUE(MDS_SYNC); + CHECK_VALUE(MDS_DONE_WRITING); CHECK_VALUE(MDS_LAST_OPC); - CHECK_VALUE(MDS_FIRST_OPC); CHECK_VALUE(REINT_SETATTR); CHECK_VALUE(REINT_CREATE); @@ -687,7 +843,13 @@ main(int argc, char **argv) CHECK_VALUE(LDLM_BL_CALLBACK); CHECK_VALUE(LDLM_CP_CALLBACK); CHECK_VALUE(LDLM_LAST_OPC); - CHECK_VALUE(LDLM_FIRST_OPC); + + CHECK_VALUE(LCK_EX); + CHECK_VALUE(LCK_PW); + CHECK_VALUE(LCK_PR); + CHECK_VALUE(LCK_CW); + CHECK_VALUE(LCK_CR); + CHECK_VALUE(LCK_NL); CHECK_VALUE(PTLBD_QUERY); CHECK_VALUE(PTLBD_READ); @@ -696,9 +858,14 @@ main(int argc, char **argv) CHECK_VALUE(PTLBD_CONNECT); CHECK_VALUE(PTLBD_DISCONNECT); CHECK_VALUE(PTLBD_LAST_OPC); - CHECK_VALUE(PTLBD_FIRST_OPC); + + CHECK_VALUE(MGMT_CONNECT); + CHECK_VALUE(MGMT_DISCONNECT); + CHECK_VALUE(MGMT_EXCEPTION); CHECK_VALUE(OBD_PING); + CHECK_VALUE(OBD_LOG_CANCEL); + CHECK_VALUE(OBD_LAST_OPC); COMMENT("Sizes and Offsets"); BLANK_LINE(); @@ -727,12 +894,21 @@ main(int argc, char **argv) check_ldlm_lock_desc(); check_ldlm_request(); check_ldlm_reply(); + check_ldlm_lvb(); check_ptlbd_op(); check_ptlbd_niob(); check_ptlbd_rsp(); check_llog_logid(); + check_llog_catid(); check_llog_rec_hdr(); check_llog_rec_tail(); + check_llog_logid_rec(); + check_llog_create_rec(); + check_llog_orphan_rec(); + check_llog_unlink_rec(); + check_llog_size_change_rec(); + check_llog_gen(); + check_llog_gen_rec(); check_llog_log_hdr(); check_llog_cookie(); check_llogd_body();