Menu
▾
▴
[Gfarm-commits] SF.net SVN: gfarm:[10424] gfarm_v2/branches/2.7
|
From: <ta...@us...> - 2017-02-04 11:43:15
|
Revision: 10424
http://sourceforge.net/p/gfarm/code/10424
Author: tatebe
Date: 2017-02-04 11:43:13 +0000 (Sat, 04 Feb 2017)
Log Message:
-----------
merge r10413 from 2.6 branch - implement #983 - change -h option of gfcreate-test command from help to filesystem node name
Revision Links:
--------------
http://sourceforge.net/p/gfarm/code/10413
Modified Paths:
--------------
gfarm_v2/branches/2.7/bench/gfcreate-test/gfcreate-test.c
Property Changed:
----------------
gfarm_v2/branches/2.7/
Index: gfarm_v2/branches/2.7
===================================================================
--- gfarm_v2/branches/2.7 2017-02-01 04:37:49 UTC (rev 10423)
+++ gfarm_v2/branches/2.7 2017-02-04 11:43:13 UTC (rev 10424)
Property changes on: gfarm_v2/branches/2.7
___________________________________________________________________
Modified: svn:mergeinfo
## -1,6 +1,6 ##
/gfarm_v2/branches/2.4:5271,5275-5281,5290,5329
/gfarm_v2/branches/2.5:7212,7214,7216-7217,7225,7246,7252,7254-7256,7260,7286,7509,7560-7561,7564,7573,7593-7596,7608,7619-7620,7633,7650,7655,7663,7677,7680,7700,7717,7725,7728,7732,7736,7780,7796,7813,7852,7855,7876,7897,7908,7918,7922,7924,7929,7933,7941-7942,7946-7948,7950,7954,7983,7997,8005,8008,8011,8014,8017,8028,8035-8037,8040,8043,8050,8053,8057-8058,8072,8078,8083,8095,8097,8106,8116-8118,8122,8137,8149,8154,8163,8167,8180-8181,8189,8192,8196,8227,8232,8236,8241,8245,8280,8294-8295,8310,8313,8333,8336,8339,8342-8347,8350,8413-8414,8417,8420,8423,8429-8430,8436,8439,8454,8505,8520,8533,8599,8605,8614,8654,8657,8669,8674,8681,8684,8689,8695,8700,8724,8736-8739,8742,8746,8750,8759-8760,8765,8769-8772,8774-8779,8788,8791,8797-8798,8803,8814-8815,8818,8824,8826-8827,8829,8835,8837,8846-8847,8860-8861,8863-8864,8866-8868,8871,8874,8882,8884-8886,8888-8890,8892,8894,8898,8902-8903,8906-8907,8915-8919,8921,8925,8927-8932,8935,8946-8948,8950-8951,8964,8969-8972,8975-8978,8980,8983,8992-8993,8996,9000,9021-9025,9032,9037,9083,9087,9090-9091,9112-9113,9146-9149,9175-9177,9189,9208,9212,9229,9231,9233,9246-9247,9261,9263,9265,9309,9322,9324,9352,9467,9544,10039-10040,10086
/gfarm_v2/branches/2.5.7:6801,6804,6989,6998-6999,7572,7945,8115,10084-10085
-/gfarm_v2/branches/2.6:10222-10409,10411
+/gfarm_v2/branches/2.6:10222-10409,10411,10413
/gfarm_v2/branches/2.6.dirquota:10184-10409
/gfarm_v2/trunk:5598-5599,5616-5624,5626-5628,5641-5647,5650,5653,5657-5666,5669-5670,5673-5674,5683-5685,5693,5695-5696,5699,5704-5711,5717,5719-5720,5726-5727,5729-5730,5739,5746-5751,5775,5793,5799,5806,5808-5809,5815-5818,5821,5825,5827-5831,5839-5842,5844-5849,5851,5863-5864,5868,5870,5872-5878,5881,5884-5886,5889,5897,5913,5915,5924,5928,5930,5932,5934,5937,5942-5948,5959,5966-5972,5974-5975,5980,5994,5997-5998,6001-6007,6012-6013,6016,6019-6022,6024-6029,6031-6032,6034,6040,6042-6047,6053,6062-6063,6065,6067,6070,6073,6077-6079,6081,6083-6084,6086,6089,6091,6093,6095,6101,6103,6107-6108,6111,6115-6118,6120,6122,6129,6131-6137,6139,6141-6142,6144-6150,6152-6157,6159,6161,6166,6168,6173,6175,6177-6179,6181-6185,6188,6190-6193,6196,6214,6217-6218,6220-6223,6230-6232,6238-6239,6242,6247-6248,6250,6252,6255,6257-6258,6263,6265,6268,6271-6273,6276-6278,6282,6286-6287,6289,6292-6296,6298,6304-6306,6309-6310,6314-6315,6331-6333,6335,6340,6354,6361,6377,6380,6394-6397,6406,6413-6414,6420,6423-6427,6437,6448,6451-6452,6455,6458-6459,6469-6470,6476,6486,6553,6567,6571,6575,6577,6580-6581,6604,6614,6616,6630,6638,6645,6700,6741,6747,6754,6756,6758,6762,6764,6766,6768,6770,6778,6807,6810,6815,6823,6825,6836-6837,6839,6852,6854,6856,6865,6879,6926,6928,6939,6945-6946,6948-6952,6956,7008,7012,7015,7097,7099,7101,7103,7122,7167,7178,7181,7185,7200,7218-7222,7228-7229,7233,7236,7239,7242,7249,7529-7530,7532,7536,7566,7578,7597,7601,7659,7664,7666,7672,7674,7686,7697,7705,7709,7713,7721,7747,7751,7755,7758,7762-7763,7768,7775,7788,7798-7799,7801,7806,7827,7831,7836,7842,7847,7866,7878,7881,7884,7888,7892,7914,7916,7936,7967,7971,7979,7993,8001,8020,8024,8029,8046,8048,8141,8158,8240,8255,8380,8540,8567,8715,8728,8756,8782,8785,8936,8958,9014,9096-9097,9103,9106,9108,9139,9437,9452,9520,9810,9815,9820,9823,9827,9835,9837,9839,9845,9847,9849,9853,9857,9861,10035
\ No newline at end of property
Modified: gfarm_v2/branches/2.7/bench/gfcreate-test/gfcreate-test.c
===================================================================
--- gfarm_v2/branches/2.7/bench/gfcreate-test/gfcreate-test.c 2017-02-01 04:37:49 UTC (rev 10423)
+++ gfarm_v2/branches/2.7/bench/gfcreate-test/gfcreate-test.c 2017-02-04 11:43:13 UTC (rev 10424)
@@ -15,6 +15,7 @@
#include <gfarm/gfarm.h>
#include "gfarm_path.h"
+#include "gfs_pio.h" /* for gfs_pio_internal_set_view_section() */
char *program_name = "gfcreate-test";
@@ -25,6 +26,7 @@
#define DEFAULT_NUM_PARA 2
static int verbose = 0;
+static char *hostname = NULL;
#define VERBOSE(...) \
{ \
@@ -39,7 +41,8 @@
{
fprintf(stderr,
"Usage: %s [-v(verbose)] [-d num_dir(%d)] [-f num_file(%d)]\n"
- "\t[-s file_size(%lld)] [-p num_parallel(%d)] new_directory\n",
+ "\t[-s file_size(%lld)] [-p num_parallel(%d)] new_directory\n"
+ "\t[-h hostname] new_directory\n",
program_name, DEFAULT_NUM_DIR, DEFAULT_NUM_FILE, DEFAULT_NUM_SIZE,
DEFAULT_NUM_PARA);
}
@@ -50,7 +53,7 @@
GFS_File gf;
char buf[BUFSIZE];
int bufsize, sz;
- gfarm_error_t e;
+ gfarm_error_t e, e2;
e = gfs_pio_create(gfpath, GFARM_FILE_WRONLY,
0644 & GFARM_S_ALLPERM, &gf);
@@ -59,6 +62,21 @@
program_name, gfpath, gfarm_error_string(e));
return (e);
}
+ if (hostname != NULL) {
+ /* XXX FIXME: INTERNAL FUNCTION SHOULD NOT BE USED */
+ e = gfs_pio_internal_set_view_section(gf, hostname);
+ if (e != GFARM_ERR_NO_ERROR) {
+ fprintf(stderr,
+ "%s: gfs_pio_internal_set_view_section: %s\n",
+ gfpath, gfarm_error_string(e));
+ e2 = gfs_pio_close(gf);
+ if (e2 != GFARM_ERR_NO_ERROR)
+ fprintf(stderr, "%s: gfs_pio_close: %s\n",
+ program_name, gfarm_error_string(e2));
+ gfs_unlink(gfpath);
+ return (e);
+ }
+ }
memset(buf, 0, BUFSIZE);
while (size > 0) {
if (size >= BUFSIZE)
@@ -149,7 +167,7 @@
if (argc > 0)
program_name = basename(argv[0]);
- while ((c = getopt(argc, argv, "d:f:p:s:hv?")) != -1) {
+ while ((c = getopt(argc, argv, "d:f:p:s:h:v?")) != -1) {
switch (c) {
case 'd':
n_dir = atoi(optarg);
@@ -163,10 +181,12 @@
case 's':
size = atoll(optarg);
break;
+ case 'h':
+ hostname = optarg;
+ break;
case 'v':
verbose = 1;
break;
- case 'h':
case '?':
default:
usage();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|