Move CSA benchmark from tsdecrypt.c to csa.c

Makefile

@@ -36,6 +36,7 @@ TS_DIR = libtsfuncs
 TS_LIB = $(TS_DIR)/libtsfuncs.a
 
 tsdecrypt_SRC = data.c \
+ csa.c \
  udp.c \
  util.c \
  camd.c \

csa.c

@@ -0,0 +1,72 @@
+/*
+ * CSA functions
+ * Copyright (C) 2011-2012 Unix Solutions Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * 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 for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <inttypes.h>
+#include <sys/time.h>
+
+#include <dvbcsa/dvbcsa.h>
+
+#include "libfuncs/libfuncs.h"
+
+/* The following routine is taken from benchbitslice in libdvbcsa */
+void csa_benchmark(void) {
+	struct timeval t0, t1;
+	struct dvbcsa_bs_key_s *key = dvbcsa_bs_key_alloc();
+	unsigned int n, i, npackets = 0;
+	unsigned int batch_size = dvbcsa_bs_batch_size();
+	uint8_t data[batch_size + 1][188];
+	struct dvbcsa_bs_batch_s pcks[batch_size + 1];
+	uint8_t cw[8] = { 0x12, 0x34, 0x56, 0x78, 0x89, 0xab, 0xcd, 0xef, };
+
+	srand(time(0));
+	puts("Single threaded CSA decoding benchmark");
+
+	dvbcsa_bs_key_set (cw, key);
+
+	printf("Batch size %d packets.\n\n", batch_size);
+	for (i = 0; i < batch_size; i++) {
+		pcks[i].data = data[i];
+		pcks[i].len = 184;
+		memset(data[i], rand(), pcks[i].len);
+	}
+	pcks[i].data = NULL;
+
+	gettimeofday(&t0, NULL);
+	for (n = (1 << 12) / batch_size; n < (1 << 19) / batch_size; n *= 2) {
+		printf(" Decrypting %6u mpegts packets\r", n * batch_size);
+		fflush(stdout);
+		for (i = 0; i < n; i++) {
+			dvbcsa_bs_decrypt(key, pcks, 184);
+		}
+		npackets += n * batch_size;
+	}
+	gettimeofday(&t1, NULL);
+
+	unsigned long long usec = timeval_diff_usec(&t0, &t1);
+	printf("DONE: %u packets (%u bytes) decrypted in %llu ms = %.1f Mbits/s\n\n",
+		npackets,
+		npackets * 188,
+		usec / 1000,
+		(double)(npackets * 188 * 8) / (double)usec
+	);
+
+	dvbcsa_bs_key_free(key);
+}

csa.h

@@ -0,0 +1,23 @@
+/*
+ * CSA functions
+ * Copyright (C) 2012 Unix Solutions Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * 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 for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ */
+#ifndef CSA_H
+#define CSA_H
+
+void csa_benchmark(void);
+
+#endif

tsdecrypt.c

@@ -27,13 +27,13 @@
 #include <syslog.h>
 #include <sys/resource.h>
 
-#include <dvbcsa/dvbcsa.h>
 #include <openssl/rand.h>
 
 #include "libfuncs/libfuncs.h"
 
 #include "data.h"
 #include "util.h"
+#include "csa.h"
 #include "camd.h"
 #include "process.h"
 #include "udp.h"
@@ -69,51 +69,6 @@ static void LOG_func(const char *msg) {
 		LOG(msg);
 }
 
-/* The following routine is taken from benchbitslice in libdvbcsa */
-void run_benchmark(void) {
-	struct timeval t0, t1;
-	struct dvbcsa_bs_key_s *ffkey = dvbcsa_bs_key_alloc();
-	unsigned int n, i, c = 0, pkt_len = 0;
-	unsigned int gs = dvbcsa_bs_batch_size();
-	uint8_t data[gs + 1][184];
-	struct dvbcsa_bs_batch_s pcks[gs + 1];
-	uint8_t cw[8] = { 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, };
-
-	srand(time(0));
-
-	puts("* Single threaded libdvbcsa benchmark *");
-
-	dvbcsa_bs_key_set (cw, ffkey);
-
-	printf(" - Generating batch with %i randomly sized packets\n\n", gs);
-	for (i = 0; i < gs; i++) {
-		pcks[i].data = data[i];
-		pcks[i].len = 100 + rand() % 85;
-		memset(data[i], rand(), pcks[i].len);
-		pkt_len += pcks[i].len;
-	}
-	pcks[i].data = NULL;
-
-	gettimeofday(&t0, NULL);
-	for (n = (1 << 12) / gs; n < (1 << 19) / gs; n *= 2) {
-		printf(" - Decrypting %u TS packets\n", n * gs);
-		for (i = 0; i < n; i++) {
-			dvbcsa_bs_decrypt(ffkey, pcks, 184);
-		}
-		c += n * gs;
-	}
-	gettimeofday(&t1, NULL);
-
-	printf("\n* %u packets proceded: %.1f Mbits/s\n\n", c,
-		(float)(c * 188 * 8) / (float)timeval_diff_usec(&t0, &t1)
-		/*(float)((t1.tv_sec * 1000000 + t1.tv_usec) - (t0.tv_sec * 1000000 + t0.tv_usec)) */
-	);
-
-	dvbcsa_bs_key_free(ffkey);
-
-	puts("* Done *");
-}
-
 static const char short_options[] = "i:d:N:Sl:L:F:I:RzM:T:W:O:o:t:rk:g:pwxyc:C:Y:A:s:U:P:B:eZ:Ef:X:H:G:KJ:D:jbhV";
 
 // Unused short options: Qamnquv0123456789
@@ -497,7 +452,7 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 				ts->pid_report = 1;
 				break;
 			case 'b': // --bench
-				run_benchmark();
+				csa_benchmark();
 				exit(EXIT_SUCCESS);
 
 			case 'h': // --help