X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2Floadgen.c;h=19072a508b5e1f57c9c57fb01abf0e45926d5d8b;hp=4ba3dcd91a67e75f809fb1554bc920e644e780c2;hb=af79b4e7e89c6c5f455a0526f1598dae217db2e5;hpb=b4e0c7ee3de0294099ad7f433491df01b23f7adf diff --git a/lustre/utils/loadgen.c b/lustre/utils/loadgen.c index 4ba3dcd..19072a5 100644 --- a/lustre/utils/loadgen.c +++ b/lustre/utils/loadgen.c @@ -1,30 +1,44 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: +/* + * GPL HEADER START * - * Copyright (C) 2006 Cluster File Systems, Inc. - * Author: Nathan Rutman + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * This file is part of Lustre, http://www.lustre.org. + * 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. * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License 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). * - * Lustre 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 for more details. + * 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 * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * 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. + * + * lustre/utils/loadgen.c * - * loadgen.c * See how many local OSCs we can start whaling on a OST * We're doing direct ioctls instead of going though a system() call to lctl * to avoid the bash overhead. * Adds an osc / echo client pair in each thread and starts echo transactions. * + * Author: Nathan Rutman */ #include @@ -42,13 +56,12 @@ #include #include -#include "parser.h" +#include #include "obdctl.h" static char cmdname[512]; static char target[64] = ""; char nid[64] = ""; -static int live_threads = 0; static int sig_received = 0; static int o_verbose = 4; /* 0-5 */ static int my_oss = 0; @@ -62,7 +75,7 @@ static int jt_quit(int argc, char **argv) { static int loadgen_usage(int argc, char **argv) { if (argc == 1) { - fprintf(stderr, + fprintf(stderr, "This is a test program used to simulate large numbers of\n" "clients. The echo obds are used, so the obdecho module must\n" "be loaded.\n" @@ -129,7 +142,9 @@ struct kid_t { int k_dev; }; +static int live_threads = 0; static struct kid_t *kid_list = NULL; +pthread_mutex_t m_list = PTHREAD_MUTEX_INITIALIZER; static struct kid_t *push_kid(int tnum) { @@ -140,10 +155,12 @@ static struct kid_t *push_kid(int tnum) return NULL; } kid->k_pthread = pthread_self(); + pthread_mutex_lock(&m_list); kid->k_next = kid_list; kid->k_id = tnum; kid_list = kid; live_threads++; + pthread_mutex_unlock(&m_list); return kid; } @@ -248,7 +265,7 @@ static int write_proc(char *proc_path, char *value) return rc; } -static int read_proc(char *proc_path, unsigned long long *value) +static int read_proc(char *proc_path, unsigned long long *value) { int fd, rc; char buf[50]; @@ -461,6 +478,7 @@ static int obj_create(struct kid_t *kid) data.ioc_dev = kid->k_dev; data.ioc_obdo1.o_mode = 0100644; data.ioc_obdo1.o_id = 0; + data.ioc_obdo1.o_seq = FID_SEQ_ECHO; data.ioc_obdo1.o_uid = 0; data.ioc_obdo1.o_gid = 0; data.ioc_obdo1.o_valid = OBD_MD_FLTYPE | OBD_MD_FLMODE | @@ -650,7 +668,7 @@ static void *run_one_child(void *threadvp) { struct kid_t *kid; char oname[10], ename[10]; - int thread = (long)threadvp, dev; + int thread = (long)threadvp, dev = 0; int rc = 0, err; if (o_verbose > 2) @@ -674,12 +692,14 @@ static void *run_one_child(void *threadvp) while(!(rc || sig_received)) { pthread_mutex_lock(&m_trigger); + pthread_mutex_lock(&m_list); waiting_count++; if ((waiting_count == live_threads) && timer_on) { report_perf(); timer_on = 0; all_done = 1; } + pthread_mutex_unlock(&m_list); pthread_cond_wait(&cv_trigger, &m_trigger); waiting_count--; all_done = 0; @@ -715,6 +735,19 @@ out: pthread_exit((void *)(long)rc); } +/* + * PTHREAD_STACK_MIN is 16K minimal stack for threads. This + * is stack consumed by one thread, which executes NULL procedure. + * We need some more here and 20k stack for one client thread + * is enough to not overflow. In same time it does not consume + * a lot of memory for large number of threads. + * + * 20K virtual clients will only consume 320M + 400M. Still to + * create this number of virtual clients we need to fix 8192 + * OBDs limit. + */ +#define CLIENT_THREAD_STACK_SIZE (PTHREAD_STACK_MIN + (20 * 1024)) + static int loadgen_start_clients(int argc, char **argv) { int rc = 0, i, numt; @@ -740,7 +773,7 @@ static int loadgen_start_clients(int argc, char **argv) cmdname, rc, strerror(errno)); return -errno; } - pthread_attr_setstacksize (&attr, PTHREAD_STACK_MIN); + pthread_attr_setstacksize (&attr, CLIENT_THREAD_STACK_SIZE); pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE); numt += live_threads; @@ -845,13 +878,17 @@ static int loadgen_write(int argc, char **argv) if (argc < 3 || argc > 4) return CMD_HELP; threads = atoi(argv[1]); + pthread_mutex_lock(&m_list); if (threads > live_threads) { + pthread_mutex_unlock(&m_list); fprintf(stderr, "requested %d threads but only %d are running. " "Use 'start' to start some more.\n", threads, live_threads); return -EOVERFLOW; + } else { + pthread_mutex_unlock(&m_list); } - trigger(C_WRITE, threads, atoi(argv[2]), + trigger(C_WRITE, threads, atoi(argv[2]), (argc == 4) ? atoi(argv[3]) : 0); return 0; } @@ -900,7 +937,7 @@ static int loadgen_start_echosrv(int argc, char **argv) cmdname, rc); goto clean; } - + /* Create an OSS to handle the communications */ /* attach ost OSS OSS_UUID */ args[1] = "ost"; @@ -939,7 +976,7 @@ clean: static int loadgen_wait(int argc, char **argv) { - /* Give scripts a chance to start some threads */ + /* Give scripts a chance to start some threads */ sleep(1); while (!all_done) { sleep(1); @@ -949,7 +986,7 @@ static int loadgen_wait(int argc, char **argv) static int loadgen_init(int argc, char **argv) { - char *args[3]; + char *args[4]; int rc; sprintf(cmdname, "%s", argv[0]); @@ -979,7 +1016,7 @@ static int loadgen_init(int argc, char **argv) static int loadgen_exit() { int rc; - + printf("stopping %d children\n", live_threads); kill_kids(); rc = wait_for_threads(); @@ -1021,7 +1058,7 @@ static int loadgen_main(int argc, char **argv) out: obd_finalize(argc, argv); - return rc; + return rc < 0 ? -rc : rc; } #ifndef LIBLUSTRE_TEST @@ -1034,4 +1071,3 @@ int main (int argc, char **argv) return rc; } #endif -