Mercurial > pidgin
annotate src/debug.c @ 11719:109ee3bfeac5
[gaim-migrate @ 14010]
SF Patch #1333770 from corfe83
"Many times in gaim we use the function
g_slist_remove(list,node->data) to remove an element
from a GSList. If we already have the pointer to the
node we want to delete, it is faster to send it the
pointer to the node to delete rather than the data of
the node (we can do this by calling
g_slist_delete_link(list,node)). This change was made
while looking at glib's documentation and the code in
glib's gslist.c.
This is because as the remove/delete function traverses
each node in the list, it doesn't need to spend an
extra memory access to retrieve the data for each
element in the node it is traversing and then compare,
it can simply compare the pointer. In my tests outside
of gaim, this makes a big difference if the node you
are deleting is at a high index in the list. However,
even if you're deleting the first node, it about breaks
even.
So, I've found each case in gaim where we are calling
g_slist_remove, and we already have the pointer to the
appropriate node to delete (this is often the case when
we're doing a for or while loop on a GSList). I've then
replaced it with the appropriate call to
g_slist_delete_link. I, however, didn't do this in
situations where we are explicitly removing the first
element in the list, because in those situations it is
an unnecessary change.
There should be no difference in behavior, but just in
case I've tried running it with valgrind, which reports
the same number of memory leaks after my patch as
before my patch. Of course, I can't guarantee that my
normal behavior on gaim is hitting all the functions
I've changed, but in general testing it Works For Me (tm)."
As with the last patch, this one may not have a practical performance impact (or maybe it does, I have no idea), but it's not worse for any case. Given two ways of doing things where one is always at least as fast and may be faster under some cases, I like to prefer that faster way. This doesn't make the code any uglier, so I'm applying.
committer: Tailor Script <tailor@pidgin.im>
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sat, 22 Oct 2005 20:48:18 +0000 |
| parents | 921f64947cad |
| children | e1e5462b7d81 |
| rev | line source |
|---|---|
| 5212 | 1 /** |
| 2 * @file debug.c Debug API | |
| 3 * @ingroup core | |
| 4 * | |
| 5 * gaim | |
| 6 * | |
| 8046 | 7 * Gaim is the legal property of its developers, whose names are too numerous |
| 8 * to list here. Please refer to the COPYRIGHT file distributed with this | |
| 9 * source distribution. | |
|
6483
565339a6eb86
[gaim-migrate @ 6997]
Christian Hammond <chipx86@chipx86.com>
parents:
5212
diff
changeset
|
10 * |
| 5212 | 11 * This program is free software; you can redistribute it and/or modify |
| 12 * it under the terms of the GNU General Public License as published by | |
| 13 * the Free Software Foundation; either version 2 of the License, or | |
| 14 * (at your option) any later version. | |
| 15 * | |
| 16 * This program is distributed in the hope that it will be useful, | |
| 17 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 19 * GNU General Public License for more details. | |
| 20 * | |
| 21 * You should have received a copy of the GNU General Public License | |
| 22 * along with this program; if not, write to the Free Software | |
| 23 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 24 */ | |
| 25 #include "debug.h" | |
| 10307 | 26 #include "internal.h" |
| 27 #include "prefs.h" | |
| 5212 | 28 |
| 29 static GaimDebugUiOps *debug_ui_ops = NULL; | |
| 30 | |
| 10307 | 31 /* |
| 32 * This determines whether debug info should be written to the | |
| 33 * console or not. | |
| 34 * | |
| 35 * It doesn't make sense to make this a normal Gaim preference | |
| 36 * because it's a command line option. This will always be FALSE, | |
| 37 * unless the user explicitly started Gaim with the -d flag. | |
| 38 * It doesn't matter what this value was the last time Gaim was | |
| 39 * started, so it doesn't make sense to save it in prefs. | |
| 40 */ | |
| 41 static gboolean debug_enabled = FALSE; | |
| 42 | |
|
11504
921f64947cad
[gaim-migrate @ 13749]
Richard Laager <rlaager@wiktel.com>
parents:
11256
diff
changeset
|
43 static void |
| 5212 | 44 gaim_debug_vargs(GaimDebugLevel level, const char *category, |
| 45 const char *format, va_list args) | |
| 46 { | |
| 47 GaimDebugUiOps *ops; | |
| 48 | |
| 49 g_return_if_fail(level != GAIM_DEBUG_ALL); | |
| 50 g_return_if_fail(format != NULL); | |
| 51 | |
| 10307 | 52 if (debug_enabled) { |
| 53 gchar *arg_s, *ts_s; | |
| 54 | |
| 55 arg_s = g_strdup_vprintf(format, args); | |
| 56 | |
| 10448 | 57 if ((category != NULL) && |
| 58 (gaim_prefs_exists("/core/debug/timestamps")) && | |
| 59 (gaim_prefs_get_bool("/core/debug/timestamps"))) { | |
| 10307 | 60 gchar mdate[64]; |
| 61 | |
| 62 time_t mtime = time(NULL); | |
| 63 strftime(mdate, sizeof(mdate), "%H:%M:%S", localtime(&mtime)); | |
| 64 ts_s = g_strdup_printf("(%s) ", mdate); | |
| 65 } else { | |
| 66 ts_s = g_strdup(""); | |
| 67 } | |
| 68 | |
| 69 if (category == NULL) | |
| 70 g_print("%s%s", ts_s, arg_s); | |
| 71 else | |
| 72 g_print("%s%s: %s", ts_s, category, arg_s); | |
| 73 | |
| 74 g_free(arg_s); | |
| 75 g_free(ts_s); | |
| 76 } | |
| 77 | |
|
7035
feb3d21a7794
[gaim-migrate @ 7598]
Christian Hammond <chipx86@chipx86.com>
parents:
6721
diff
changeset
|
78 ops = gaim_debug_get_ui_ops(); |
| 5212 | 79 |
| 80 if (ops != NULL && ops->print != NULL) | |
| 81 ops->print(level, category, format, args); | |
| 82 } | |
| 83 | |
| 84 void | |
| 85 gaim_debug(GaimDebugLevel level, const char *category, | |
| 86 const char *format, ...) | |
| 87 { | |
| 88 va_list args; | |
| 89 | |
| 90 g_return_if_fail(level != GAIM_DEBUG_ALL); | |
| 91 g_return_if_fail(format != NULL); | |
| 92 | |
| 93 va_start(args, format); | |
| 94 gaim_debug_vargs(level, category, format, args); | |
| 95 va_end(args); | |
| 96 } | |
| 97 | |
| 98 void | |
|
6721
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
99 gaim_debug_misc(const char *category, const char *format, ...) |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
100 { |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
101 va_list args; |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
102 |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
103 g_return_if_fail(format != NULL); |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
104 |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
105 va_start(args, format); |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
106 gaim_debug_vargs(GAIM_DEBUG_MISC, category, format, args); |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
107 va_end(args); |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
108 } |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
109 |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
110 void |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
111 gaim_debug_info(const char *category, const char *format, ...) |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
112 { |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
113 va_list args; |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
114 |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
115 g_return_if_fail(format != NULL); |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
116 |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
117 va_start(args, format); |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
118 gaim_debug_vargs(GAIM_DEBUG_INFO, category, format, args); |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
119 va_end(args); |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
120 } |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
121 |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
122 void |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
123 gaim_debug_warning(const char *category, const char *format, ...) |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
124 { |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
125 va_list args; |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
126 |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
127 g_return_if_fail(format != NULL); |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
128 |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
129 va_start(args, format); |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
130 gaim_debug_vargs(GAIM_DEBUG_WARNING, category, format, args); |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
131 va_end(args); |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
132 } |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
133 |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
134 void |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
135 gaim_debug_error(const char *category, const char *format, ...) |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
136 { |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
137 va_list args; |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
138 |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
139 g_return_if_fail(format != NULL); |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
140 |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
141 va_start(args, format); |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
142 gaim_debug_vargs(GAIM_DEBUG_ERROR, category, format, args); |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
143 va_end(args); |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
144 } |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
145 |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
146 void |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
147 gaim_debug_fatal(const char *category, const char *format, ...) |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
148 { |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
149 va_list args; |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
150 |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
151 g_return_if_fail(format != NULL); |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
152 |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
153 va_start(args, format); |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
154 gaim_debug_vargs(GAIM_DEBUG_FATAL, category, format, args); |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
155 va_end(args); |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
156 } |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
157 |
|
acc4376ce062
[gaim-migrate @ 7248]
Christian Hammond <chipx86@chipx86.com>
parents:
6483
diff
changeset
|
158 void |
| 10307 | 159 gaim_debug_set_enabled(gboolean enabled) |
| 160 { | |
| 161 debug_enabled = enabled; | |
| 162 } | |
| 163 | |
| 164 gboolean | |
| 165 gaim_debug_is_enabled() | |
| 166 { | |
| 167 return debug_enabled; | |
| 168 } | |
| 169 | |
| 170 void | |
|
7035
feb3d21a7794
[gaim-migrate @ 7598]
Christian Hammond <chipx86@chipx86.com>
parents:
6721
diff
changeset
|
171 gaim_debug_set_ui_ops(GaimDebugUiOps *ops) |
| 5212 | 172 { |
| 173 debug_ui_ops = ops; | |
| 174 } | |
| 175 | |
| 176 GaimDebugUiOps * | |
|
7035
feb3d21a7794
[gaim-migrate @ 7598]
Christian Hammond <chipx86@chipx86.com>
parents:
6721
diff
changeset
|
177 gaim_debug_get_ui_ops(void) |
| 5212 | 178 { |
| 179 return debug_ui_ops; | |
| 180 } | |
| 10307 | 181 |
| 182 void | |
| 183 gaim_debug_init(void) | |
| 184 { | |
| 185 gaim_prefs_add_none("/core/debug"); | |
| 186 | |
| 187 /* | |
| 188 * This pref is currently used by both the console | |
| 189 * output and the debug window output. | |
| 190 */ | |
| 191 gaim_prefs_add_bool("/core/debug/timestamps", FALSE); | |
| 192 } |
