git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3297
48e7efb5-ca39-0410-a469-
dd3cf9ba447f
-s_xbt_log_category_t _XBT_LOGV(XBT_LOG_ROOT_CAT) = {
+s_xbt_log_category_t
+#ifndef _MSC_VER
+XBT_PUBLIC_DATA
+#endif
+ _XBT_LOGV(XBT_LOG_ROOT_CAT) = {
0, 0, 0,
"root", xbt_log_priority_uninitialized, 0,
NULL, 0
0, 0, 0,
"root", xbt_log_priority_uninitialized, 0,
NULL, 0
int found = 0;
s_xbt_log_event_t _log_ev;
int found = 0;
s_xbt_log_event_t _log_ev;
if (!xbt_log_settings)
return;
if (!xbt_log_settings)
return;
xbt_assert0(cat,"NULL category");
xbt_assert(cat->name);
xbt_assert0(cat,"NULL category");
xbt_assert(cat->name);
}
void _xbt_log_event_log( xbt_log_event_t ev, const char *fmt, ...) {
}
void _xbt_log_event_log( xbt_log_event_t ev, const char *fmt, ...) {
xbt_log_category_t cat = ev->cat;
xbt_log_category_t cat = ev->cat;
va_start(ev->ap, fmt);
while(1) {
xbt_log_appender_t appender = cat->appender;
if (appender != NULL) {
va_start(ev->ap, fmt);
while(1) {
xbt_log_appender_t appender = cat->appender;
if (appender != NULL) {
appender->do_append(appender, ev, fmt);
}
if (!cat->willLogToParent)
appender->do_append(appender, ev, fmt);
}
if (!cat->willLogToParent)
static void _cat_init(xbt_log_category_t category)
{
static void _cat_init(xbt_log_category_t category)
{
if(category == &_XBT_LOGV(XBT_LOG_ROOT_CAT)){
if(category == &_XBT_LOGV(XBT_LOG_ROOT_CAT)){
- category->threshold = xbt_log_priority_info;
+ category->threshold = xbt_log_priority_info;/* xbt_log_priority_debug*/;
category->appender = xbt_log_default_appender;
}
else
{
category->appender = xbt_log_default_appender;
}
else
{
#if (defined(_WIN32) && !defined(DLL_STATIC))
#if (defined(_WIN32) && !defined(DLL_STATIC))
category->parent = &_XBT_LOGV(XBT_LOG_ROOT_CAT);
category->parent = &_XBT_LOGV(XBT_LOG_ROOT_CAT);
#endif
xbt_log_parent_set(category, category->parent);
}
_apply_control(category);
#endif
xbt_log_parent_set(category, category->parent);
}
_apply_control(category);
return priority >= category->threshold;
}
void xbt_log_parent_set(xbt_log_category_t cat,xbt_log_category_t parent)
{
return priority >= category->threshold;
}
void xbt_log_parent_set(xbt_log_category_t cat,xbt_log_category_t parent)
{
xbt_assert0(cat,"NULL category to be given a parent");
xbt_assert1(parent,"The parent category of %s is NULL",cat->name);
xbt_assert0(cat,"NULL category to be given a parent");
xbt_assert1(parent,"The parent category of %s is NULL",cat->name);
cat->isThreshInherited = 1;
cat->isThreshInherited = 1;
} /* log_setParent */
static void _set_inherited_thresholds(xbt_log_category_t cat) {
} /* log_setParent */
static void _set_inherited_thresholds(xbt_log_category_t cat) {
xbt_log_category_t child = cat->firstChild;
xbt_log_category_t child = cat->firstChild;
for( ; child != NULL; child = child->nextSibling) {
if (child->isThreshInherited) {
if (cat != &_XBT_LOGV(log))
for( ; child != NULL; child = child->nextSibling) {
if (child->isThreshInherited) {
if (cat != &_XBT_LOGV(log))
_set_inherited_thresholds(child);
}
}
_set_inherited_thresholds(child);
}
}
}
void xbt_log_threshold_set(xbt_log_category_t cat,
e_xbt_log_priority_t threshold) {
cat->threshold = threshold;
cat->isThreshInherited = 0;
}
void xbt_log_threshold_set(xbt_log_category_t cat,
e_xbt_log_priority_t threshold) {
cat->threshold = threshold;
cat->isThreshInherited = 0;
_set_inherited_thresholds(cat);
_set_inherited_thresholds(cat);
}
static void _xbt_log_parse_setting(const char* control_string,
xbt_log_setting_t set) {
const char *name, *dot, *eq;
}
static void _xbt_log_parse_setting(const char* control_string,
xbt_log_setting_t set) {
const char *name, *dot, *eq;
set->catname=NULL;
if (!*control_string)
return;
set->catname=NULL;
if (!*control_string)
return;
strncpy(set->catname,name,dot-name);
set->catname[dot-name]='\0'; /* Just in case */
DEBUG1("This is for cat '%s'", set->catname);
strncpy(set->catname,name,dot-name);
set->catname[dot-name]='\0'; /* Just in case */
DEBUG1("This is for cat '%s'", set->catname);
}
static xbt_log_category_t _xbt_log_cat_searchsub(xbt_log_category_t cat,char *name) {
xbt_log_category_t child;
}
static xbt_log_category_t _xbt_log_cat_searchsub(xbt_log_category_t cat,char *name) {
xbt_log_category_t child;
if (!strcmp(cat->name,name)) {
return cat;
}
for(child=cat->firstChild ; child != NULL; child = child->nextSibling) {
return _xbt_log_cat_searchsub(child,name);
}
if (!strcmp(cat->name,name)) {
return cat;
}
for(child=cat->firstChild ; child != NULL; child = child->nextSibling) {
return _xbt_log_cat_searchsub(child,name);
}
THROW0(not_found_error,0,"No such category");
}
THROW0(not_found_error,0,"No such category");
}
DEBUG1("Parse log settings '%s'",control_string);
if (control_string == NULL)
return;
DEBUG1("Parse log settings '%s'",control_string);
if (control_string == NULL)
return;
}
void xbt_log_appender_set(xbt_log_category_t cat, xbt_log_appender_t app) {
}
void xbt_log_appender_set(xbt_log_category_t cat, xbt_log_appender_t app) {