benchmarks: refactoring + sync sftp tests

no surprise, sync sftp is much slower, even for localhost,
especially for download.

1 files changed, 26 insertions, 1 deletions

diff --git a/tests/benchmarks/benchmarks.h b/tests/benchmarks/benchmarks.h
index ffa1bfa..4aba143 100644
--- a/tests/benchmarks/benchmarks.h
+++ b/tests/benchmarks/benchmarks.h
@@ -32,18 +32,30 @@
 enum libssh_benchmarks {
     BENCHMARK_RAW_UPLOAD=0,
     BENCHMARK_RAW_DOWNLOAD,
+    BENCHMARK_SCP_UPLOAD,
+    BENCHMARK_SCP_DOWNLOAD,
+    BENCHMARK_SYNC_SFTP_UPLOAD,
+    BENCHMARK_SYNC_SFTP_DOWNLOAD,
     BENCHMARK_NUMBER
 };
 
 struct argument_s {
   const char *hosts[MAX_HOSTS_CONNECT];
-  char benchmarks[BENCHMARK_NUMBER];
   int verbose;
   int nhosts;
   int ntests;
   int data;
 };
 
+typedef int (*bench_fct)(ssh_session session, struct argument_s *args,
+    float *bps);
+
+struct benchmark {
+  const char *name;
+  bench_fct fct;
+  int enabled;
+};
+
 /* latency.c */
 
 struct timestamp_struct {
@@ -63,4 +75,17 @@ int benchmarks_raw_up (ssh_session session, struct argument_s *args,
 int benchmarks_raw_down (ssh_session session, struct argument_s *args,
     float *bps);
 
+/* bench_scp.c */
+
+int benchmarks_scp_up (ssh_session session, struct argument_s *args,
+    float *bps);
+int benchmarks_scp_down (ssh_session session, struct argument_s *args,
+    float *bps);
+
+/* bench_sftp.c */
+
+int benchmarks_sync_sftp_up (ssh_session session, struct argument_s *args,
+    float *bps);
+int benchmarks_sync_sftp_down (ssh_session session, struct argument_s *args,
+    float *bps);
 #endif /* BENCHMARKS_H_ */