[pisa-src] r1846 - in trunk: libpisa/global.h pisacd/cdmain.c pisasd/sdmain.c
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Fri, 27 Nov 2009 11:25:56 +0100
Author: biurrun
Date: Fri Nov 27 11:25:55 2009
New Revision: 1846
Log:
Move common POLL_ definitions to libpisa/global.h.
Modified:
trunk/libpisa/global.h
trunk/pisacd/cdmain.c
trunk/pisasd/sdmain.c
Modified: trunk/libpisa/global.h
==============================================================================
--- trunk/libpisa/global.h Fri Nov 27 10:59:10 2009 (r1845)
+++ trunk/libpisa/global.h Fri Nov 27 11:25:55 2009 (r1846)
@@ -138,6 +138,13 @@
#define DEFAULT_CONFIG_DIR_MODE 0755
+#define POLL_CTL 0
+#define POLL_DATA 1
+#define POLL_TUN 2
+#define POLL_CONF 3
+#define POLL_SCHED 4
+#define POLL_FD_COUNT 5
+
/* FIXME: The entire certificate string should be 1760 bytes, i.e.,
* = public key(768 bytes) + certificate(224 bytes) + signature(768 bytes)
*
Modified: trunk/pisacd/cdmain.c
==============================================================================
--- trunk/pisacd/cdmain.c Fri Nov 27 10:59:10 2009 (r1845)
+++ trunk/pisacd/cdmain.c Fri Nov 27 11:25:55 2009 (r1846)
@@ -39,14 +39,6 @@
#include "performance/pisaperf.h"
-/* fd indexing the the pollfd array */
-#define POLL_TUN 0
-#define POLL_CTL 1
-#define POLL_DATA 2
-#define POLL_CONF 3
-#define POLL_SCHED 4
-#define POLL_FD_COUNT 5
-
/* TODO: ugly interface relying of global variables in libpisa */
extern pisa_conf_handle_func_set conf_handle_func_set;
extern int pisa_conf_dst_port;
Modified: trunk/pisasd/sdmain.c
==============================================================================
--- trunk/pisasd/sdmain.c Fri Nov 27 10:59:10 2009 (r1845)
+++ trunk/pisasd/sdmain.c Fri Nov 27 11:25:55 2009 (r1846)
@@ -42,14 +42,6 @@
#include "performance/pisaperf.h"
-/* fd indexed in the pollfd array */
-#define POLL_CTL 0
-#define POLL_DATA 1
-#define POLL_TUN 2
-#define POLL_CONF 3
-#define POLL_SCHED 4
-#define POLL_FD_COUNT 5
-
#define OPTS "f:i:p:q:a:bdvh"
Other related posts:
- » [pisa-src] r1846 - in trunk: libpisa/global.h pisacd/cdmain.c pisasd/sdmain.c - Diego Biurrun
