projects
/
bluesky.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add more benchmark results
[bluesky.git]
/
bluesky
/
util.c
diff --git
a/bluesky/util.c
b/bluesky/util.c
index
99e341f
..
3898c4a
100644
(file)
--- a/
bluesky/util.c
+++ b/
bluesky/util.c
@@
-83,6
+83,7
@@
BlueSkyRCStr *bluesky_string_new_from_mmap(BlueSkyCacheFile *mmap,
int offset, gsize len)
{
g_assert(offset + len <= mmap->len);
int offset, gsize len)
{
g_assert(offset + len <= mmap->len);
+ g_assert(mmap->addr != NULL);
BlueSkyRCStr *string = g_new(BlueSkyRCStr, 1);
string->mmap = mmap;
BlueSkyRCStr *string = g_new(BlueSkyRCStr, 1);
string->mmap = mmap;
@@
-349,21
+350,30
@@
typedef struct {
char *message;
} RTEvent;
char *message;
} RTEvent;
+/* To catch attempts to access to invalid profile structures. */
+#define PROFILE_MAGIC 0x439929d8
+
BlueSkyProfile *bluesky_profile_new()
{
BlueSkyProfile *profile = g_new0(BlueSkyProfile, 1);
profile->lock = g_mutex_new();
BlueSkyProfile *bluesky_profile_new()
{
BlueSkyProfile *profile = g_new0(BlueSkyProfile, 1);
profile->lock = g_mutex_new();
+ profile->magic = PROFILE_MAGIC;
return profile;
}
void bluesky_profile_free(BlueSkyProfile *profile)
{
return profile;
}
void bluesky_profile_free(BlueSkyProfile *profile)
{
+ if (profile->magic != PROFILE_MAGIC) {
+ g_warning("Access to invalid BlueSkyProfile object!");
+ return;
+ }
while (profile->events != NULL) {
RTEvent *event = (RTEvent *)profile->events->data;
g_free(event->message);
g_free(event);
profile->events = g_list_delete_link(profile->events, profile->events);
}
while (profile->events != NULL) {
RTEvent *event = (RTEvent *)profile->events->data;
g_free(event->message);
g_free(event);
profile->events = g_list_delete_link(profile->events, profile->events);
}
+ profile->magic = 0;
g_mutex_free(profile->lock);
g_free(profile->description);
g_free(profile);
g_mutex_free(profile->lock);
g_free(profile->description);
g_free(profile);
@@
-373,6
+383,10
@@
void bluesky_profile_add_event(BlueSkyProfile *profile, char *message)
{
g_return_if_fail(profile != NULL);
{
g_return_if_fail(profile != NULL);
+ if (profile->magic != PROFILE_MAGIC) {
+ g_warning("Access to invalid BlueSkyProfile object!");
+ return;
+ }
g_mutex_lock(profile->lock);
RTEvent *event = g_new(RTEvent, 1);
event->timestamp = bluesky_now_hires();
g_mutex_lock(profile->lock);
RTEvent *event = g_new(RTEvent, 1);
event->timestamp = bluesky_now_hires();
@@
-383,21
+397,40
@@
void bluesky_profile_add_event(BlueSkyProfile *profile, char *message)
g_mutex_unlock(profile->lock);
}
g_mutex_unlock(profile->lock);
}
+static FILE *profiling_file = NULL;
+static GStaticMutex profiling_print_lock = G_STATIC_MUTEX_INIT;
+
+void bluesky_profile_set_output(FILE *stream)
+{
+ profiling_file = stream;
+}
+
void bluesky_profile_print(BlueSkyProfile *profile)
{
void bluesky_profile_print(BlueSkyProfile *profile)
{
+ if (profiling_file == NULL)
+ return;
+ FILE *stream = profiling_file;
+
g_return_if_fail(profile != NULL);
g_return_if_fail(profile != NULL);
+ if (profile->magic != PROFILE_MAGIC) {
+ g_warning("Access to invalid BlueSkyProfile object!");
+ return;
+ }
+
g_mutex_lock(profile->lock);
g_mutex_lock(profile->lock);
- g_print("Event Timeline: %s\n", profile->description);
+ g_static_mutex_lock(&profiling_print_lock);
+ fprintf(stream, "Event Timeline: %s\n", profile->description);
GList *link = g_list_last(profile->events);
bluesky_time_hires last_time = 0;
while (link != NULL) {
RTEvent *event = (RTEvent *)link->data;
GList *link = g_list_last(profile->events);
bluesky_time_hires last_time = 0;
while (link != NULL) {
RTEvent *event = (RTEvent *)link->data;
-
g_print(
" [%d] [%"PRIi64" ns]: %s\n",
+
fprintf(stream,
" [%d] [%"PRIi64" ns]: %s\n",
event->tid, event->timestamp - last_time, event->message);
last_time = event->timestamp;
link = link->prev;
}
event->tid, event->timestamp - last_time, event->message);
last_time = event->timestamp;
link = link->prev;
}
+ g_static_mutex_unlock(&profiling_print_lock);
g_mutex_unlock(profile->lock);
}
g_mutex_unlock(profile->lock);
}