[asterisk-commits] russell: trunk r178022 - in /trunk: main/sched.c tests/test_sched.c

[SVN commits to the Asterisk project]

Author: russell
Date: Mon Feb 23 11:29:16 2009
New Revision: 178022

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=178022
Log:
Fix a regression in scheduler entry ordering, and add a regression test for it.

(closes issue #14522)
Reported by: pj
Tested by: russell

Modified:
    trunk/main/sched.c
    trunk/tests/test_sched.c

Modified: trunk/main/sched.c
URL: http://svn.digium.com/svn-view/asterisk/trunk/main/sched.c?view=diff&rev=178022&r1=178021&r2=178022
==============================================================================
--- trunk/main/sched.c (original)
+++ trunk/main/sched.c Mon Feb 23 11:29:16 2009
@@ -233,7 +233,7 @@
 
 static int sched_time_cmp(void *a, void *b)
 {
-	return ast_tvcmp(((struct sched *) a)->when, ((struct sched *) b)->when);
+	return ast_tvcmp(((struct sched *) b)->when, ((struct sched *) a)->when);
 }
 
 struct sched_context *sched_context_create(void)

Modified: trunk/tests/test_sched.c
URL: http://svn.digium.com/svn-view/asterisk/trunk/tests/test_sched.c?view=diff&rev=178022&r1=178021&r2=178022
==============================================================================
--- trunk/tests/test_sched.c (original)
+++ trunk/tests/test_sched.c Mon Feb 23 11:29:16 2009
@@ -42,13 +42,127 @@
 static char *handle_cli_sched_test(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
 {
 	struct sched_context *con;
+	char *res = CLI_FAILURE;
+	int id1, id2, id3, wait;
+
+	switch (cmd) {
+	case CLI_INIT:
+		e->command = "sched test";
+		e->usage = ""
+			"Usage: sched test\n"
+			"   Test scheduler entry ordering.\n"
+			"";
+		return NULL;
+	case CLI_GENERATE:
+		return NULL;
+	}
+
+	if (a->argc != e->args) {
+		return CLI_SHOWUSAGE;
+	}
+
+	ast_cli(a->fd, "Testing scheduler entry ordering ...\n");
+
+	if (!(con = sched_context_create())) {
+		ast_cli(a->fd, "Test failed - could not create scheduler context\n");
+		return CLI_FAILURE;
+	}
+
+	/* Add 3 scheduler entries, and then remove them, ensuring that the result
+	 * of ast_sched_wait() looks appropriate at each step along the way. */
+
+	if ((wait = ast_sched_wait(con)) != -1) {
+		ast_cli(a->fd, "ast_sched_wait() should have returned -1, returned '%d'\n",
+				wait);
+		goto return_cleanup;
+	}
+
+	if ((id1 = ast_sched_add(con, 100000, sched_cb, NULL)) == -1) {
+		ast_cli(a->fd, "Failed to add scheduler entry\n");
+		goto return_cleanup;
+	}
+
+	if ((wait = ast_sched_wait(con)) > 100000) {
+		ast_cli(a->fd, "ast_sched_wait() should have returned <= 100000, returned '%d'\n",
+				wait);
+		goto return_cleanup;
+	}
+
+	if ((id2 = ast_sched_add(con, 10000, sched_cb, NULL)) == -1) {
+		ast_cli(a->fd, "Failed to add scheduler entry\n");
+		goto return_cleanup;
+	}
+
+	if ((wait = ast_sched_wait(con)) > 10000) {
+		ast_cli(a->fd, "ast_sched_wait() should have returned <= 10000, returned '%d'\n",
+				wait);
+		goto return_cleanup;
+	}
+
+	if ((id3 = ast_sched_add(con, 1000, sched_cb, NULL)) == -1) {
+		ast_cli(a->fd, "Failed to add scheduler entry\n");
+		goto return_cleanup;
+	}
+
+	if ((wait = ast_sched_wait(con)) > 1000) {
+		ast_cli(a->fd, "ast_sched_wait() should have returned <= 1000, returned '%d'\n",
+				wait);
+		goto return_cleanup;
+	}
+
+	if (ast_sched_del(con, id3) == -1) {
+		ast_cli(a->fd, "Failed to remove scheduler entry\n");
+		goto return_cleanup;
+	}
+
+	if ((wait = ast_sched_wait(con)) <= 1000) {
+		ast_cli(a->fd, "ast_sched_wait() should have returned > 1000, returned '%d'\n",
+				wait);
+		goto return_cleanup;
+	}
+
+	if (ast_sched_del(con, id2) == -1) {
+		ast_cli(a->fd, "Failed to remove scheduler entry\n");
+		goto return_cleanup;
+	}
+
+	if ((wait = ast_sched_wait(con)) <= 10000) {
+		ast_cli(a->fd, "ast_sched_wait() should have returned > 10000, returned '%d'\n",
+				wait);
+		goto return_cleanup;
+	}
+
+	if (ast_sched_del(con, id1) == -1) {
+		ast_cli(a->fd, "Failed to remove scheduler entry\n");
+		goto return_cleanup;
+	}
+
+	if ((wait = ast_sched_wait(con)) != -1) {
+		ast_cli(a->fd, "ast_sched_wait() should have returned -1, returned '%d'\n",
+				wait);
+		goto return_cleanup;
+	}
+
+	res = CLI_SUCCESS;
+
+	ast_cli(a->fd, "Test passed!\n");
+
+return_cleanup:
+	sched_context_destroy(con);
+
+	return res;
+}
+
+static char *handle_cli_sched_bench(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
+{
+	struct sched_context *con;
 	struct timeval start;
 	unsigned int num, i;
 	int *sched_ids = NULL;
 
 	switch (cmd) {
 	case CLI_INIT:
-		e->command = "sched test";
+		e->command = "sched benchmark";
 		e->usage = ""
 			"Usage: sched test <num>\n"
 			"";
@@ -114,7 +228,8 @@
 }
 
 static struct ast_cli_entry cli_sched[] = {
-	AST_CLI_DEFINE(handle_cli_sched_test, "Test ast_sched add/del performance"),
+	AST_CLI_DEFINE(handle_cli_sched_bench, "Benchmark ast_sched add/del performance"),
+	AST_CLI_DEFINE(handle_cli_sched_test, "Test scheduler entry ordering"),
 };
 
 static int unload_module(void)