X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Fselftest%2Fconsole.h;h=48a4061a454b26f1fc08261444619fdf62447f91;hb=a5b81807c5d6d2cb3b2ef1a0a7e150ee6002f7f7;hp=cc729301479383b518256f7d35554bfc95e65861;hpb=776615e6825e2c90c2635c8b55e7bb02da33726c;p=fs%2Flustre-release.git diff --git a/lnet/selftest/console.h b/lnet/selftest/console.h index cc72930..48a4061 100644 --- a/lnet/selftest/console.h +++ b/lnet/selftest/console.h @@ -1,11 +1,43 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * Author: Liang Zhen - * - * This file is part of Lustre, http://www.lustre.org + * GPL HEADER START + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 only, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License version 2 for more details (a copy is included + * in the LICENSE file that accompanied this code). + * + * 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. + * + * GPL HEADER END + */ +/* + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. + * + * lnet/selftest/console.h * * kernel structure for LST console + * + * Author: Liang Zhen */ #ifndef __LST_CONSOLE_H__ @@ -13,7 +45,7 @@ #ifdef __KERNEL__ -#include +#include #include #include #include @@ -21,30 +53,31 @@ #include "conrpc.h" typedef struct lstcon_node { - lnet_process_id_t 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 */ + lnet_process_id_t 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 */ typedef struct { - struct list_head ndl_link; /* chain on list */ - struct list_head ndl_hlink; /* chain on hash */ - lstcon_node_t *ndl_node; /* pointer to node */ + cfs_list_t ndl_link; /* chain on list */ + cfs_list_t ndl_hlink; /* chain on hash */ + lstcon_node_t *ndl_node; /* pointer to node */ } lstcon_ndlink_t; /*** node link descriptor */ typedef struct { - struct list_head grp_link; /* chain on global group list */ - int grp_ref; /* reference count */ - int grp_nnode; /* # of nodes */ - char grp_name[LST_NAME_SIZE]; /* group name */ + cfs_list_t grp_link; /* chain on global group list */ + int grp_ref; /* reference count */ + int grp_userland; /* has userland nodes */ + int grp_nnode; /* # of nodes */ + char grp_name[LST_NAME_SIZE]; /* group name */ - 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 */ + cfs_list_t grp_trans_list; /* transaction list */ + cfs_list_t grp_ndl_list; /* nodes list */ + cfs_list_t 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 */ @@ -56,41 +89,41 @@ typedef struct lstcon_tsb_hdr { typedef struct { lstcon_tsb_hdr_t bat_hdr; /* test_batch header */ - struct list_head bat_link; /* chain on session's batches list */ + cfs_list_t bat_link; /* chain on session's batches list */ int bat_ntest; /* # of test */ int bat_state; /* state of the batch */ int bat_arg; /* parameter for run|stop, timeout for run, force for stop */ char bat_name[LST_NAME_SIZE]; /* name of batch */ - struct list_head bat_test_list; /* list head of tests (lstcon_test_t) */ - struct list_head bat_trans_list; /* list head of transaction */ - struct list_head bat_cli_list; /* list head of client nodes (lstcon_node_t) */ - struct list_head *bat_cli_hash; /* hash table of client nodes */ - struct list_head bat_srv_list; /* list head of server nodes */ - struct list_head *bat_srv_hash; /* hash table of server nodes */ -} lstcon_batch_t; /*** (tests ) batch descritptor */ + cfs_list_t bat_test_list; /* list head of tests (lstcon_test_t) */ + cfs_list_t bat_trans_list; /* list head of transaction */ + cfs_list_t bat_cli_list; /* list head of client nodes (lstcon_node_t) */ + cfs_list_t *bat_cli_hash; /* hash table of client nodes */ + cfs_list_t bat_srv_list; /* list head of server nodes */ + cfs_list_t *bat_srv_hash; /* hash table of server nodes */ +} lstcon_batch_t; /*** (tests ) batch descritptor */ typedef struct lstcon_test { - lstcon_tsb_hdr_t tes_hdr; /* test batch header */ - struct list_head tes_link; /* chain on batch's tests list */ - lstcon_batch_t *tes_batch; /* pointer to batch */ - - int tes_type; /* type of the test, i.e: bulk, ping */ - int tes_stop_onerr; /* stop on error */ - int tes_oneside; /* one-sided test */ - int tes_concur; /* concurrency */ - int tes_loop; /* loop count */ - int tes_dist; /* nodes distribution of target group */ - int tes_span; /* nodes span of target group */ - 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 */ - - int tes_paramlen; /* test parameter length */ - char tes_param[0]; /* test parameter */ -} lstcon_test_t; /*** a single test descriptor */ + lstcon_tsb_hdr_t tes_hdr; /* test batch header */ + cfs_list_t tes_link; /* chain on batch's tests list */ + lstcon_batch_t *tes_batch; /* pointer to batch */ + + int tes_type; /* type of the test, i.e: bulk, ping */ + int tes_stop_onerr; /* stop on error */ + int tes_oneside; /* one-sided test */ + int tes_concur; /* concurrency */ + int tes_loop; /* loop count */ + int tes_dist; /* nodes distribution of target group */ + int tes_span; /* nodes span of target group */ + int tes_cliidx; /* client index, used for RPC creating */ + + cfs_list_t tes_trans_list; /* transaction list */ + lstcon_group_t *tes_src_grp; /* group run the test */ + lstcon_group_t *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) */ @@ -101,7 +134,7 @@ typedef struct lstcon_test { #define LST_CONSOLE_TIMEOUT 300 /* default console timeout */ typedef struct { - struct semaphore ses_mutex; /* lock for session, only one thread can enter session */ + cfs_semaphore_t ses_mutex; /* lock for session, only one thread can enter session */ lst_sid_t ses_id; /* global session id */ int ses_key; /* local session key */ int ses_state; /* state of session */ @@ -116,16 +149,15 @@ typedef struct { stt_timer_t ses_ping_timer; /* timer for pinger */ lstcon_trans_stat_t 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 */ - struct list_head ses_bat_list; /* global list of batches */ - struct list_head ses_ndl_list; /* global list of nodes */ - struct list_head *ses_ndl_hash; /* hash table of nodes */ + cfs_list_t ses_trans_list; /* global list of transaction */ + cfs_list_t ses_grp_list; /* global list of groups */ + cfs_list_t ses_bat_list; /* global list of batches */ + cfs_list_t ses_ndl_list; /* global list of nodes */ + cfs_list_t *ses_ndl_hash; /* hash table of nodes */ - spinlock_t ses_rpc_lock; /* serialize */ - int ses_rpc_pending; /* number of pending RPCs */ - struct list_head ses_rpc_list; /* list head of RPCs */ - struct list_head ses_rpc_freelist; /* idle console rpc */ + cfs_spinlock_t ses_rpc_lock; /* serialize */ + cfs_atomic_t ses_rpc_counter;/* # of initialized RPCs */ + cfs_list_t ses_rpc_freelist; /* idle console rpc */ } lstcon_session_t; /*** session descriptor */ extern lstcon_session_t console_session; @@ -135,8 +167,8 @@ 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) +static inline cfs_list_t * +lstcon_id2hash (lnet_process_id_t id, cfs_list_t *hash) { unsigned int idx = LNET_NIDADDR(id.nid) % LST_NODE_HASHSIZE; @@ -149,42 +181,45 @@ extern int lstcon_session_new(char *name, int key, extern int lstcon_session_info(lst_sid_t *sid_up, int *key, lstcon_ndlist_ent_t *entp, char *name_up, int len); extern int lstcon_session_end(void); -extern int lstcon_session_debug(int timeout, struct list_head *result_up); +extern int lstcon_session_debug(int timeout, cfs_list_t *result_up); extern int lstcon_batch_debug(int timeout, char *name, - int client, struct list_head *result_up); + int client, cfs_list_t *result_up); extern int lstcon_group_debug(int timeout, char *name, - struct list_head *result_up); + cfs_list_t *result_up); extern int lstcon_nodes_debug(int timeout, int nnd, lnet_process_id_t *nds_up, - struct list_head *result_up); + cfs_list_t *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 *result_up); +extern int lstcon_group_refresh(char *name, cfs_list_t *result_up); extern int lstcon_nodes_add(char *name, int nnd, lnet_process_id_t *nds_up, - struct list_head *result_up); + cfs_list_t *result_up); extern int lstcon_nodes_remove(char *name, int nnd, lnet_process_id_t *nds_up, - struct list_head *result_up); + cfs_list_t *result_up); extern int lstcon_group_info(char *name, lstcon_ndlist_ent_t *gent_up, int *index_p, int *ndent_p, lstcon_node_ent_t *ndents_up); extern int lstcon_group_list(int idx, int len, char *name_up); extern int lstcon_batch_add(char *name); -extern int lstcon_batch_run(char *name, int timeout, struct list_head *result_up); -extern int lstcon_batch_stop(char *name, int force, struct list_head *result_up); +extern int lstcon_batch_run(char *name, int timeout, + cfs_list_t *result_up); +extern int lstcon_batch_stop(char *name, int force, + cfs_list_t *result_up); extern int lstcon_test_batch_query(char *name, int testidx, int client, int timeout, - struct list_head *result_up); + cfs_list_t *result_up); extern int lstcon_batch_del(char *name); extern int lstcon_batch_list(int idx, int namelen, char *name_up); extern int lstcon_batch_info(char *name, lstcon_test_batch_ent_t *ent_up, int server, int testidx, int *index_p, int *ndent_p, lstcon_node_ent_t *dents_up); extern int lstcon_group_stat(char *grp_name, int timeout, - struct list_head *result_up); + cfs_list_t *result_up); extern int lstcon_nodes_stat(int count, lnet_process_id_t *ids_up, - int timeout, struct list_head *result_up); + int timeout, cfs_list_t *result_up); extern int lstcon_test_add(char *name, int type, int loop, int concur, int dist, int span, char *src_name, char * dst_name, - void *param, int paramlen, struct list_head *result_up); + void *param, int paramlen, int *retp, + cfs_list_t *result_up); #endif -#endif +#endif