sdl-ios-xcode: src/SDL_assert.c comparison

comparison src/SDL_assert.c @ 3670:62b6a5b99918

Clean up assertion API for public use.

author	Ryan C. Gordon <icculus@icculus.org>
date	Wed, 13 Jan 2010 19:29:33 +0000
parents	46d27a9571fa
children	0d6f520c0eb9

comparison

equal deleted inserted replaced

-:46d27a9571fa
+:62b6a5b99918
 slouken@libsdl.org
 */
 #include "SDL.h"
 #include "SDL_assert.h"
-#if (SDL_ASSERT_LEVEL > 0)
 #ifdef _WINDOWS
 #define WIN32_LEAN_AND_MEAN 1
 #include <windows.h>
 #else  /* fprintf, _exit(), etc. */
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #endif
-/* We can keep all triggered assertions in a singly-linked list so we can
+static SDL_assert_state
+SDL_PromptAssertion(const SDL_assert_data *data, void *userdata);
+/*
+* We keep all triggered assertions in a singly-linked list so we can
 *  generate a report later.
 */
-#if !SDL_ASSERTION_REPORT_DISABLED
 static SDL_assert_data assertion_list_terminator = { 0, 0, 0, 0, 0, 0, 0 };
 static SDL_assert_data *triggered_assertions = &assertion_list_terminator;
-#endif
+static SDL_mutex *assertion_mutex = NULL;
+static SDL_AssertionHandler assertion_handler = SDL_PromptAssertion;
+static void *assertion_userdata = NULL;
 #ifdef __GNUC__
 static void
 debug_print(const char *fmt, ...) __attribute__((format (printf, 1, 2)));
 #endif
 #endif
 static void SDL_AddAssertionToReport(SDL_assert_data *data)
 {
-#if !SDL_ASSERTION_REPORT_DISABLED
 /* (data) is always a static struct defined with the assert macros, so
 we don't have to worry about copying or allocating them. */
 if (data->next == NULL) {  /* not yet added? */
 data->next = triggered_assertions;
 triggered_assertions = data;
 }
-#endif
+}
-}
 static void SDL_GenerateAssertionReport(void)
 {
-#if !SDL_ASSERTION_REPORT_DISABLED
+const SDL_assert_data *item;
-if (triggered_assertions != &assertion_list_terminator)
+/* only do this if the app hasn't assigned an assertion handler. */
+if (assertion_handler != SDL_PromptAssertion)
+return;
+item = SDL_GetAssertionReport();
+if (item->condition)
 {
-SDL_assert_data *item = triggered_assertions;
 debug_print("\n\nSDL assertion report.\n");
 debug_print("All SDL assertions between last init/quit:\n\n");
-while (item != &assertion_list_terminator) {
+while (item->condition) {
 debug_print(
 "'%s'\n"
 "    * %s (%s:%d)\n"
 "    * triggered %u time%s.\n"
 "    * always ignore: %s.\n",
 item->always_ignore ? "yes" : "no");
 item = item->next;
 }
 debug_print("\n");
-triggered_assertions = &assertion_list_terminator;
+SDL_ResetAssertionReport();
 }
-#endif
 }
 static void SDL_ExitProcess(int exitcode)
 {
 #ifdef _WINDOWS
 SDL_Quit();
 SDL_ExitProcess(42);
 }
-static SDL_assert_state SDL_PromptAssertion(const SDL_assert_data *data)
+static SDL_assert_state
+SDL_PromptAssertion(const SDL_assert_data *data, void *userdata)
 {
 const char *envr;
 SDL_assert_state state = SDL_ASSERTION_ABORT;
 SDL_WindowID window;
+(void) userdata;  /* unused in default handler. */
 debug_print("\n\n"
 "Assertion failure at %s (%s:%d), triggered %u time%s:\n"
 "  '%s'\n"
 "\n",
 window = SDL_GetFocusWindow();
 if (window) {
 if (SDL_GetWindowFlags(window) & SDL_WINDOW_FULLSCREEN) {
 SDL_MinimizeWindow(window);
 } else {
+/* !!! FIXME: ungrab the input if we're not fullscreen? */
 /* No need to mess with the window */
 window = 0;
 }
 }
 }
 return state;
 }
-static SDL_mutex *assertion_mutex = NULL;
 SDL_assert_state
 SDL_ReportAssertion(SDL_assert_data *data, const char *func, const char *file,
 int line)
 {
 while (1) { /* do nothing but spin; what else can you do?! */ }
 }
 }
 if (!data->always_ignore) {
-state = SDL_PromptAssertion(data);
+state = assertion_handler(data, assertion_userdata);
 }
 switch (state)
 {
 case SDL_ASSERTION_ABORT:
 SDL_UnlockMutex(assertion_mutex);
 return state;
 }
-#endif  /* SDL_ASSERT_LEVEL > 0 */
 int SDL_AssertionsInit(void)
 {
 /* this is a no-op at the moment. */
 return 0;
 }
 void SDL_AssertionsQuit(void)
 {
-#if (SDL_ASSERT_LEVEL > 0)
 SDL_GenerateAssertionReport();
 if (assertion_mutex != NULL) {
 SDL_DestroyMutex(assertion_mutex);
 assertion_mutex = NULL;
 }
-#endif
+}
+void SDL_SetAssertionHandler(SDL_AssertionHandler handler, void *userdata)
+{
+if (handler != NULL) {
+assertion_handler = handler;
+assertion_userdata = userdata;
+} else {
+assertion_handler = SDL_PromptAssertion;
+assertion_userdata = NULL;
+}
+}
+const SDL_assert_data *SDL_GetAssertionReport(void)
+{
+return triggered_assertions;
+}
+void SDL_ResetAssertionReport(void)
+{
+SDL_assert_data *item = triggered_assertions;
+SDL_assert_data *next = NULL;
+for (item = triggered_assertions; item->condition; item = next) {
+next = (SDL_assert_data *) item->next;
+item->always_ignore = SDL_FALSE;
+item->trigger_count = 0;
+item->next = NULL;
+}
+triggered_assertions = &assertion_list_terminator;
 }
 /* vi: set ts=4 sw=4 expandtab: */

Mercurial > sdl-ios-xcode

comparison src/SDL_assert.c @ 3670:62b6a5b99918