X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Fselftest%2Fconsole.h;h=02c76a89627e678e8de125a679ee17e8f8e195b0;hp=64ed6b50d43b657ee47acb937b5960526a3afd27;hb=c5381d73b1d83deed561456bc476d63696b9af16;hpb=faeb94fe81e4646b3121c263521d30e0e83fa71f diff --git a/lnet/selftest/console.h b/lnet/selftest/console.h index 64ed6b5..02c76a8 100644 --- a/lnet/selftest/console.h +++ b/lnet/selftest/console.h @@ -15,11 +15,7 @@ * * You should have received a copy of the GNU General Public License * version 2 along with this program; If not, see - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * http://www.gnu.org/licenses/gpl-2.0.html * * GPL HEADER END */ @@ -43,30 +39,32 @@ #ifndef __LST_CONSOLE_H__ #define __LST_CONSOLE_H__ +#include #include -#include #include -#include #include "selftest.h" #include "conrpc.h" -typedef struct lstcon_node { - lnet_process_id_t nd_id; /* id of the node */ +/* node descriptor */ +struct lstcon_node { + struct lnet_process_id nd_id; /* id of the node */ int nd_ref; /* reference count */ int nd_state; /* state of the node */ int nd_timeout; /* session timeout */ - cfs_time_t nd_stamp; /* timestamp of last replied RPC */ - struct lstcon_rpc nd_ping; /* ping rpc */ -} lstcon_node_t; /*** node descriptor */ + ktime_t nd_stamp; /* last RPC reply timestamp */ + struct lstcon_rpc nd_ping; /* ping rpc */ +}; -typedef struct { +/* node link descriptor */ +struct lstcon_ndlink { struct list_head ndl_link; /* chain on list */ struct list_head ndl_hlink; /* chain on hash */ - lstcon_node_t *ndl_node; /* pointer to node */ -} lstcon_ndlink_t; /*** node link descriptor */ + struct lstcon_node *ndl_node; /* pointer to node */ +}; -typedef struct { +/* (alias of nodes) group descriptor */ +struct lstcon_group { struct list_head grp_link; /* chain on global group list */ int grp_ref; /* reference count */ int grp_userland; /* has userland nodes */ @@ -76,19 +74,20 @@ typedef struct { struct list_head grp_trans_list; /* transaction list */ struct list_head grp_ndl_list; /* nodes list */ struct list_head grp_ndl_hash[0];/* hash table for nodes */ -} lstcon_group_t; /*** (alias of nodes) group descriptor */ +}; #define LST_BATCH_IDLE 0xB0 /* idle batch */ #define LST_BATCH_RUNNING 0xB1 /* running batch */ -typedef struct lstcon_tsb_hdr { - lst_bid_t tsb_id; /* batch ID */ +struct lstcon_tsb_hdr { + struct lst_bid tsb_id; /* batch ID */ int tsb_index; /* test index */ -} lstcon_tsb_hdr_t; +}; -typedef struct { +/* (tests ) batch descriptor */ +struct lstcon_batch { /* test_batch header */ - lstcon_tsb_hdr_t bat_hdr; + struct lstcon_tsb_hdr bat_hdr; /* chain on session's batches list */ struct list_head bat_link; /* # of test */ @@ -104,7 +103,7 @@ typedef struct { struct list_head bat_test_list; /* list head of transaction */ struct list_head bat_trans_list; - /* list head of client nodes (lstcon_node_t) */ + /* list head of client nodes (struct lstcon_node) */ struct list_head bat_cli_list; /* hash table of client nodes */ struct list_head *bat_cli_hash; @@ -112,15 +111,16 @@ typedef struct { struct list_head bat_srv_list; /* hash table of server nodes */ struct list_head *bat_srv_hash; -} lstcon_batch_t; /*** (tests ) batch descritptor */ +}; -typedef struct lstcon_test { +/* a single test descriptor */ +struct lstcon_test { /* test batch header */ - lstcon_tsb_hdr_t tes_hdr; + struct lstcon_tsb_hdr tes_hdr; /* chain on batch's tests list */ struct list_head tes_link; /* pointer to batch */ - lstcon_batch_t *tes_batch; + struct lstcon_batch *tes_batch; int tes_type; /* type of the test, i.e: bulk, ping */ int tes_stop_onerr; /* stop on error */ @@ -132,12 +132,12 @@ typedef struct lstcon_test { int tes_cliidx; /* client index, used for RPC creating */ struct list_head tes_trans_list; /* transaction list */ - lstcon_group_t *tes_src_grp; /* group run the test */ - lstcon_group_t *tes_dst_grp; /* target group */ + struct lstcon_group *tes_src_grp; /* group run the test */ + struct lstcon_group *tes_dst_grp; /* target group */ int tes_paramlen; /* test parameter length */ char tes_param[0]; /* test parameter */ -} lstcon_test_t; /*** a single test descriptor */ +}; #define LST_GLOBAL_HASHSIZE 503 /* global nodes hash table size */ #define LST_NODE_HASHSIZE 239 /* node hash table (for batch or group) */ @@ -147,13 +147,13 @@ typedef struct lstcon_test { #define LST_CONSOLE_TIMEOUT 300 /* default console timeout */ -typedef struct { +struct lstcon_session { struct mutex ses_mutex; /* only 1 thread in session */ - lst_sid_t ses_id; /* global session id */ + struct lst_sid ses_id; /* global session id */ int ses_key; /* local session key */ int ses_state; /* state of session */ int ses_timeout; /* timeout in seconds */ - time_t ses_laststamp; /* last operation stamp (seconds) */ + time64_t ses_laststamp; /* last operation stamp (seconds) */ /** tests features of the session */ unsigned ses_features; /** features are synced with remote test nodes */ @@ -166,9 +166,9 @@ typedef struct { unsigned ses_expired:1; __u64 ses_id_cookie; /* batch id cookie */ char ses_name[LST_NAME_SIZE]; /* session name */ - lstcon_rpc_trans_t *ses_ping; /* session pinger */ - stt_timer_t ses_ping_timer; /* timer for pinger */ - lstcon_trans_stat_t ses_trans_stat; /* transaction stats */ + struct lstcon_rpc_trans *ses_ping; /* session pinger */ + struct stt_timer ses_ping_timer; /* timer for pinger */ + struct lstcon_trans_stat ses_trans_stat;/* transaction stats */ struct list_head ses_trans_list; /* global list of transaction */ struct list_head ses_grp_list; /* global list of groups */ @@ -179,30 +179,30 @@ typedef struct { spinlock_t ses_rpc_lock; /* serialize */ atomic_t ses_rpc_counter;/* # of initialized RPCs */ struct list_head ses_rpc_freelist;/* idle console rpc */ -} lstcon_session_t; /*** session descriptor */ +}; /* session descriptor */ -extern lstcon_session_t console_session; +extern struct lstcon_session console_session; -static inline lstcon_trans_stat_t * +static inline struct lstcon_trans_stat * lstcon_trans_stat(void) { return &console_session.ses_trans_stat; } static inline struct list_head * -lstcon_id2hash(lnet_process_id_t id, struct list_head *hash) +lstcon_id2hash(struct lnet_process_id id, struct list_head *hash) { unsigned int idx = LNET_NIDADDR(id.nid) % LST_NODE_HASHSIZE; return &hash[idx]; } -extern int lstcon_session_match(lst_sid_t sid); +extern int lstcon_session_match(struct lst_sid sid); extern int lstcon_session_new(char *name, int key, unsigned version, - int timeout, int flags, lst_sid_t __user *sid_up); -extern int lstcon_session_info(lst_sid_t __user *sid_up, int __user *key, + int timeout, int flags, struct lst_sid __user *sid_up); +extern int lstcon_session_info(struct lst_sid __user *sid_up, int __user *key, unsigned __user *verp, - lstcon_ndlist_ent_t __user *entp, + struct lstcon_ndlist_ent __user *entp, char __user *name_up, int len); extern int lstcon_session_end(void); extern int lstcon_session_debug(int timeout, @@ -213,22 +213,22 @@ extern int lstcon_batch_debug(int timeout, char *name, extern int lstcon_group_debug(int timeout, char *name, struct list_head __user *result_up); extern int lstcon_nodes_debug(int timeout, int nnd, - lnet_process_id_t __user *nds_up, + struct lnet_process_id __user *nds_up, struct list_head __user *result_up); extern int lstcon_group_add(char *name); extern int lstcon_group_del(char *name); extern int lstcon_group_clean(char *name, int args); extern int lstcon_group_refresh(char *name, struct list_head __user *result_up); extern int lstcon_nodes_add(char *name, int nnd, - lnet_process_id_t __user *nds_up, + struct lnet_process_id __user *nds_up, unsigned *featp, struct list_head __user *result_up); extern int lstcon_nodes_remove(char *name, int nnd, - lnet_process_id_t __user *nds_up, + struct lnet_process_id __user *nds_up, struct list_head __user *result_up); -extern int lstcon_group_info(char *name, lstcon_ndlist_ent_t __user *gent_up, +extern int lstcon_group_info(char *name, struct lstcon_ndlist_ent __user *gent_up, int *index_p, int *ndent_p, - lstcon_node_ent_t __user *ndents_up); + struct lstcon_node_ent __user *ndents_up); extern int lstcon_group_list(int idx, int len, char __user *name_up); extern int lstcon_batch_add(char *name); extern int lstcon_batch_run(char *name, int timeout, @@ -240,12 +240,14 @@ extern int lstcon_test_batch_query(char *name, int testidx, struct list_head __user *result_up); extern int lstcon_batch_del(char *name); extern int lstcon_batch_list(int idx, int namelen, char __user *name_up); -extern int lstcon_batch_info(char *name, lstcon_test_batch_ent_t __user *ent_up, +extern int lstcon_batch_info(char *name, + struct lstcon_test_batch_ent __user *ent_up, int server, int testidx, int *index_p, - int *ndent_p, lstcon_node_ent_t __user *dents_up); + int *ndent_p, + struct lstcon_node_ent __user *dents_up); extern int lstcon_group_stat(char *grp_name, int timeout, struct list_head __user *result_up); -extern int lstcon_nodes_stat(int count, lnet_process_id_t __user *ids_up, +extern int lstcon_nodes_stat(int count, struct lnet_process_id __user *ids_up, int timeout, struct list_head __user *result_up); extern int lstcon_test_add(char *batch_name, int type, int loop, int concur, int dist, int span, @@ -253,6 +255,8 @@ extern int lstcon_test_add(char *batch_name, int type, int loop, void *param, int paramlen, int *retp, struct list_head __user *result_up); +int lstcon_ioctl_entry(struct notifier_block *nb, + unsigned long cmd, void *vdata); int lstcon_console_init(void); int lstcon_console_fini(void);