3-clause license and changes to the benchmark by davide

svn:r85

test/bench.c

@@ -10,9 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Niels Provos.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
@@ -26,6 +23,14 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * Mon 03/10/2003 - Modified by Davide Libenzi <davidel@xmailserver.org>
+ *
+ *     Added chain event propagation to improve the sensitivity of
+ *     the measure respect to the event loop efficency.
+ *
+ *
  */
 
 #ifdef HAVE_CONFIG_H
@@ -47,49 +52,65 @@
 
 #include <event.h>
 
-static int count;
+
+static int count, writes, fired;
+static int *pipes;
+static int num_pipes, num_active, num_writes;
+static struct event *events;
+
+
 
 void
 read_cb(int fd, short which, void *arg)
 {
-	struct event *ev = arg;
+	int idx = (int) arg, widx = idx + 1;
 	u_char ch;
 
 	count += read(fd, &ch, sizeof(ch));
+	if (writes) {
+		if (widx >= num_pipes)
+			widx -= num_pipes;
+		write(pipes[2 * widx + 1], "e", 1);
+		writes--;
+		fired++;
+	}
 }
 
 struct timeval *
-run_once(struct event *events, int *pipes, int num_pipes, int num_active)
+run_once(void)
 {
 	int *cp, i, space;
 	static struct timeval ts, te;
 
 	for (cp = pipes, i = 0; i < num_pipes; i++, cp += 2) {
 		event_del(&events[i]);
-		event_set(&events[i], cp[0], EV_READ, read_cb, &events[i]);
+		event_set(&events[i], cp[0], EV_READ | EV_PERSIST, read_cb, (void *) i);
 		event_add(&events[i], NULL);
 	}
 
 	event_loop(EVLOOP_ONCE | EVLOOP_NONBLOCK);
 
+	fired = 0;
 	space = num_pipes / num_active;
 	space = space * 2;
-	for (i = 0; i < num_active; i++)
+	for (i = 0; i < num_active; i++, fired++)
 		write(pipes[i * space + 1], "e", 1);
 
 	count = 0;
-
+	writes = num_writes;
+	{ int xcount = 0;
 	gettimeofday(&ts, NULL);
-	event_loop(EVLOOP_ONCE);
+	do {
+		event_loop(EVLOOP_ONCE | EVLOOP_NONBLOCK);
+		xcount++;
+	} while (count != fired);
 	gettimeofday(&te, NULL);
 
-	timersub(&te, &ts, &te);
+	if (xcount != count) fprintf(stderr, "Xcount: %d, Rcount: %d\n", xcount, count);
-
-	if (count != num_active) {
-		fprintf(stderr, "Fired only %d of %d\n", count, num_active);
-		return (NULL);
 	}
 
+	timersub(&te, &ts, &te);
+
 	return (&te);
 }
 
@@ -97,16 +118,15 @@ int
 main (int argc, char **argv)
 {
 	struct rlimit rl;
-	int num_pipes, num_active, i;
+	int i, c;
-	struct event *events;
 	struct timeval *tv;
-	int *pipes, *cp;
+	int *cp;
 	extern char *optarg;
-	int c;
 
 	num_pipes = 100;
 	num_active = 1;
-	while ((c = getopt(argc, argv, "n:a:")) != -1) {
+	num_writes = num_pipes;
+	while ((c = getopt(argc, argv, "n:a:w:")) != -1) {
 		switch (c) {
 		case 'n':
 			num_pipes = atoi(optarg);
@@ -114,6 +134,9 @@ main (int argc, char **argv)
 		case 'a':
 			num_active = atoi(optarg);
 			break;
+		case 'w':
+			num_writes = atoi(optarg);
+			break;
 		default:
 			fprintf(stderr, "Illegal argument \"%c\"\n", c);
 			exit(1);
@@ -128,7 +151,7 @@ main (int argc, char **argv)
 
 	events = calloc(num_pipes, sizeof(struct event));
 	pipes = calloc(num_pipes * 2, sizeof(int));
-	if (events == NULL || pipe == NULL) {
+	if (events == NULL || pipes == NULL) {
 		perror("malloc");
 		exit(1);
 	}
@@ -136,14 +159,18 @@ main (int argc, char **argv)
 	event_init();
 
 	for (cp = pipes, i = 0; i < num_pipes; i++, cp += 2) {
+#ifdef USE_PIPES
 		if (pipe(cp) == -1) {
+#else
+		if (socketpair(AF_UNIX, SOCK_STREAM, 0, cp) == -1) {
+#endif
 			perror("pipe");
 			exit(1);
 		}
 	}
 
 	for (i = 0; i < 25; i++) {
-		tv = run_once(events, pipes, num_pipes, num_active);
+		tv = run_once();
 		if (tv == NULL)
 			exit(1);
 		fprintf(stdout, "%ld\n",
@@ -152,6 +179,3 @@ main (int argc, char **argv)
 
 	exit(0);
 }
-
-
-

test/regress.c

@@ -10,10 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
+ * 3. The name of the author may not be used to endorse or promote products
- *    must display the following acknowledgement:
- *      This product includes software developed by Niels Provos.
- * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR