-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path3.3.0..d3574d536643475269d37211e283b49ebd6732d7.patch
19644 lines (18538 loc) · 788 KB
/
3.3.0..d3574d536643475269d37211e283b49ebd6732d7.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff --git a/META b/META
index 0ba3315..4e3ed35 100755
--- a/META
+++ b/META
@@ -1,3 +1,3 @@
Package: ior
-Version: 3.3.0
+Version: 3.4.0+dev
Release: 0
diff --git a/Makefile.am b/Makefile.am
index d874a90..d6465a8 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,4 +10,5 @@ ACLOCAL_AMFLAGS = -I config
# `make dist` and `make test` for simple test binaries that do not require any
# special environment.
#TESTS = testing/basic-tests.sh
-#DISTCLEANFILES = -r test test_out
+
+DISTCLEANFILES = ./src/build.conf
diff --git a/NEWS b/NEWS
index 3e370d8..00b98ff 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+Version 3.4.0+dev
+--------------------------------------------------------------------------------
+
+New major features:
+
+New minor features:
+
+Bugfixes:
+
+
Version 3.3.0
--------------------------------------------------------------------------------
@@ -101,7 +111,7 @@ Known issues:
because `-u`/`-c`/`-p` cannot be specified (issue #98)
- `writeCheck` cannot be enabled for write-only tests using some AIORIs such as
MPI-IO (pull request #89)
-
+
Version 3.0.2
--------------------------------------------------------------------------------
@@ -129,7 +139,7 @@ Version 2.10.3
Contributed by [email protected]
- Ported to Windows. Required changes related to 'long' types, which on Windows
are always 32-bits, even on 64-bit systems. Missing system headers and
- functions acount for most of the remaining changes.
+ functions account for most of the remaining changes.
New files for Windows:
- IOR/ior.vcproj - Visual C project file
- IOR/src/C/win/getopt.{h,c} - GNU getopt() support
@@ -189,7 +199,7 @@ Version 2.9.5
- Added notification for "Using reorderTasks '-C' (expecting block, not cyclic,
task assignment)"
- Corrected bug with read performance with stonewalling (was using full size,
- stat'ed file instead of bytes transfered).
+ stat'ed file instead of bytes transferred).
Version 2.9.4
--------------------------------------------------------------------------------
diff --git a/README.md b/README.md
index c1c73a8..081752b 100755
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-# HPC IO Benchmark Repository [](https://travis-ci.org/hpc/ior)
+# HPC IO Benchmark Repository [](https://travis-ci.org/hpc/ior)
This repository contains the IOR and mdtest parallel I/O benchmarks. The
-[official IOR/mdtest documention][] can be found in the `docs/` subdirectory or
-on Read the Docs.
+[official IOR/mdtest documentation][] can be found in the `docs/` subdirectory
+or on Read the Docs.
## Building
@@ -28,4 +28,4 @@ on Read the Docs.
distributions at once.
[official IOR release]: https://github.com/hpc/ior/releases
-[official IOR/mdtest documention]: http://ior.readthedocs.org/
+[official IOR/mdtest documentation]: http://ior.readthedocs.org/
diff --git a/configure.ac b/configure.ac
index b34f819..6cd1d7b 100755
--- a/configure.ac
+++ b/configure.ac
@@ -70,9 +70,57 @@ AS_IF([test "$ac_cv_header_gpfs_h" = "yes" -o "$ac_cv_header_gpfs_fcntl_h" = "ye
AC_SEARCH_LIBS([gpfs_fcntl], [gpfs], [],
[AC_MSG_ERROR([Library containing gpfs_fcntl symbols not found])
])
+ AC_CHECK_TYPES([gpfsFineGrainWriteSharing_t], [], [], [[#include <gpfs_fcntl.h>]])
])
])
+# Check for CUDA
+AC_ARG_WITH([cuda],
+ [AS_HELP_STRING([--with-cuda],
+ [support configurable CUDA @<:@default=check@:>@])],
+ [], [with_cuda=check])
+
+AS_IF([test "x$with_cuda" != xno], [
+ LDFLAGS="$LDFLAGS -L$with_cuda/lib64 -Wl,--enable-new-dtags -Wl,-rpath=$with_cuda/lib64"
+ CPPFLAGS="$CPPFLAGS -I$with_cuda/include"
+
+ AC_CHECK_HEADERS([cuda_runtime.h], [AC_DEFINE([HAVE_CUDA], [], [CUDA GPU API found])], [
+ if test "x$with_cuda" != xcheck; then
+ AC_MSG_FAILURE([--with-cuda was given, <cuda_runtime.h> not found])
+ fi
+ ])
+AS_IF([test "$ac_cv_header_cuda_runtime_h" = "yes"], [
+ AC_SEARCH_LIBS([cudaMalloc], [cudart cudart_static], [],
+ [AC_MSG_ERROR([Library containing cudaMalloc symbol not found])])
+ ])
+])
+AM_CONDITIONAL([HAVE_CUDA], [test x$with_cuda = xyes])
+AM_COND_IF([HAVE_CUDA],[AC_DEFINE([HAVE_CUDA], [], [CUDA GPU API found])])
+
+# Check for GPUDirect
+AC_ARG_WITH([gpuDirect],
+ [AS_HELP_STRING([--with-gpuDirect],
+ [support configurable GPUDirect @<:@default=check@:>@])],
+ [], [with_gpuDirect=check])
+
+AS_IF([test "x$with_gpuDirect" != xno], [
+ LDFLAGS="$LDFLAGS -L$with_gpuDirect/lib64 -Wl,--enable-new-dtags -Wl,-rpath=$with_gpuDirect/lib64"
+ CPPFLAGS="$CPPFLAGS -I$with_gpuDirect/include"
+
+ AC_CHECK_HEADERS([cufile.h], [AC_DEFINE([HAVE_GPU_DIRECT], [], [GPUDirect API found])], [
+ if test "x$with_gpuDirect" != xcheck; then
+ AC_MSG_FAILURE([--with-gpuDirect was given, <cufile.h> not found])
+ fi
+ ])
+AS_IF([test "$ac_cv_header_cufile_h" = "yes"], [
+ AC_SEARCH_LIBS([cuFileDriverOpen], [cufile], [],
+ [AC_MSG_ERROR([Library containing cuFileDriverOpen symbol not found])])
+ ])
+])
+AM_CONDITIONAL([HAVE_GPU_DIRECT], [test x$with_gpuDirect = xyes])
+AM_COND_IF([HAVE_GPU_DIRECT],[AC_DEFINE([HAVE_GPU_DIRECT], [], [GPUDirect API found])])
+
+
# Check for system capabilities
AC_SYS_LARGEFILE
@@ -84,7 +132,8 @@ AC_ARG_WITH([lustre],
[support configurable Lustre striping values @<:@default=check@:>@])],
[], [with_lustre=check])
AS_IF([test "x$with_lustre" = xyes ], [
- AC_CHECK_HEADERS([linux/lustre/lustre_user.h lustre/lustre_user.h], break, [
+ AC_CHECK_HEADERS([linux/lustre/lustre_user.h lustre/lustre_user.h],
+ [AC_DEFINE([HAVE_LUSTRE_USER], [], [Lustre user API available in some shape or form])], [
if test "x$with_lustre" != xcheck -a \
"x$ac_cv_header_linux_lustre_lustre_user_h" = "xno" -a \
"x$ac_cv_header_lustre_lustre_user_h" = "xno" ; then
@@ -160,8 +209,10 @@ AC_ARG_WITH([ncmpi],
[],
[with_ncmpi=no])
AM_CONDITIONAL([USE_NCMPI_AIORI], [test x$with_ncmpi = xyes])
-AM_COND_IF([USE_NCMPI_AIORI],[
- AC_DEFINE([USE_NCMPI_AIORI], [], [Build NCMPI backend AIORI])
+AS_IF([test "x$with_ncmpi" = xyes ], [
+ AC_CHECK_HEADERS([pnetcdf.h], [AC_DEFINE([USE_NCMPI_AIORI], [], [PNetCDF available])], [
+ AC_MSG_FAILURE([--with-ncmpi was given but pnetcdf.h not found])
+ ])
])
# MMAP IO support
@@ -186,6 +237,34 @@ AM_COND_IF([USE_POSIX_AIORI],[
AC_DEFINE([USE_POSIX_AIORI], [], [Build POSIX backend AIORI])
])
+# PMDK IO support
+AC_ARG_WITH([pmdk],
+ [AS_HELP_STRING([--with-pmdk],
+ [support IO with PMDK backend @<:@default=no@:>@])],
+ [],
+ [with_pmdk=no])
+AM_CONDITIONAL([USE_PMDK_AIORI], [test x$with_pmdk = xyes])
+AS_IF([test "x$with_pmdk" != xno], [
+ AC_DEFINE([USE_PMDK_AIORI], [], [Build PMDK backend AIORI])
+ AC_CHECK_HEADERS(libpmem.h,, [unset PMDK])
+ AC_SEARCH_LIBS([pmem_map_file], [pmdk],
+ [AC_MSG_ERROR([Library containing pmdk symbols not found])])
+])
+
+# LINUX AIO support
+AC_ARG_WITH([aio],
+ [AS_HELP_STRING([--with-aio],
+ [support Linux AIO @<:@default=no@:>@])],
+ [],
+ [with_aio=no])
+AM_CONDITIONAL([USE_AIO_AIORI], [test x$with_aio = xyes])
+AS_IF([test "x$with_aio" != xno], [
+ AC_DEFINE([USE_AIO_AIORI], [], [Build AIO backend])
+ AC_CHECK_HEADERS(libaio.h,, [unset AIO])
+ AC_SEARCH_LIBS([aio], [io_setup], [AC_MSG_ERROR([Library containing AIO symbol io_setup not found])])
+])
+
+
# RADOS support
AC_ARG_WITH([rados],
[AS_HELP_STRING([--with-rados],
@@ -211,40 +290,25 @@ AM_COND_IF([USE_CEPHFS_AIORI],[
AC_DEFINE([USE_CEPHFS_AIORI], [], [Build CEPHFS backend AIORI])
])
-# DAOS Backends (DAOS and DFS) IO support require DAOS and CART/GURT
-AC_ARG_WITH([cart],
- [AS_HELP_STRING([--with-cart],
- [support IO with DAOS backends @<:@default=no@:>@])],
- [], [with_cart=no])
-
-AS_IF([test "x$with_cart" != xno], [
- CART="yes"
- LDFLAGS="$LDFLAGS -L$with_cart/lib64 -Wl,--enable-new-dtags -Wl,-rpath=$with_cart/lib64"
- LDFLAGS="$LDFLAGS -L$with_cart/lib -Wl,--enable-new-dtags -Wl,-rpath=$with_cart/lib"
- CPPFLAGS="$CPPFLAGS -I$with_cart/include/"
- AC_CHECK_HEADERS(gurt/common.h,, [unset CART])
- AC_CHECK_LIB([gurt], [d_hash_murmur64],, [unset CART])
-])
-
+# DAOS-FS Backend (DFS)
AC_ARG_WITH([daos],
[AS_HELP_STRING([--with-daos],
- [support IO with DAOS backends @<:@default=no@:>@])],
+ [support IO with DAOS backend @<:@default=no@:>@])],
[], [with_daos=no])
-
AS_IF([test "x$with_daos" != xno], [
DAOS="yes"
LDFLAGS="$LDFLAGS -L$with_daos/lib64 -Wl,--enable-new-dtags -Wl,-rpath=$with_daos/lib64"
CPPFLAGS="$CPPFLAGS -I$with_daos/include"
- AC_CHECK_HEADERS(daos_types.h,, [unset DAOS])
+ AC_CHECK_HEADERS(gurt/common.h,, [unset DAOS])
+ AC_CHECK_HEADERS(daos.h,, [unset DAOS])
+ AC_CHECK_LIB([gurt], [d_hash_murmur64],, [unset DAOS])
AC_CHECK_LIB([uuid], [uuid_generate],, [unset DAOS])
- AC_CHECK_LIB([daos_common], [daos_sgl_init],, [unset DAOS])
AC_CHECK_LIB([daos], [daos_init],, [unset DAOS])
AC_CHECK_LIB([dfs], [dfs_mkdir],, [unset DAOS])
])
-
AM_CONDITIONAL([USE_DAOS_AIORI], [test x$DAOS = xyes])
AM_COND_IF([USE_DAOS_AIORI],[
- AC_DEFINE([USE_DAOS_AIORI], [], [Build DAOS backends AIORI])
+ AC_DEFINE([USE_DAOS_AIORI], [], [Build DAOS-FS backend AIORI])
])
# Gfarm support
@@ -293,19 +357,54 @@ AM_COND_IF([AWS4C_DIR],[
])
+
+# Amazon S3 support using the libs3 API
+AC_ARG_WITH([S3-libs3],
+ [AS_HELP_STRING([--with-S3-libs3],
+ [support IO with Amazon libS3 @<:@default=no@:>@])],
+ [],
+ [with_S3_libs3=no])
+AM_CONDITIONAL([USE_S3_LIBS3_AIORI], [test x$with_S3_libs3 = xyes])
+AM_COND_IF([USE_S3_LIBS3_AIORI],[
+ AC_DEFINE([USE_S3_LIBS3_AIORI], [], [Build Amazon-S3 backend AIORI using libs3])
+])
+
+err=0
+AS_IF([test "x$with_S3_libs3" != xno], [
+ AC_MSG_NOTICE([beginning of S3-related checks])
+ ORIG_CPPFLAGS=$CPPFLAGS
+ ORIG_LDFLAGS=$LDFLAGS
+
+ AC_CHECK_HEADERS([libs3.h], [], [err=1])
+
+ # Autotools thinks searching for a library means I want it added to LIBS
+ ORIG_LIBS=$LIBS
+ AC_CHECK_LIB([s3], [S3_initialize], [], [err=1])
+ LIBS=$ORIG_LIBS
+
+ AC_MSG_NOTICE([end of S3-related checks])
+ if test "$err" == 1; then
+ AC_MSG_FAILURE([S3 support is missing. dnl Make sure you have access to libs3. dnl])
+ fi
+
+ # restore user's values
+ CPPFLAGS=$ORIG_CPPFLAGS
+ LDFLAGS=$ORIG_LDFLAGS
+])
+
# Amazon S3 support [see also: --with-aws4c]
-AC_ARG_WITH([S3],
- [AS_HELP_STRING([--with-S3],
+AC_ARG_WITH([S3-4c],
+ [AS_HELP_STRING([--with-S3-4c],
[support IO with Amazon S3 backend @<:@default=no@:>@])],
[],
- [with_S3=no])
-AM_CONDITIONAL([USE_S3_AIORI], [test x$with_S3 = xyes])
-AM_COND_IF([USE_S3_AIORI],[
- AC_DEFINE([USE_S3_AIORI], [], [Build Amazon-S3 backend AIORI])
+ [with_S3_4c=no])
+AM_CONDITIONAL([USE_S3_4C_AIORI], [test x$with_S3_4c = xyes])
+AM_COND_IF([USE_S3_4C_AIORI],[
+ AC_DEFINE([USE_S3_4C_AIORI], [], [Build Amazon-S3 backend AIORI using lib4c])
])
err=0
-AS_IF([test "x$with_S3" != xno], [
+AS_IF([test "x$with_S3_4c" != xno], [
AC_MSG_NOTICE([beginning of S3-related checks])
# save user's values, while we use AC_CHECK_HEADERS with $AWS4C_DIR
@@ -337,6 +436,30 @@ Consider --with-aws4c=, CPPFLAGS, LDFLAGS, etc])
LDFLAGS=$ORIG_LDFLAGS
])
+# Check for existence of the function to detect the CPU socket ID (for multi-socket systems)
+AC_COMPILE_IFELSE(
+ [AC_LANG_SOURCE([[
+ int main(){
+ unsigned long a,d,c;
+ __asm__ volatile("rdtscp" : "=a" (a), "=d" (d), "=c" (c));
+ return 0;
+ }
+ ]])],
+ AC_DEFINE([HAVE_RDTSCP_ASM], [], [Has ASM to detect CPU socket ID]))
+
+AC_COMPILE_IFELSE(
+ [AC_LANG_SOURCE([[
+ #define _GNU_SOURCE
+ #include <unistd.h>
+ #include <sys/syscall.h>
+ unsigned long GetProcessorAndCore(int *chip, int *core){
+ return syscall(SYS_getcpu, core, chip, NULL);
+ }
+ int main(){
+ }
+ ]])],
+ AC_DEFINE([HAVE_GETCPU_SYSCALL], [], [Has syscall to detect CPU socket ID]))
+
# Enable building "IOR", in all capitals
AC_ARG_ENABLE([caps],
diff --git a/doc/USER_GUIDE b/doc/USER_GUIDE
index 3d6b4e4..02f90cc 100755
--- a/doc/USER_GUIDE
+++ b/doc/USER_GUIDE
@@ -47,7 +47,7 @@ Two ways to run IOR:
E.g., to execute: IOR -W -f script
This defaults all tests in 'script' to use write data checking.
- * The Command line supports to specify additional parameters for the choosen API.
+ * The Command line supports to specify additional parameters for the chosen API.
For example, username and password for the storage.
Available options are listed in the help text after selecting the API when running with -h.
For example, 'IOR -a DUMMY -h' shows the supported options for the DUMMY backend.
@@ -89,7 +89,7 @@ These options are to be used on the command line. E.g., 'IOR -a POSIX -b 4K'.
-n noFill -- no fill in HDF5 file creation
-N N numTasks -- number of tasks that should participate in the test
-o S testFile -- full name for test
- -O S string of IOR directives (e.g. -O checkRead=1,lustreStripeCount=32)
+ -O S string of IOR directives (e.g. -O checkRead=1,GPUid=2)
-p preallocate -- preallocate file size
-P useSharedFilePointer -- use shared file pointer [not working]
-q quitOnError -- during file error-checking, abort on error
@@ -164,7 +164,7 @@ GENERAL:
* numTasks - number of tasks that should participate in the test
[0]
- NOTE: 0 denotes all tasks
+ NOTE: -1 denotes all tasks
* interTestDelay - this is the time in seconds to delay before
beginning a write or read in a series of tests [0]
@@ -347,28 +347,54 @@ MPIIO-, HDF5-, AND NCMPI-ONLY:
LUSTRE-SPECIFIC:
================
- * lustreStripeCount - set the lustre stripe count for the test file(s) [0]
+ * POSIX-ONLY:
+ * --posix.lustre.stripecount - set the Lustre stripe count for the test file(s) [0]
- * lustreStripeSize - set the lustre stripe size for the test file(s) [0]
+ * --posix.lustre.stripesize - set the Lustre stripe size for the test file(s) [0]
- * lustreStartOST - set the starting OST for the test file(s) [-1]
+ * --posix.lustre.startost - set the starting OST for the test file(s) [-1]
- * lustreIgnoreLocks - disable lustre range locking [0]
+ * --posix.lustre.ignorelocks - disable Lustre range locking [0]
-GPFS-SPECIFIC:
+ * MPIIO-, HDF5-, AND NCMPI-ONLY:
+ * ROMIO-based IO (see https://github.com/pmodels/mpich/blob/048879f1234419abb035aacbaf655880c8f77dba/src/mpi/romio/adio/ad_lustre/ad_lustre_open.c#L58):
+ * requires setting the environment variable ROMIO_FSTYPE_FORCE=LUSTRE: (or similar for specific MPIs) to enable ROMIO's Lustre ADIO
+
+ * IOR_HINT__MPI__striping_factor - set the Lustre stripe count for the test file(s) [-1]
+
+ * IOR_HINT__MPI__striping_unit - set the Lustre stripe size for the test file(s) [0]
+
+ * IOR_HINT__MPI__romio_lustre_start_iodevice - set the starting OST for the test file(s) [-1]
+
+ * OMPIO-based IO (see https://github.com/open-mpi/ompi/blob/6d237e85d730ed946c9f45fcd3e19b78a243203e/ompi/mca/fs/lustre/fs_lustre_component.c#L75)
+ * not setting either of the environment variables below causes a fatal "Floating point exception: Integer divide-by-zero" error
+
+ * execution with either of the environment variables causes this message "ior: setstripe error for 'testfile': stripe already set" which can safely be ignored as OMPIO tries to modify the stripe settings twice although the first time succeeds
+
+ * OMPI_MCA_fs_lustre_stripe_width / IOR_HINT__MPI__stripe_width - set the Lustre stripe count for the test file(s) [0]
+
+ * OMPI_MCA_fs_lustre_stripe_size / IOR_HINT__MPI__stripe_size - set the Lustre stripe size for the test file(s) [0]
+
+GPFS-SPECIFIC (POSIX-ONLY):
================
- * gpfsHintAccess - use gpfs_fcntl hints to pre-declare accesses
+ * --posix.gpfs.hintaccess - use gpfs_fcntl hints to pre-declare accesses
+
+ * --posix.gpfs.releasetoken - immediately after opening or creating file, release
+ all locks. Might help mitigate lock-revocation
+ traffic when many processes write/read to same file.
+
+ * --posix.gpfs.finegrainwritesharing - This hint optimizes the performance of small strided
+ writes to a shared file from a parallel application
- * gpfsReleaseToken - immediately after opening or creating file, release
- all locks. Might help mitigate lock-revocation
- traffic when many proceses write/read to same file.
+ * --posix.gpfs.finegrainreadsharing - This hint optimizes the performance of small strided
+ reads from a shared file from a parallel application
-BeeGFS-SPECIFIC (POSIX only):
+BeeGFS-SPECIFIC (POSIX-ONLY):
================
- * beegfsNumTargets - set the number of storage targets to use
+ * --posix.beegfs.NumTargets - set the number of storage targets to use
- * beegfsChunkSize - set the striping chunk size. Must be a power of two,
- and greater than 64kiB, (e.g.: 256k, 1M, ...)
+ * --posix.beegfs.ChunkSize - set the striping chunk size. Must be a power of two,
+ and greater than 64kiB, (e.g.: 256k, 1M, ...)
***********************
@@ -499,7 +525,7 @@ zip, gzip, and bzip.
3) bzip2: For bziped files a transfer size of 1k is insufficient (~50% compressed).
To avoid compression a transfer size of greater than the bzip block size is required
- (default = 900KB). I suggest a transfer size of greather than 1MB to avoid bzip2 compression.
+ (default = 900KB). I suggest a transfer size of greater than 1MB to avoid bzip2 compression.
Be aware of the block size your compression algorithm will look at, and adjust the transfer size
accordingly.
@@ -660,7 +686,7 @@ HOW DO I USE HINTS?
'setenv IOR_HINT__MPI__<hint> <value>'
-HOW DO I EXPLICITY SET THE FILE DATA SIGNATURE?
+HOW DO I EXPLICITLY SET THE FILE DATA SIGNATURE?
The data signature for a transfer contains the MPI task number, transfer-
buffer offset, and also timestamp for the start of iteration. As IOR works
diff --git a/doc/mdtest.1 b/doc/mdtest.1
index 3cfc082..27d4d7b 100644
--- a/doc/mdtest.1
+++ b/doc/mdtest.1
@@ -28,7 +28,7 @@ Use ``collective creates'', meaning task 0 does all the creates.
Only perform the create phase of the tests.
.TP
.I "-d" testdir[@testdir2]
-The directory in which the tests will run. For multiple pathes, must use fully-qualified pathnames.
+The directory in which the tests will run. For multiple paths, must use fully-qualified pathnames.
[default: working directory of mdtest].
.TP
.I "-D"
@@ -78,6 +78,9 @@ Stride # between neighbor tasks for file/dir stat, 0 = local
.I "-p" seconds
Pre-iteration delay (in seconds).
.TP
+.I "-P"
+Print both the file creation rate and the elapsed time.
+.TP
.I "-r"
Only perform the remove phase of the tests.
.TP
@@ -121,6 +124,19 @@ Set verbosity value
Set the number of Bytes to write to each file after it is created
[default: 0].
.TP
+.I "-W" seconds
+Specify the stonewall time in seconds. When the stonewall timer has elapsed,
+the rank with the highest number of creates sets
+.I number_of_items
+for the other ranks, so that all ranks create the same number of files.
+.TP
+.I "-x" filename
+Filename to use for stonewall synchronization between processes.
+.TP
+.I "Y"
+Call the sync command after each phase, which is included in the
+timing. Note that it causes all IO to be flushed from the nodes.
+.TP
.I "-z" tree_depth
The depth of the hierarchical directory tree [default: 0].
.SH EXAMPLES
diff --git a/src/Makefile.am b/src/Makefile.am
index 3786560..037433c 100755
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,20 +1,25 @@
SUBDIRS = . test
-bin_PROGRAMS = ior mdtest
+bin_PROGRAMS = ior mdtest md-workbench
if USE_CAPS
-bin_PROGRAMS += IOR MDTEST
+bin_PROGRAMS += IOR MDTEST MD-WORKBENCH
endif
-noinst_HEADERS = ior.h utilities.h parse_options.h aiori.h iordef.h ior-internal.h option.h mdtest.h
+noinst_HEADERS = ior.h utilities.h parse_options.h aiori.h iordef.h ior-internal.h option.h mdtest.h aiori-debug.h aiori-POSIX.h md-workbench.h
lib_LIBRARIES = libaiori.a
-libaiori_a_SOURCES = ior.c mdtest.c utilities.c parse_options.c ior-output.c option.c
+libaiori_a_SOURCES = ior.c mdtest.c utilities.c parse_options.c ior-output.c option.c md-workbench.c
extraSOURCES = aiori.c aiori-DUMMY.c
extraLDADD =
extraLDFLAGS =
extraCPPFLAGS =
+md_workbench_SOURCES = md-workbench-main.c
+md_workbench_LDFLAGS =
+md_workbench_LDADD = libaiori.a
+md_workbench_CPPFLAGS =
+
ior_SOURCES = ior-main.c
ior_LDFLAGS =
ior_LDADD = libaiori.a
@@ -36,6 +41,14 @@ extraLDFLAGS += -L/opt/hadoop-2.2.0/lib/native
extraLDADD += -lhdfs
endif
+if HAVE_CUDA
+extraLDADD += -lcudart
+endif
+
+if HAVE_GPU_DIRECT
+extraLDADD += -lcufile
+endif
+
if USE_HDF5_AIORI
extraSOURCES += aiori-HDF5.c
extraLDADD += -lhdf5 -lz
@@ -65,6 +78,16 @@ if USE_POSIX_AIORI
extraSOURCES += aiori-POSIX.c
endif
+if USE_AIO_AIORI
+extraSOURCES += aiori-aio.c
+extraLDADD += -laio
+endif
+
+if USE_PMDK_AIORI
+extraSOURCES += aiori-PMDK.c
+extraLDADD += -lpmem
+endif
+
if USE_RADOS_AIORI
extraSOURCES += aiori-RADOS.c
extraLDADD += -lrados
@@ -77,7 +100,8 @@ endif
if USE_DAOS_AIORI
-extraSOURCES += aiori-DAOS.c aiori-DFS.c
+extraSOURCES += aiori-DFS.c
+extraLDADD += -lgurt -ldaos_common -ldaos -ldfs -luuid
endif
if USE_GFARM_AIORI
@@ -85,8 +109,8 @@ extraSOURCES += aiori-Gfarm.c
extraLDADD += -lgfarm
endif
-if USE_S3_AIORI
-extraSOURCES += aiori-S3.c
+if USE_S3_4C_AIORI
+extraSOURCES += aiori-S3-4c.c
if AWS4C_DIR
extraCPPFLAGS += $(AWS4C_CPPFLAGS)
extraLDFLAGS += $(AWS4C_LDFLAGS)
@@ -95,6 +119,12 @@ extraLDADD += -lcurl
extraLDADD += -lxml2
extraLDADD += -laws4c
extraLDADD += -laws4c_extra
+extraLDADD += -lcrypto
+endif
+
+if USE_S3_LIBS3_AIORI
+extraSOURCES += aiori-S3-libs3.c
+extraLDADD += -ls3
endif
if WITH_LUSTRE
@@ -111,6 +141,16 @@ mdtest_LDFLAGS += $(extraLDFLAGS)
mdtest_LDADD += $(extraLDADD)
mdtest_CPPFLAGS += $(extraCPPFLAGS)
+md_workbench_SOURCES += $(extraSOURCES)
+md_workbench_LDFLAGS += $(extraLDFLAGS)
+md_workbench_LDADD += $(extraLDADD)
+md_workbench_CPPFLAGS += $(extraCPPFLAGS)
+
+MD_WORKBENCH_SOURCES = $(md_workbench_SOURCES)
+MD_WORKBENCH_LDFLAGS = $(md_workbench_LDFLAGS)
+MD_WORKBENCH_LDADD = $(md_workbench_LDADD)
+MD_WORKBENCH_CPPFLAGS = $(md_workbench_CPPFLAGS)
+
IOR_SOURCES = $(ior_SOURCES)
IOR_LDFLAGS = $(ior_LDFLAGS)
IOR_LDADD = $(ior_LDADD)
@@ -123,3 +163,10 @@ MDTEST_CPPFLAGS = $(mdtest_CPPFLAGS)
libaiori_a_SOURCES += $(extraSOURCES)
libaiori_a_CPPFLAGS = $(extraCPPFLAGS)
+
+# Generate a config file with the build flags to allow the reuse of library
+.PHONY: build.conf
+all-local: build.conf
+build.conf:
+ @echo LDFLAGS=$(LDFLAGS) $(extraLDFLAGS) $(extraLDADD) $(LIBS) > build.conf
+ @echo CFLAGS=$(CFLAGS) $(extraCPPFLAGS) >> build.conf
diff --git a/src/aiori-CEPHFS.c b/src/aiori-CEPHFS.c
index 27f12db..23cc56d 100755
--- a/src/aiori-CEPHFS.c
+++ b/src/aiori-CEPHFS.c
@@ -18,6 +18,7 @@
# include "config.h"
#endif
+#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/stat.h>
@@ -43,18 +44,24 @@ struct cephfs_options{
char * user;
char * conf;
char * prefix;
+ char * remote_prefix;
+ int olazy;
};
static struct cephfs_options o = {
.user = NULL,
.conf = NULL,
.prefix = NULL,
+ .remote_prefix = NULL,
+ .olazy = 0,
};
static option_help options [] = {
- {0, "cephfs.user", "Username for the ceph cluster", OPTION_REQUIRED_ARGUMENT, 's', & o.user},
- {0, "cephfs.conf", "Config file for the ceph cluster", OPTION_REQUIRED_ARGUMENT, 's', & o.conf},
- {0, "cephfs.prefix", "mount prefix", OPTION_OPTIONAL_ARGUMENT, 's', & o.prefix},
+ {0, "cephfs.user", "Username for the ceph cluster", OPTION_OPTIONAL_ARGUMENT, 's', & o.user},
+ {0, "cephfs.conf", "Config file for the ceph cluster", OPTION_OPTIONAL_ARGUMENT, 's', & o.conf},
+ {0, "cephfs.prefix", "Mount prefix", OPTION_OPTIONAL_ARGUMENT, 's', & o.prefix},
+ {0, "cephfs.remote_prefix", "Remote mount prefix", OPTION_OPTIONAL_ARGUMENT, 's', & o.remote_prefix},
+ {0, "cephfs.olazy", "Enable Lazy I/O", OPTION_FLAG, 'd', & o.olazy},
LAST_OPTION
};
@@ -63,22 +70,25 @@ static struct ceph_mount_info *cmount;
/**************************** P R O T O T Y P E S *****************************/
static void CEPHFS_Init();
static void CEPHFS_Final();
-static void *CEPHFS_Create(char *, IOR_param_t *);
-static void *CEPHFS_Open(char *, IOR_param_t *);
-static IOR_offset_t CEPHFS_Xfer(int, void *, IOR_size_t *,
- IOR_offset_t, IOR_param_t *);
-static void CEPHFS_Close(void *, IOR_param_t *);
-static void CEPHFS_Delete(char *, IOR_param_t *);
-static void CEPHFS_Fsync(void *, IOR_param_t *);
-static IOR_offset_t CEPHFS_GetFileSize(IOR_param_t *, MPI_Comm, char *);
-static int CEPHFS_StatFS(const char *, ior_aiori_statfs_t *, IOR_param_t *);
-static int CEPHFS_MkDir(const char *, mode_t, IOR_param_t *);
-static int CEPHFS_RmDir(const char *, IOR_param_t *);
-static int CEPHFS_Access(const char *, int, IOR_param_t *);
-static int CEPHFS_Stat(const char *, struct stat *, IOR_param_t *);
-static void CEPHFS_Sync(IOR_param_t *);
+void CEPHFS_xfer_hints(aiori_xfer_hint_t * params);
+static aiori_fd_t *CEPHFS_Create(char *path, int flags, aiori_mod_opt_t *options);
+static aiori_fd_t *CEPHFS_Open(char *path, int flags, aiori_mod_opt_t *options);
+static IOR_offset_t CEPHFS_Xfer(int access, aiori_fd_t *file, IOR_size_t *buffer,
+ IOR_offset_t length, IOR_offset_t offset, aiori_mod_opt_t *options);
+static void CEPHFS_Close(aiori_fd_t *, aiori_mod_opt_t *);
+static void CEPHFS_Delete(char *path, aiori_mod_opt_t *);
+static void CEPHFS_Fsync(aiori_fd_t *, aiori_mod_opt_t *);
+static IOR_offset_t CEPHFS_GetFileSize(aiori_mod_opt_t *, char *);
+static int CEPHFS_StatFS(const char *path, ior_aiori_statfs_t *stat, aiori_mod_opt_t *options);
+static int CEPHFS_MkDir(const char *path, mode_t mode, aiori_mod_opt_t *options);
+static int CEPHFS_RmDir(const char *path, aiori_mod_opt_t *options);
+static int CEPHFS_Access(const char *path, int mode, aiori_mod_opt_t *options);
+static int CEPHFS_Stat(const char *path, struct stat *buf, aiori_mod_opt_t *options);
+static void CEPHFS_Sync(aiori_mod_opt_t *);
static option_help * CEPHFS_options();
+static aiori_xfer_hint_t * hints = NULL;
+
/************************** D E C L A R A T I O N S ***************************/
ior_aiori_t cephfs_aiori = {
.name = "CEPHFS",
@@ -90,7 +100,9 @@ ior_aiori_t cephfs_aiori = {
.xfer = CEPHFS_Xfer,
.close = CEPHFS_Close,
.delete = CEPHFS_Delete,
+ .get_options = CEPHFS_options,
.get_version = aiori_get_version,
+ .xfer_hints = CEPHFS_xfer_hints,
.fsync = CEPHFS_Fsync,
.get_file_size = CEPHFS_GetFileSize,
.statfs = CEPHFS_StatFS,
@@ -99,7 +111,6 @@ ior_aiori_t cephfs_aiori = {
.access = CEPHFS_Access,
.stat = CEPHFS_Stat,
.sync = CEPHFS_Sync,
- .get_options = CEPHFS_options,
};
#define CEPHFS_ERR(__err_str, __ret) do { \
@@ -108,6 +119,12 @@ ior_aiori_t cephfs_aiori = {
} while(0)
/***************************** F U N C T I O N S ******************************/
+
+void CEPHFS_xfer_hints(aiori_xfer_hint_t * params)
+{
+ hints = params;
+}
+
static const char* pfix(const char* path) {
const char* npath = path;
const char* prefix = o.prefix;
@@ -125,11 +142,16 @@ static option_help * CEPHFS_options(){
static void CEPHFS_Init()
{
+ char *remote_prefix = "/";
+
/* Short circuit if the options haven't been filled yet. */
if (!o.user || !o.conf || !o.prefix) {
WARN("CEPHFS_Init() called before options have been populated!");
return;
}
+ if (o.remote_prefix != NULL) {
+ remote_prefix = o.remote_prefix;
+ }
/* Short circuit if the mount handle already exists */
if (cmount) {
@@ -150,7 +172,7 @@ static void CEPHFS_Init()
}
/* mount the handle */
- ret = ceph_mount(cmount, "/");
+ ret = ceph_mount(cmount, remote_prefix);
if (ret) {
CEPHFS_ERR("unable to mount cephfs", ret);
ceph_shutdown(cmount);
@@ -184,55 +206,61 @@ static void CEPHFS_Final()
cmount = NULL;
}
-static void *CEPHFS_Create(char *testFileName, IOR_param_t * param)
+static aiori_fd_t *CEPHFS_Create(char *path, int flags, aiori_mod_opt_t *options)
{
- return CEPHFS_Open(testFileName, param);
+ return CEPHFS_Open(path, flags | IOR_CREAT, options);
}
-static void *CEPHFS_Open(char *testFileName, IOR_param_t * param)
+static aiori_fd_t *CEPHFS_Open(char *path, int flags, aiori_mod_opt_t *options)
{
- const char *file = pfix(testFileName);
+ const char *file = pfix(path);
int* fd;
fd = (int *)malloc(sizeof(int));
mode_t mode = 0664;
- int flags = (int) 0;
+ int ceph_flags = (int) 0;
/* set IOR file flags to CephFS flags */
/* -- file open flags -- */
- if (param->openFlags & IOR_RDONLY) {
- flags |= CEPH_O_RDONLY;
+ if (flags & IOR_RDONLY) {
+ ceph_flags |= CEPH_O_RDONLY;
}
- if (param->openFlags & IOR_WRONLY) {
- flags |= CEPH_O_WRONLY;
+ if (flags & IOR_WRONLY) {
+ ceph_flags |= CEPH_O_WRONLY;
}
- if (param->openFlags & IOR_RDWR) {
- flags |= CEPH_O_RDWR;
+ if (flags & IOR_RDWR) {
+ ceph_flags |= CEPH_O_RDWR;
}
- if (param->openFlags & IOR_APPEND) {
- fprintf(stdout, "File append not implemented in CephFS\n");
+ if (flags & IOR_APPEND) {
+ CEPHFS_ERR("File append not implemented in CephFS", EINVAL);
}
- if (param->openFlags & IOR_CREAT) {
- flags |= CEPH_O_CREAT;
+ if (flags & IOR_CREAT) {
+ ceph_flags |= CEPH_O_CREAT;
}
- if (param->openFlags & IOR_EXCL) {
- flags |= CEPH_O_EXCL;
+ if (flags & IOR_EXCL) {
+ ceph_flags |= CEPH_O_EXCL;
}
- if (param->openFlags & IOR_TRUNC) {
- flags |= CEPH_O_TRUNC;
+ if (flags & IOR_TRUNC) {
+ ceph_flags |= CEPH_O_TRUNC;
}
- if (param->openFlags & IOR_DIRECT) {
- fprintf(stdout, "O_DIRECT not implemented in CephFS\n");
+ if (flags & IOR_DIRECT) {
+ CEPHFS_ERR("O_DIRECT not implemented in CephFS", EINVAL);
}
- *fd = ceph_open(cmount, file, flags, mode);
+ *fd = ceph_open(cmount, file, ceph_flags, mode);
if (*fd < 0) {
CEPHFS_ERR("ceph_open failed", *fd);
}
+ if (o.olazy == TRUE) {
+ int ret = ceph_lazyio(cmount, *fd, 1);
+ if (ret != 0) {
+ WARN("Error enabling lazy mode");
+ }
+ }
return (void *) fd;
}
-static IOR_offset_t CEPHFS_Xfer(int access, void *file, IOR_size_t * buffer,
- IOR_offset_t length, IOR_param_t * param)
+static IOR_offset_t CEPHFS_Xfer(int access, aiori_fd_t *file, IOR_size_t *buffer,
+ IOR_offset_t length, IOR_offset_t offset, aiori_mod_opt_t *options)
{
uint64_t size = (uint64_t) length;
char *buf = (char *) buffer;
@@ -241,19 +269,19 @@ static IOR_offset_t CEPHFS_Xfer(int access, void *file, IOR_size_t * buffer,
if (access == WRITE)
{
- ret = ceph_write(cmount, fd, buf, size, param->offset);
+ ret = ceph_write(cmount, fd, buf, size, offset);
if (ret < 0) {
CEPHFS_ERR("unable to write file to CephFS", ret);
} else if (ret < size) {
CEPHFS_ERR("short write to CephFS", ret);
}
- if (param->fsyncPerWrite == TRUE) {
- CEPHFS_Fsync(&fd, param);
+ if (hints->fsyncPerWrite == TRUE) {
+ CEPHFS_Fsync(file, options);
}
}
else /* READ */
{
- ret = ceph_read(cmount, fd, buf, size, param->offset);
+ ret = ceph_read(cmount, fd, buf, size, offset);
if (ret < 0) {
CEPHFS_ERR("unable to read file from CephFS", ret);
} else if (ret < size) {
@@ -264,7 +292,7 @@ static IOR_offset_t CEPHFS_Xfer(int access, void *file, IOR_size_t * buffer,
return length;
}
-static void CEPHFS_Fsync(void *file, IOR_param_t * param)
+static void CEPHFS_Fsync(aiori_fd_t *file, aiori_mod_opt_t *options)
{
int fd = *(int *) file;
int ret = ceph_fsync(cmount, fd, 0);
@@ -273,7 +301,7 @@ static void CEPHFS_Fsync(void *file, IOR_param_t * param)
}
}
-static void CEPHFS_Close(void *file, IOR_param_t * param)
+static void CEPHFS_Close(aiori_fd_t *file, aiori_mod_opt_t *options)
{
int fd = *(int *) file;
int ret = ceph_close(cmount, fd);
@@ -284,28 +312,27 @@ static void CEPHFS_Close(void *file, IOR_param_t * param)
return;
}
-static void CEPHFS_Delete(char *testFileName, IOR_param_t * param)
+static void CEPHFS_Delete(char *path, aiori_mod_opt_t *options)
{
- int ret = ceph_unlink(cmount, pfix(testFileName));
+ int ret = ceph_unlink(cmount, pfix(path));
if (ret < 0) {
CEPHFS_ERR("ceph_unlink failed", ret);
}
return;
}
-static IOR_offset_t CEPHFS_GetFileSize(IOR_param_t * param, MPI_Comm testComm,
- char *testFileName)
+static IOR_offset_t CEPHFS_GetFileSize(aiori_mod_opt_t *options, char *path)
{
struct stat stat_buf;
IOR_offset_t aggFileSizeFromStat, tmpMin, tmpMax, tmpSum;
- int ret = ceph_stat(cmount, pfix(testFileName), &stat_buf);
+ int ret = ceph_stat(cmount, pfix(path), &stat_buf);
if (ret < 0) {
CEPHFS_ERR("ceph_stat failed", ret);
}
aggFileSizeFromStat = stat_buf.st_size;
- if (param->filePerProc == TRUE) {
+ if (hints->filePerProc == TRUE) {
MPI_CHECK(MPI_Allreduce(&aggFileSizeFromStat, &tmpSum, 1,
MPI_LONG_LONG_INT, MPI_SUM, testComm),
"cannot total data moved");
@@ -327,11 +354,9 @@ static IOR_offset_t CEPHFS_GetFileSize(IOR_param_t * param, MPI_Comm testComm,
}
return (aggFileSizeFromStat);
-
}
-static int CEPHFS_StatFS(const char *path, ior_aiori_statfs_t *stat_buf,
- IOR_param_t *param)
+static int CEPHFS_StatFS(const char *path, ior_aiori_statfs_t *stat_buf, aiori_mod_opt_t *options)
{
#if defined(HAVE_STATVFS)
struct statvfs statfs_buf;
@@ -354,28 +379,28 @@ static int CEPHFS_StatFS(const char *path, ior_aiori_statfs_t *stat_buf,
#endif
}
-static int CEPHFS_MkDir(const char *path, mode_t mode, IOR_param_t *param)
+static int CEPHFS_MkDir(const char *path, mode_t mode, aiori_mod_opt_t *options)
{
return ceph_mkdir(cmount, pfix(path), mode);
}
-static int CEPHFS_RmDir(const char *path, IOR_param_t *param)
+static int CEPHFS_RmDir(const char *path, aiori_mod_opt_t *options)
{
return ceph_rmdir(cmount, pfix(path));
}
-static int CEPHFS_Access(const char *testFileName, int mode, IOR_param_t *param)
+static int CEPHFS_Access(const char *path, int mode, aiori_mod_opt_t *options)
{
struct stat buf;
- return ceph_stat(cmount, pfix(testFileName), &buf);
+ return ceph_stat(cmount, pfix(path), &buf);
}
-static int CEPHFS_Stat(const char *testFileName, struct stat *buf, IOR_param_t *param)
+static int CEPHFS_Stat(const char *path, struct stat *buf, aiori_mod_opt_t *options)
{
- return ceph_stat(cmount, pfix(testFileName), buf);
+ return ceph_stat(cmount, pfix(path), buf);
}
-static void CEPHFS_Sync(IOR_param_t *param)
+static void CEPHFS_Sync(aiori_mod_opt_t *options)
{
int ret = ceph_sync_fs(cmount);
if (ret < 0) {
diff --git a/src/aiori-DAOS.c b/src/aiori-DAOS.c
deleted file mode 100644
index 8fa1578..0000000
--- a/src/aiori-DAOS.c
+++ /dev/null
@@ -1,542 +0,0 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- */
-/*
- * Copyright (C) 2018-2020 Intel Corporation
- * See the file COPYRIGHT for a complete copyright notice and license.
- */
-
-/*
- * This file implements the abstract I/O interface for DAOS Array API.
- */