/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
* vim:expandtab:shiftwidth=8:tabstop=8:
- *
- * Author: Liang Zhen <liangzhen@clusterfs.com>
*
- * 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 2008 Sun Microsystems, Inc. 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/conctl.c
*
* Console framework rpcs
+ *
+ * Author: Liang Zhen <liangzhen@clusterfs.com>
*/
+
#ifdef __KERNEL__
#include <libcfs/libcfs.h>
{
lstcon_rpc_t *crpc = (lstcon_rpc_t *)rpc->crpc_priv;
- LASSERT (!list_empty(&crpc->crp_link));
LASSERT (crpc != NULL && rpc == crpc->crp_rpc);
LASSERT (crpc->crp_posted && !crpc->crp_finished);
- spin_lock(&rpc->crpc_lock);
+ cfs_spin_lock(&rpc->crpc_lock);
if (crpc->crp_trans == NULL) {
- /* orphan RPC */
- spin_lock(&console_session.ses_rpc_lock);
-
- /* delete from orphan rpcs list */
- console_session.ses_rpc_pending --;
- list_del_init(&crpc->crp_link);
-
- spin_unlock(&console_session.ses_rpc_lock);
-
- spin_unlock(&rpc->crpc_lock);
+ /* Orphan RPC is not in any transaction,
+ * I'm just a poor body and nobody loves me */
+ cfs_spin_unlock(&rpc->crpc_lock);
/* release it */
lstcon_rpc_put(crpc);
crpc->crp_status = rpc->crpc_status;
}
- /* wakeup thread waiting on the group if
- * it's the last rpc in the group */
- if (atomic_dec_and_test(&crpc->crp_trans->tas_remaining))
+ /* wakeup (transaction)thread if I'm the last RPC in the transaction */
+ if (cfs_atomic_dec_and_test(&crpc->crp_trans->tas_remaining))
cfs_waitq_signal(&crpc->crp_trans->tas_waitq);
- spin_unlock(&rpc->crpc_lock);
+ cfs_spin_unlock(&rpc->crpc_lock);
}
int
crpc->crp_static = !cached;
CFS_INIT_LIST_HEAD(&crpc->crp_link);
+ cfs_atomic_inc(&console_session.ses_rpc_counter);
+
return 0;
}
lstcon_rpc_t *crpc = NULL;
int rc;
- spin_lock(&console_session.ses_rpc_lock);
+ cfs_spin_lock(&console_session.ses_rpc_lock);
- if (!list_empty(&console_session.ses_rpc_freelist)) {
- crpc = list_entry(console_session.ses_rpc_freelist.next,
- lstcon_rpc_t, crp_link);
- list_del(&crpc->crp_link);
+ if (!cfs_list_empty(&console_session.ses_rpc_freelist)) {
+ crpc = cfs_list_entry(console_session.ses_rpc_freelist.next,
+ lstcon_rpc_t, crp_link);
+ cfs_list_del_init(&crpc->crp_link);
}
- spin_unlock(&console_session.ses_rpc_lock);
+ cfs_spin_unlock(&console_session.ses_rpc_lock);
if (crpc == NULL) {
LIBCFS_ALLOC(crpc, sizeof(*crpc));
srpc_bulk_t *bulk = &crpc->crp_rpc->crpc_bulk;
int i;
- LASSERT (list_empty(&crpc->crp_link));
+ LASSERT (cfs_list_empty(&crpc->crp_link));
for (i = 0; i < bulk->bk_niov; i++) {
if (bulk->bk_iovs[i].kiov_page == NULL)
srpc_client_rpc_decref(crpc->crp_rpc);
if (crpc->crp_static) {
+ /* Static RPC, not allocated */
memset(crpc, 0, sizeof(*crpc));
crpc->crp_static = 1;
- return;
- }
- spin_lock(&console_session.ses_rpc_lock);
+ } else {
+ cfs_spin_lock(&console_session.ses_rpc_lock);
- list_add(&crpc->crp_link, &console_session.ses_rpc_freelist);
+ cfs_list_add(&crpc->crp_link,
+ &console_session.ses_rpc_freelist);
- spin_unlock(&console_session.ses_rpc_lock);
+ cfs_spin_unlock(&console_session.ses_rpc_lock);
+ }
+
+ /* RPC is not alive now */
+ cfs_atomic_dec(&console_session.ses_rpc_counter);
}
void
LASSERT (trans != NULL);
- atomic_inc(&trans->tas_remaining);
+ cfs_atomic_inc(&trans->tas_remaining);
crpc->crp_posted = 1;
sfw_post_rpc(crpc->crp_rpc);
}
int
-lstcon_rpc_trans_prep(struct list_head *translist,
+lstcon_rpc_trans_prep(cfs_list_t *translist,
int transop, lstcon_rpc_trans_t **transpp)
{
lstcon_rpc_trans_t *trans;
if (translist != NULL) {
- list_for_each_entry(trans, translist, tas_link) {
+ cfs_list_for_each_entry_typed(trans, translist,
+ lstcon_rpc_trans_t, tas_link) {
/* Can't enqueue two private transaction on
* the same object */
if ((trans->tas_opc & transop) == LST_TRANS_PRIVATE)
if (translist == NULL)
CFS_INIT_LIST_HEAD(&trans->tas_olink);
else
- list_add_tail(&trans->tas_olink, translist);
+ cfs_list_add_tail(&trans->tas_olink, translist);
- list_add_tail(&trans->tas_link, &console_session.ses_trans_list);
+ cfs_list_add_tail(&trans->tas_link, &console_session.ses_trans_list);
CFS_INIT_LIST_HEAD(&trans->tas_rpcs_list);
- atomic_set(&trans->tas_remaining, 0);
+ cfs_atomic_set(&trans->tas_remaining, 0);
cfs_waitq_init(&trans->tas_waitq);
*transpp = trans;
void
lstcon_rpc_trans_addreq(lstcon_rpc_trans_t *trans, lstcon_rpc_t *crpc)
{
- list_add_tail(&crpc->crp_link, &trans->tas_rpcs_list);
+ cfs_list_add_tail(&crpc->crp_link, &trans->tas_rpcs_list);
crpc->crp_trans = trans;
}
lstcon_rpc_t *crpc;
lstcon_node_t *nd;
- list_for_each_entry (crpc, &trans->tas_rpcs_list, crp_link) {
+ cfs_list_for_each_entry_typed (crpc, &trans->tas_rpcs_list,
+ lstcon_rpc_t, crp_link) {
rpc = crpc->crp_rpc;
- spin_lock(&rpc->crpc_lock);
+ cfs_spin_lock(&rpc->crpc_lock);
if (!crpc->crp_posted || crpc->crp_stamp != 0) {
/* rpc done or aborted already */
- spin_unlock(&rpc->crpc_lock);
+ cfs_spin_unlock(&rpc->crpc_lock);
continue;
}
crpc->crp_stamp = cfs_time_current();
crpc->crp_status = error;
- spin_unlock(&rpc->crpc_lock);
+ cfs_spin_unlock(&rpc->crpc_lock);
sfw_abort_rpc(rpc);
lstcon_rpc_trans_check(lstcon_rpc_trans_t *trans)
{
if (console_session.ses_shutdown &&
- !list_empty(&trans->tas_olink)) /* It's not an end session RPC */
+ !cfs_list_empty(&trans->tas_olink)) /* Not an end session RPC */
return 1;
- return (atomic_read(&trans->tas_remaining) == 0) ? 1: 0;
+ return (cfs_atomic_read(&trans->tas_remaining) == 0) ? 1: 0;
}
int
lstcon_rpc_t *crpc;
int rc;
- if (list_empty(&trans->tas_rpcs_list))
+ if (cfs_list_empty(&trans->tas_rpcs_list))
return 0;
if (timeout < LST_TRANS_MIN_TIMEOUT)
lstcon_rpc_trans_name(trans->tas_opc));
/* post all requests */
- list_for_each_entry (crpc, &trans->tas_rpcs_list, crp_link) {
+ cfs_list_for_each_entry_typed (crpc, &trans->tas_rpcs_list,
+ lstcon_rpc_t, crp_link) {
LASSERT (!crpc->crp_posted);
lstcon_rpc_post(crpc);
}
- mutex_up(&console_session.ses_mutex);
+ cfs_mutex_up(&console_session.ses_mutex);
- rc = wait_event_interruptible_timeout(trans->tas_waitq,
+ cfs_waitq_wait_event_interruptible_timeout(trans->tas_waitq,
lstcon_rpc_trans_check(trans),
- timeout * HZ);
+ cfs_time_seconds(timeout), rc);
rc = (rc > 0)? 0: ((rc < 0)? -EINTR: -ETIMEDOUT);
- mutex_down(&console_session.ses_mutex);
+ cfs_mutex_down(&console_session.ses_mutex);
if (console_session.ses_shutdown)
rc = -ESHUTDOWN;
memset(stat, 0, sizeof(*stat));
- list_for_each_entry(crpc, &trans->tas_rpcs_list, crp_link) {
+ cfs_list_for_each_entry_typed(crpc, &trans->tas_rpcs_list,
+ lstcon_rpc_t, crp_link) {
lstcon_rpc_stat_total(stat, 1);
rpc = crpc->crp_rpc;
crpc->crp_node, stat);
}
- CDEBUG(D_NET, "transaction %s success, %d failure, %d total %d, "
+ CDEBUG(D_NET, "transaction %s : success %d, failure %d, total %d, "
"RPC error(%d), Framework error(%d)\n",
lstcon_rpc_trans_name(trans->tas_opc),
lstcon_rpc_stat_success(stat, 0),
int
lstcon_rpc_trans_interpreter(lstcon_rpc_trans_t *trans,
- struct list_head *head_up,
+ cfs_list_t *head_up,
lstcon_rpc_readent_func_t readent)
{
- struct list_head tmp;
- struct list_head *next;
+ cfs_list_t tmp;
+ cfs_list_t *next;
lstcon_rpc_ent_t *ent;
srpc_generic_reply_t *rep;
srpc_client_rpc_t *rpc;
next = head_up;
- list_for_each_entry(crpc, &trans->tas_rpcs_list, crp_link) {
- if (copy_from_user(&tmp, next, sizeof(struct list_head)))
+ cfs_list_for_each_entry_typed(crpc, &trans->tas_rpcs_list,
+ lstcon_rpc_t, crp_link) {
+ if (cfs_copy_from_user(&tmp, next,
+ sizeof(cfs_list_t)))
return -EFAULT;
if (tmp.next == head_up)
next = tmp.next;
- ent = list_entry(next, lstcon_rpc_ent_t, rpe_link);
+ ent = cfs_list_entry(next, lstcon_rpc_ent_t, rpe_link);
rpc = crpc->crp_rpc;
nd = crpc->crp_node;
- dur = cfs_time_sub(crpc->crp_stamp,
- console_session.ses_id.ses_stamp);
+ dur = (cfs_duration_t)cfs_time_sub(crpc->crp_stamp,
+ (cfs_time_t)console_session.ses_id.ses_stamp);
cfs_duration_usec(dur, &tv);
- if (copy_to_user(&ent->rpe_peer,
- &nd->nd_id, sizeof(lnet_process_id_t)) ||
- copy_to_user(&ent->rpe_stamp, &tv, sizeof(tv)) ||
- copy_to_user(&ent->rpe_state,
- &nd->nd_state, sizeof(nd->nd_state)) ||
- copy_to_user(&ent->rpe_rpc_errno, &error, sizeof(error)))
+ if (cfs_copy_to_user(&ent->rpe_peer,
+ &nd->nd_id, sizeof(lnet_process_id_t)) ||
+ cfs_copy_to_user(&ent->rpe_stamp, &tv, sizeof(tv)) ||
+ cfs_copy_to_user(&ent->rpe_state,
+ &nd->nd_state, sizeof(nd->nd_state)) ||
+ cfs_copy_to_user(&ent->rpe_rpc_errno, &error,
+ sizeof(error)))
return -EFAULT;
if (error != 0)
/* RPC is done */
rep = (srpc_generic_reply_t *)&msg->msg_body.reply;
- if (copy_to_user(&ent->rpe_sid,
- &rep->sid, sizeof(lst_sid_t)) ||
- copy_to_user(&ent->rpe_fwk_errno,
- &rep->status, sizeof(rep->status)))
+ if (cfs_copy_to_user(&ent->rpe_sid,
+ &rep->sid, sizeof(lst_sid_t)) ||
+ cfs_copy_to_user(&ent->rpe_fwk_errno,
+ &rep->status, sizeof(rep->status)))
return -EFAULT;
if (readent == NULL)
lstcon_rpc_t *crpc;
lstcon_rpc_t *tmp;
int count = 0;
-
- list_for_each_entry_safe(crpc, tmp,
- &trans->tas_rpcs_list, crp_link) {
+
+ cfs_list_for_each_entry_safe_typed(crpc, tmp,
+ &trans->tas_rpcs_list,
+ lstcon_rpc_t, crp_link) {
rpc = crpc->crp_rpc;
- spin_lock(&rpc->crpc_lock);
+ cfs_spin_lock(&rpc->crpc_lock);
/* free it if not posted or finished already */
if (!crpc->crp_posted || crpc->crp_finished) {
- spin_unlock(&rpc->crpc_lock);
+ cfs_spin_unlock(&rpc->crpc_lock);
- list_del_init(&crpc->crp_link);
+ cfs_list_del_init(&crpc->crp_link);
lstcon_rpc_put(crpc);
continue;
/* rpcs can be still not callbacked (even LNetMDUnlink is called)
* because huge timeout for inaccessible network, don't make
- * user wait for them, just put rpcs in orphan list */
+ * user wait for them, just abandon them, they will be recycled
+ * in callback */
LASSERT (crpc->crp_status != 0);
crpc->crp_node = NULL;
crpc->crp_trans = NULL;
- list_del(&crpc->crp_link);
-
- spin_lock(&console_session.ses_rpc_lock);
-
+ cfs_list_del_init(&crpc->crp_link);
count ++;
- /* add to orphan list */
- console_session.ses_rpc_pending ++;
- list_add_tail(&crpc->crp_link, &console_session.ses_rpc_list);
-
- spin_unlock(&console_session.ses_rpc_lock);
- spin_unlock(&rpc->crpc_lock);
+ cfs_spin_unlock(&rpc->crpc_lock);
- atomic_dec(&trans->tas_remaining);
+ cfs_atomic_dec(&trans->tas_remaining);
}
- LASSERT (atomic_read(&trans->tas_remaining) == 0);
+ LASSERT (cfs_atomic_read(&trans->tas_remaining) == 0);
- list_del(&trans->tas_link);
- if (!list_empty(&trans->tas_olink))
- list_del(&trans->tas_olink);
+ cfs_list_del(&trans->tas_link);
+ if (!cfs_list_empty(&trans->tas_olink))
+ cfs_list_del(&trans->tas_olink);
CDEBUG(D_NET, "Transaction %s destroyed with %d pending RPCs\n",
lstcon_rpc_trans_name(trans->tas_opc), count);
return 0;
}
-lnet_process_id_t *
+lnet_process_id_packed_t *
lstcon_next_id(int idx, int nkiov, lnet_kiov_t *kiov)
{
- lnet_process_id_t *pid;
- int i;
+ lnet_process_id_packed_t *pid;
+ int i;
- i = idx / (CFS_PAGE_SIZE / sizeof(lnet_process_id_t));
+ i = idx / SFW_ID_PER_PAGE;
LASSERT (i < nkiov);
- pid = (lnet_process_id_t *)cfs_page_address(kiov[i].kiov_page);
+ pid = (lnet_process_id_packed_t *)cfs_page_address(kiov[i].kiov_page);
- return &pid[idx % (CFS_PAGE_SIZE / sizeof(lnet_process_id_t))];
+ return &pid[idx % SFW_ID_PER_PAGE];
}
int
lstcon_dstnodes_prep(lstcon_group_t *grp, int idx,
int dist, int span, int nkiov, lnet_kiov_t *kiov)
{
- lnet_process_id_t *pid;
- lstcon_ndlink_t *ndl;
- lstcon_node_t *nd;
- int start;
- int end;
- int i = 0;
+ lnet_process_id_packed_t *pid;
+ lstcon_ndlink_t *ndl;
+ lstcon_node_t *nd;
+ int start;
+ int end;
+ int i = 0;
LASSERT (dist >= 1);
LASSERT (span >= 1);
start = ((idx / dist) * span) % grp->grp_nnode;
end = ((idx / dist) * span + span - 1) % grp->grp_nnode;
- list_for_each_entry(ndl, &grp->grp_ndl_list, ndl_link) {
+ cfs_list_for_each_entry_typed(ndl, &grp->grp_ndl_list,
+ lstcon_ndlink_t, ndl_link) {
nd = ndl->ndl_node;
if (i < start) {
i ++;
break;
pid = lstcon_next_id((i - start), nkiov, kiov);
- *pid = nd->nd_id;
+ pid->nid = nd->nd_id.nid;
+ pid->pid = nd->nd_id.pid;
i++;
}
if (start <= end) /* done */
return 0;
- list_for_each_entry(ndl, &grp->grp_ndl_list, ndl_link) {
+ cfs_list_for_each_entry_typed(ndl, &grp->grp_ndl_list,
+ lstcon_ndlink_t, ndl_link) {
if (i > grp->grp_nnode + end)
break;
nd = ndl->ndl_node;
pid = lstcon_next_id((i - start), nkiov, kiov);
- *pid = nd->nd_id;
+ pid->nid = nd->nd_id.nid;
+ pid->pid = nd->nd_id.pid;
i++;
}
test_bulk_req_t *brq = &req->tsr_u.bulk;
brq->blk_opc = param->blk_opc;
- brq->blk_npg = param->blk_npg;
+ brq->blk_npg = (param->blk_size + CFS_PAGE_SIZE - 1) / CFS_PAGE_SIZE;
brq->blk_flags = param->blk_flags;
return 0;
trq->tsr_bid = test->tes_hdr.tsb_id;
trq->tsr_concur = test->tes_concur;
trq->tsr_is_client = (transop == LST_TRANS_TSBCLIADD) ? 1 : 0;
- trq->tsr_stop_onerr = test->tes_stop_onerr;
+ trq->tsr_stop_onerr = !!test->tes_stop_onerr;
switch (test->tes_type) {
case LST_TEST_PING:
srpc_batch_reply_t *bat_rep;
srpc_test_reply_t *test_rep;
srpc_stat_reply_t *stat_rep;
- int errno = 0;
+ int rc = 0;
switch (transop) {
case LST_TRANS_SESNEW:
mksn_rep->mksn_status == EINVAL);
lstcon_sesop_stat_failure(stat, 1);
- errno = mksn_rep->mksn_status;
+ rc = mksn_rep->mksn_status;
break;
case LST_TRANS_SESEND:
rmsn_rep->rmsn_status == EINVAL);
lstcon_sesop_stat_failure(stat, 1);
- errno = rmsn_rep->rmsn_status;
+ rc = rmsn_rep->rmsn_status;
break;
case LST_TRANS_SESQRY:
}
lstcon_tsbop_stat_failure(stat, 1);
- errno = bat_rep->bar_status;
+ rc = bat_rep->bar_status;
break;
case LST_TRANS_TSBCLIQRY:
return;
lstcon_tsbqry_stat_failure(stat, 1);
- errno = bat_rep->bar_status;
+ rc = bat_rep->bar_status;
break;
case LST_TRANS_TSBCLIADD:
}
lstcon_tsbop_stat_failure(stat, 1);
- errno = test_rep->tsr_status;
+ rc = test_rep->tsr_status;
break;
case LST_TRANS_STATQRY:
}
lstcon_statqry_stat_failure(stat, 1);
- errno = stat_rep->str_status;
+ rc = stat_rep->str_status;
break;
default:
}
if (stat->trs_fwk_errno == 0)
- stat->trs_fwk_errno = errno;
+ stat->trs_fwk_errno = rc;
return;
}
int
-lstcon_rpc_trans_ndlist(struct list_head *ndlist,
- struct list_head *translist, int transop, void *arg,
- lstcon_rpc_cond_func_t condition, lstcon_rpc_trans_t **transpp)
+lstcon_rpc_trans_ndlist(cfs_list_t *ndlist,
+ cfs_list_t *translist, int transop,
+ void *arg, lstcon_rpc_cond_func_t condition,
+ lstcon_rpc_trans_t **transpp)
{
lstcon_rpc_trans_t *trans;
lstcon_ndlink_t *ndl;
return rc;
}
- list_for_each_entry(ndl, ndlist, ndl_link) {
+ cfs_list_for_each_entry_typed(ndl, ndlist, lstcon_ndlink_t, ndl_link) {
rc = condition == NULL ? 1 :
condition(transop, ndl->ndl_node, arg);
/* RPC pinger is a special case of transaction,
* it's called by timer at 8 seconds interval.
*/
- mutex_down(&console_session.ses_mutex);
+ cfs_mutex_down(&console_session.ses_mutex);
if (console_session.ses_shutdown || console_session.ses_expired) {
- mutex_up(&console_session.ses_mutex);
+ cfs_mutex_up(&console_session.ses_mutex);
return;
}
if (!console_session.ses_expired &&
cfs_time_current_sec() - console_session.ses_laststamp >
- console_session.ses_timeout)
+ (time_t)console_session.ses_timeout)
console_session.ses_expired = 1;
trans = console_session.ses_ping;
LASSERT (trans != NULL);
- list_for_each_entry(ndl, &console_session.ses_ndl_list, ndl_link) {
+ cfs_list_for_each_entry_typed(ndl, &console_session.ses_ndl_list,
+ lstcon_ndlink_t, ndl_link) {
nd = ndl->ndl_node;
if (console_session.ses_expired) {
if (crpc->crp_rpc != NULL) {
LASSERT (crpc->crp_trans == trans);
- LASSERT (!list_empty(&crpc->crp_link));
+ LASSERT (!cfs_list_empty(&crpc->crp_link));
- spin_lock(&crpc->crp_rpc->crpc_lock);
+ cfs_spin_lock(&crpc->crp_rpc->crpc_lock);
LASSERT (crpc->crp_posted);
if (!crpc->crp_finished) {
/* in flight */
- spin_unlock(&crpc->crp_rpc->crpc_lock);
+ cfs_spin_unlock(&crpc->crp_rpc->crpc_lock);
continue;
}
- spin_unlock(&crpc->crp_rpc->crpc_lock);
+ cfs_spin_unlock(&crpc->crp_rpc->crpc_lock);
lstcon_rpc_get_reply(crpc, &rep);
- list_del_init(&crpc->crp_link);
+ cfs_list_del_init(&crpc->crp_link);
lstcon_rpc_put(crpc);
}
intv = cfs_duration_sec(cfs_time_sub(cfs_time_current(),
nd->nd_stamp));
- if (intv < nd->nd_timeout / 2)
+ if (intv < (time_t)nd->nd_timeout / 2)
continue;
rc = lstcon_rpc_init(nd, SRPC_SERVICE_DEBUG, 0, 0, crpc);
}
if (console_session.ses_expired) {
- mutex_up(&console_session.ses_mutex);
+ cfs_mutex_up(&console_session.ses_mutex);
return;
}
CDEBUG(D_NET, "Ping %d nodes in session\n", count);
- ptimer->stt_expires = cfs_time_current_sec() + LST_PING_INTERVAL;
+ ptimer->stt_expires = (cfs_time_t)(cfs_time_current_sec() + LST_PING_INTERVAL);
stt_add_timer(ptimer);
- mutex_up(&console_session.ses_mutex);
+ cfs_mutex_up(&console_session.ses_mutex);
}
int
stt_timer_t *ptimer;
int rc;
- LASSERT (console_session.ses_rpc_pending == 0);
- LASSERT (list_empty(&console_session.ses_rpc_list));
- LASSERT (list_empty(&console_session.ses_rpc_freelist));
+ LASSERT (cfs_list_empty(&console_session.ses_rpc_freelist));
+ LASSERT (cfs_atomic_read(&console_session.ses_rpc_counter) == 0);
rc = lstcon_rpc_trans_prep(NULL, LST_TRANS_SESPING,
&console_session.ses_ping);
}
ptimer = &console_session.ses_ping_timer;
- ptimer->stt_expires = cfs_time_current_sec() + LST_PING_INTERVAL;
+ ptimer->stt_expires = (cfs_time_t)(cfs_time_current_sec() + LST_PING_INTERVAL);
stt_add_timer(ptimer);
{
lstcon_rpc_trans_t *trans;
lstcon_rpc_t *crpc;
- struct list_head *pacer;
- struct list_head zlist;
+ cfs_list_t *pacer;
+ cfs_list_t zlist;
+
+ /* Called with hold of global mutex */
LASSERT (console_session.ses_shutdown);
- while (!list_empty(&console_session.ses_trans_list)) {
- list_for_each(pacer, &console_session.ses_trans_list) {
- trans = list_entry(pacer, lstcon_rpc_trans_t, tas_link);
- cfs_waitq_signal(&trans->tas_waitq);
+ while (!cfs_list_empty(&console_session.ses_trans_list)) {
+ cfs_list_for_each(pacer, &console_session.ses_trans_list) {
+ trans = cfs_list_entry(pacer, lstcon_rpc_trans_t,
+ tas_link);
CDEBUG(D_NET, "Session closed, wakeup transaction %s\n",
lstcon_rpc_trans_name(trans->tas_opc));
+
+ cfs_waitq_signal(&trans->tas_waitq);
}
- mutex_up(&console_session.ses_mutex);
+ cfs_mutex_up(&console_session.ses_mutex);
- CWARN("Session is shutting down, close all transactions\n");
+ CWARN("Session is shutting down, "
+ "waiting for termination of transactions\n");
cfs_pause(cfs_time_seconds(1));
- mutex_down(&console_session.ses_mutex);
+ cfs_mutex_down(&console_session.ses_mutex);
}
- spin_lock(&console_session.ses_rpc_lock);
+ cfs_spin_lock(&console_session.ses_rpc_lock);
- lst_wait_until(list_empty(&console_session.ses_rpc_list),
+ lst_wait_until((cfs_atomic_read(&console_session.ses_rpc_counter) == 0),
console_session.ses_rpc_lock,
"Network is not accessable or target is down, "
- "waiting for %d console rpcs to die\n",
- console_session.ses_rpc_pending);
+ "waiting for %d console RPCs to being recycled\n",
+ cfs_atomic_read(&console_session.ses_rpc_counter));
- list_add(&zlist, &console_session.ses_rpc_freelist);
- list_del_init(&console_session.ses_rpc_freelist);
+ cfs_list_add(&zlist, &console_session.ses_rpc_freelist);
+ cfs_list_del_init(&console_session.ses_rpc_freelist);
- spin_unlock(&console_session.ses_rpc_lock);
+ cfs_spin_unlock(&console_session.ses_rpc_lock);
- LASSERT (console_session.ses_rpc_pending == 0);
+ while (!cfs_list_empty(&zlist)) {
+ crpc = cfs_list_entry(zlist.next, lstcon_rpc_t, crp_link);
- while (!list_empty(&zlist)) {
- crpc = list_entry(zlist.next, lstcon_rpc_t, crp_link);
-
- list_del(&crpc->crp_link);
+ cfs_list_del(&crpc->crp_link);
LIBCFS_FREE(crpc, sizeof(lstcon_rpc_t));
}
}
console_session.ses_ping_timer.stt_data = &console_session.ses_ping_timer;
console_session.ses_ping = NULL;
- console_session.ses_rpc_pending = 0;
- spin_lock_init(&console_session.ses_rpc_lock);
- CFS_INIT_LIST_HEAD(&console_session.ses_rpc_list);
+
+ cfs_spin_lock_init(&console_session.ses_rpc_lock);
+ cfs_atomic_set(&console_session.ses_rpc_counter, 0);
CFS_INIT_LIST_HEAD(&console_session.ses_rpc_freelist);
return 0;
void
lstcon_rpc_module_fini(void)
{
- LASSERT (console_session.ses_rpc_pending == 0);
- LASSERT (list_empty(&console_session.ses_rpc_list));
- LASSERT (list_empty(&console_session.ses_rpc_freelist));
+ LASSERT (cfs_list_empty(&console_session.ses_rpc_freelist));
+ LASSERT (cfs_atomic_read(&console_session.ses_rpc_counter) == 0);
}
#endif
git://git.whamcloud.com / fs / lustre-release.git / blobdiff