X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=glib%2Fgmessages.c;h=c1b5622a12b1bcf832f989670a65f342ed4d34df;hb=d0083f7e2dd621c6b78496bdb6ecf5d580c5e110;hp=26018cd774062738c064db572b17daf478a144f6;hpb=44f13124c9d6d66760bd800d7d1ce68dc53ad5f2;p=platform%2Fupstream%2Fglib.git
diff --git a/glib/gmessages.c b/glib/gmessages.c
index 26018cd..c1b5622 100644
--- a/glib/gmessages.c
+++ b/glib/gmessages.c
@@ -12,9 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see .
*/
/*
@@ -35,15 +33,16 @@
*
* These functions provide support for outputting messages.
*
- * The g_return family of macros (g_return_if_fail(),
- * g_return_val_if_fail(), g_return_if_reached(), g_return_val_if_reached())
- * should only be used for programming errors, a typical use case is
- * checking for invalid parameters at the beginning of a public function.
- * They should not be used if you just mean "if (error) return", they
- * should only be used if you mean "if (bug in program) return".
- * The program behavior is generally considered undefined after one
- * of these checks fails. They are not intended for normal control
- * flow, only to give a perhaps-helpful warning before giving up.
+ * The g_return family of macros (g_return_if_fail(),
+ * g_return_val_if_fail(), g_return_if_reached(),
+ * g_return_val_if_reached()) should only be used for programming
+ * errors, a typical use case is checking for invalid parameters at
+ * the beginning of a public function. They should not be used if
+ * you just mean "if (error) return", they should only be used if
+ * you mean "if (bug in program) return". The program behavior is
+ * generally considered undefined after one of these checks fails.
+ * They are not intended for normal control flow, only to give a
+ * perhaps-helpful warning before giving up.
*/
#include "config.h"
@@ -52,15 +51,10 @@
#include
#include
#include
-#ifdef HAVE_UNISTD_H
-#include
-#endif
#include
#include
#include
-#include "gmessages-private.h"
-
#include "glib-init.h"
#include "gbacktrace.h"
#include "gcharset.h"
@@ -74,6 +68,10 @@
#include "gstring.h"
#include "gpattern.h"
+#ifdef G_OS_UNIX
+#include
+#endif
+
#ifdef G_OS_WIN32
#include /* For getpid() */
#include
@@ -146,7 +144,7 @@
* and g_return_val_if_fail().
* @G_LOG_LEVEL_WARNING: log level for warnings, see g_warning()
* @G_LOG_LEVEL_MESSAGE: log level for messages, see g_message()
- * @G_LOG_LEVEL_INFO: log level for informational messages
+ * @G_LOG_LEVEL_INFO: log level for informational messages, see g_info()
* @G_LOG_LEVEL_DEBUG: log level for debug messages, see g_debug()
* @G_LOG_LEVEL_MASK: a mask including all log levels
*
@@ -157,6 +155,13 @@
*/
/**
+ * G_LOG_LEVEL_USER_SHIFT:
+ *
+ * Log levels below 1<G_DEBUG environment variable (see
- * Running GLib Applications).
+ * You can make warnings fatal at runtime by setting the `G_DEBUG`
+ * environment variable (see
+ * [Running GLib Applications](glib-running.html)).
*
- * If g_log_default_handler() is used as the log handler function, a new-line
- * character will automatically be appended to @..., and need not be entered
- * manually.
+ * If g_log_default_handler() is used as the log handler function,
+ * a newline character will automatically be appended to @..., and
+ * need not be entered manually.
*/
/**
@@ -197,8 +202,8 @@
* example.
*
* You can also make critical warnings fatal at runtime by
- * setting the G_DEBUG environment variable (see
- * Running GLib Applications).
+ * setting the `G_DEBUG` environment variable (see
+ * [Running GLib Applications](glib-running.html)).
*
* If g_log_default_handler() is used as the log handler function, a new-line
* character will automatically be appended to @..., and need not be entered
@@ -225,6 +230,23 @@
*/
/**
+ * g_info:
+ * @...: format string, followed by parameters to insert
+ * into the format string (as with printf())
+ *
+ * A convenience function/macro to log an informational message. Seldom used.
+ *
+ * If g_log_default_handler() is used as the log handler function, a new-line
+ * character will automatically be appended to @..., and need not be entered
+ * manually.
+ *
+ * Such messages are suppressed by the g_log_default_handler() unless
+ * the G_MESSAGES_DEBUG environment variable is set appropriately.
+ *
+ * Since: 2.40
+ */
+
+/**
* g_debug:
* @...: format string, followed by parameters to insert
* into the format string (as with printf())
@@ -235,6 +257,9 @@
* character will automatically be appended to @..., and need not be entered
* manually.
*
+ * Such messages are suppressed by the g_log_default_handler() unless
+ * the G_MESSAGES_DEBUG environment variable is set appropriately.
+ *
* Since: 2.6
*/
@@ -264,7 +289,6 @@ static GLogDomain *g_log_domains = NULL;
static GPrintFunc glib_print_func = NULL;
static GPrintFunc glib_printerr_func = NULL;
static GPrivate g_log_depth;
-static gboolean exit_on_fatal;
static GLogFunc default_log_func = g_log_default_handler;
static gpointer default_log_data = NULL;
static GTestLogFatalFunc fatal_log_func = NULL;
@@ -272,11 +296,23 @@ static gpointer fatal_log_data;
/* --- functions --- */
-void
-_g_log_abort (void)
+static void _g_log_abort (gboolean breakpoint);
+
+static void
+_g_log_abort (gboolean breakpoint)
{
- if (exit_on_fatal)
- _exit (1);
+ if (g_test_subprocess ())
+ {
+ /* If this is a test case subprocess then it probably caused
+ * this error message on purpose, so just exit() rather than
+ * abort()ing, to avoid triggering any system crash-reporting
+ * daemon.
+ */
+ _exit (1);
+ }
+
+ if (breakpoint)
+ G_BREAKPOINT ();
else
abort ();
}
@@ -327,7 +363,7 @@ write_string (int fd,
static GLogDomain*
g_log_find_domain_L (const gchar *log_domain)
{
- register GLogDomain *domain;
+ GLogDomain *domain;
domain = g_log_domains;
while (domain)
@@ -342,7 +378,7 @@ g_log_find_domain_L (const gchar *log_domain)
static GLogDomain*
g_log_domain_new_L (const gchar *log_domain)
{
- register GLogDomain *domain;
+ GLogDomain *domain;
domain = g_new (GLogDomain, 1);
domain->log_domain = g_strdup (log_domain);
@@ -361,7 +397,7 @@ g_log_domain_check_free_L (GLogDomain *domain)
if (domain->fatal_mask == G_LOG_FATAL_MASK &&
domain->handlers == NULL)
{
- register GLogDomain *last, *work;
+ GLogDomain *last, *work;
last = NULL;
@@ -391,7 +427,7 @@ g_log_domain_get_handler_L (GLogDomain *domain,
{
if (domain && log_level)
{
- register GLogHandler *handler;
+ GLogHandler *handler;
handler = domain->handlers;
while (handler)
@@ -420,8 +456,8 @@ g_log_domain_get_handler_L (GLogDomain *domain,
* %G_LOG_LEVEL_ERROR is always fatal.
*
* You can also make some message levels fatal at runtime by setting
- * the G_DEBUG environment variable (see
- * Running GLib Applications).
+ * the `G_DEBUG` environment variable (see
+ * [Running GLib Applications](glib-running.html)).
*
* Returns: the old fatal mask
*/
@@ -462,7 +498,7 @@ g_log_set_fatal_mask (const gchar *log_domain,
GLogLevelFlags fatal_mask)
{
GLogLevelFlags old_flags;
- register GLogDomain *domain;
+ GLogDomain *domain;
if (!log_domain)
log_domain = "";
@@ -507,31 +543,24 @@ g_log_set_fatal_mask (const gchar *log_domain,
* you want to set a handler for this log level you must combine it with
* #G_LOG_FLAG_FATAL.
*
- *
- * Adding a log handler for all warning messages in the default
- * (application) domain
- *
+ * Here is an example for adding a log handler for all warning messages
+ * in the default domain:
+ * |[
* g_log_set_handler (NULL, G_LOG_LEVEL_WARNING | G_LOG_FLAG_FATAL
* | G_LOG_FLAG_RECURSION, my_log_handler, NULL);
- *
- *
+ * ]|
*
- *
- * Adding a log handler for all critical messages from GTK+
- *
+ * This example adds a log handler for all critical messages from GTK+:
+ * |[
* g_log_set_handler ("Gtk", G_LOG_LEVEL_CRITICAL | G_LOG_FLAG_FATAL
* | G_LOG_FLAG_RECURSION, my_log_handler, NULL);
- *
- *
+ * ]|
*
- *
- * Adding a log handler for <emphasis>all</emphasis> messages from
- * GLib
- *
+ * This example adds a log handler for all messages from GLib:
+ * |[
* g_log_set_handler ("GLib", G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL
* | G_LOG_FLAG_RECURSION, my_log_handler, NULL);
- *
- *
+ * ]|
*
* Returns: the id of the new handler
*/
@@ -645,7 +674,7 @@ void
g_log_remove_handler (const gchar *log_domain,
guint handler_id)
{
- register GLogDomain *domain;
+ GLogDomain *domain;
g_return_if_fail (handler_id > 0);
@@ -940,9 +969,10 @@ g_logv (const gchar *log_domain,
gchar *expected_message;
mklevel_prefix (level_prefix, expected->log_level);
- expected_message = g_strdup_printf ("Did not see expected message %s: %s",
+ expected_message = g_strdup_printf ("Did not see expected message %s-%s: %s",
+ expected->log_domain ? expected->log_domain : "**",
level_prefix, expected->pattern);
- g_log_default_handler (log_domain, log_level, expected_message, NULL);
+ g_log_default_handler (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, expected_message, NULL);
g_free (expected_message);
log_level |= G_LOG_FLAG_FATAL;
@@ -951,7 +981,7 @@ g_logv (const gchar *log_domain,
for (i = g_bit_nth_msf (log_level, -1); i >= 0; i = g_bit_nth_msf (log_level, i))
{
- register GLogLevelFlags test_level;
+ GLogLevelFlags test_level;
test_level = 1 << i;
if (log_level & test_level)
@@ -996,11 +1026,7 @@ g_logv (const gchar *log_domain,
&& !fatal_log_func (log_domain, test_level, msg, fatal_log_data);
}
- if ((test_level & G_LOG_FLAG_FATAL) && exit_on_fatal && !masquerade_fatal)
- {
- _g_log_abort ();
- }
- else if ((test_level & G_LOG_FLAG_FATAL) && !masquerade_fatal)
+ if ((test_level & G_LOG_FLAG_FATAL) && !masquerade_fatal)
{
#ifdef G_OS_WIN32
if (win32_keep_fatal_message)
@@ -1010,15 +1036,9 @@ g_logv (const gchar *log_domain,
MessageBox (NULL, locale_msg, NULL,
MB_ICONERROR|MB_SETFOREGROUND);
}
- if (IsDebuggerPresent () && !(test_level & G_LOG_FLAG_RECURSION))
- G_BREAKPOINT ();
- else
- abort ();
+ _g_log_abort (IsDebuggerPresent () && !(test_level & G_LOG_FLAG_RECURSION));
#else
- if (!(test_level & G_LOG_FLAG_RECURSION))
- G_BREAKPOINT ();
- else
- abort ();
+ _g_log_abort (!(test_level & G_LOG_FLAG_RECURSION));
#endif /* !G_OS_WIN32 */
}
@@ -1100,24 +1120,30 @@ g_assert_warning (const char *log_domain,
const char *pretty_function,
const char *expression)
{
- g_log (log_domain,
- G_LOG_LEVEL_ERROR,
- expression
- ? "file %s: line %d (%s): assertion failed: (%s)"
- : "file %s: line %d (%s): should not be reached",
- file,
- line,
- pretty_function,
- expression);
- _g_log_abort ();
+ if (expression)
+ g_log (log_domain,
+ G_LOG_LEVEL_ERROR,
+ "file %s: line %d (%s): assertion failed: (%s)",
+ file,
+ line,
+ pretty_function,
+ expression);
+ else
+ g_log (log_domain,
+ G_LOG_LEVEL_ERROR,
+ "file %s: line %d (%s): should not be reached",
+ file,
+ line,
+ pretty_function);
+ _g_log_abort (FALSE);
+ abort ();
}
/**
* g_test_expect_message:
* @log_domain: (allow-none): the log domain of the message
* @log_level: the log level of the message
- * @pattern: a glob-style
- * pattern
+ * @pattern: a glob-style [pattern][glib-Glob-style-pattern-matching]
*
* Indicates that a message with the given @log_domain and @log_level,
* with text matching @pattern, is expected to be logged. When this
@@ -1133,10 +1159,9 @@ g_assert_warning (const char *log_domain,
*
* For example:
*
- * |[
- * /* g_main_context_push_thread_default() should fail if the
- * * context is already owned by another thread.
- * */
+ * |[
+ * // g_main_context_push_thread_default() should fail if the
+ * // context is already owned by another thread.
* g_test_expect_message (G_LOG_DOMAIN,
* G_LOG_LEVEL_CRITICAL,
* "assertion*acquired_context*failed");
@@ -1187,9 +1212,10 @@ g_test_assert_expected_messages_internal (const char *domain,
expected = expected_messages->data;
mklevel_prefix (level_prefix, expected->log_level);
- message = g_strdup_printf ("Did not see expected message %s: %s",
+ message = g_strdup_printf ("Did not see expected message %s-%s: %s",
+ expected->log_domain ? expected->log_domain : "**",
level_prefix, expected->pattern);
- g_assertion_message (domain, file, line, func, message);
+ g_assertion_message (G_LOG_DOMAIN, file, line, func, message);
g_free (message);
}
}
@@ -1331,23 +1357,14 @@ escape_string (GString *string)
*
* The behavior of this log handler can be influenced by a number of
* environment variables:
- *
- *
- * G_MESSAGES_PREFIXED
- *
- * A :-separated list of log levels for which messages should
- * be prefixed by the program name and PID of the aplication.
- *
- *
- *
- * G_MESSAGES_DEBUG
- *
- * A space-separated list of log domains for which debug and
- * informational messages are printed. By default these
- * messages are not printed.
- *
- *
- *
+ *
+ * - `G_MESSAGES_PREFIXED`: A :-separated list of log levels for which
+ * messages should be prefixed by the program name and PID of the
+ * aplication.
+ *
+ * - `G_MESSAGES_DEBUG`: A space-separated list of log domains for
+ * which debug and informational messages are printed. By default
+ * these messages are not printed.
*
* stderr is used for levels %G_LOG_LEVEL_ERROR, %G_LOG_LEVEL_CRITICAL,
* %G_LOG_LEVEL_WARNING and %G_LOG_LEVEL_MESSAGE. stdout is used for
@@ -1613,9 +1630,3 @@ g_printf_string_upper_bound (const gchar *format,
gchar c;
return _g_vsnprintf (&c, 1, format, args) + 1;
}
-
-void
-_g_log_set_exit_on_fatal (void)
-{
- exit_on_fatal = TRUE;
-}