use a dedicated header to pull up early NoBug init
This commit is contained in:
parent
7660324d23
commit
aa7fe2591c
6 changed files with 101 additions and 4 deletions
|
|
@ -37,6 +37,7 @@ liblumiera_la_SOURCES = \
|
|||
$(liblumiera_la_srcdir)/allocationcluster.cpp \
|
||||
$(liblumiera_la_srcdir)/lumitime.cpp \
|
||||
$(liblumiera_la_srcdir)/lifecycle.cpp \
|
||||
$(liblumiera_la_srcdir)/nobug-init.cpp \
|
||||
$(liblumiera_la_srcdir)/util.cpp \
|
||||
$(liblumiera_la_srcdir)/visitor.cpp \
|
||||
$(liblumiera_la_srcdir)/query.cpp \
|
||||
|
|
@ -64,6 +65,7 @@ noinst_HEADERS += \
|
|||
$(liblumiera_la_srcdir)/scopedholdertransfer.hpp \
|
||||
$(liblumiera_la_srcdir)/scopedholder.hpp \
|
||||
$(liblumiera_la_srcdir)/lifecycleregistry.hpp \
|
||||
$(liblumiera_la_srcdir)/nobug-init.hpp \
|
||||
$(liblumiera_la_srcdir)/factory.hpp \
|
||||
$(liblumiera_la_srcdir)/frameid.hpp \
|
||||
$(liblumiera_la_srcdir)/singleton.hpp \
|
||||
|
|
|
|||
43
src/lib/nobug-init.cpp
Normal file
43
src/lib/nobug-init.cpp
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
/*
|
||||
NoBugInit - pull up NoBug automagically in static initialisation
|
||||
|
||||
Copyright (C) Lumiera.org
|
||||
2009, Hermann Vosseler <Ichthyostega@web.de>
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License as
|
||||
published by the Free Software Foundation; either version 2 of the
|
||||
License, or (at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
|
||||
* *****************************************************/
|
||||
|
||||
|
||||
#include "lib/nobug-init.hpp"
|
||||
|
||||
|
||||
|
||||
namespace lumiera {
|
||||
|
||||
void
|
||||
initialise_NoBug ()
|
||||
{
|
||||
NOBUG_INIT;
|
||||
|
||||
////////////////////////////////////////////////////////////////////////TODO: a better way to detect Alpha/beta builds
|
||||
#ifdef DEBUG
|
||||
static uint callCount = 0;
|
||||
ASSERT ( 0 == callCount++ );
|
||||
#endif
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
53
src/lib/nobug-init.hpp
Normal file
53
src/lib/nobug-init.hpp
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
/*
|
||||
NOBUG-INIT.hpp - pull up NoBug automagically in static initialisation
|
||||
|
||||
|
||||
Copyright (C) Lumiera.org
|
||||
2009, Hermann Vosseler <Ichthyostega@web.de>
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License as
|
||||
published by the Free Software Foundation; either version 2 of the
|
||||
License, or (at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
|
||||
*/
|
||||
|
||||
/** @file nobug-init.hpp
|
||||
** Trigger the basic NoBug initialisation by placing a static variable.
|
||||
** Any facility which uses NoBug (especially logging) already within the
|
||||
** static initialisation phase of the application, should do the include
|
||||
** via this header, which additionally installs a Lifecycle callback to
|
||||
** be run as early as possible.
|
||||
**
|
||||
** @see logging.h
|
||||
**
|
||||
*/
|
||||
|
||||
|
||||
#ifndef NOBUG_INIT_H
|
||||
#define NOBUG_INIT_H
|
||||
|
||||
#include "include/lifecycle.h"
|
||||
|
||||
#include <nobug.h>
|
||||
|
||||
|
||||
|
||||
namespace lumiera {
|
||||
void initialise_NoBug ();
|
||||
|
||||
namespace {
|
||||
LifecycleHook trigger_init_ (ON_BASIC_INIT, &initialise_NoBug);
|
||||
} }
|
||||
|
||||
|
||||
#endif /* NOBUG_INIT_H */
|
||||
|
|
@ -37,6 +37,7 @@ This code is heavily inspired by
|
|||
|
||||
#include "lib/singletonpolicies.hpp" // several Policies usable together with SingletonFactory
|
||||
|
||||
#include "lib/nobug-init.hpp"
|
||||
#include "include/logging.h"
|
||||
#include "lib/util.hpp"
|
||||
#include "lib/sync-classlock.hpp"
|
||||
|
|
@ -82,10 +83,6 @@ namespace lumiera {
|
|||
{
|
||||
if (!pInstance_)
|
||||
{
|
||||
NOBUG_INIT;
|
||||
FIXME ("NoBug wasnt even basically initialized here, the old ON_BASIC_INIT did not initialize it in proper order"
|
||||
" so I explicitly init it here (calling init multiple times does not harm) --cehteh"
|
||||
" nb maybe as exception we can use an explicit mutex here since pthread mutexes can be statically initialized");
|
||||
ThreadLock guard SIDEEFFECT;
|
||||
|
||||
if (!pInstance_)
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@ This code is heavily inspired by
|
|||
#ifndef LUMIERA_SINGLETONPOLICIES_H
|
||||
#define LUMIERA_SINGLETONPOLICIES_H
|
||||
|
||||
#include "lib/nobug-init.hpp"
|
||||
#include "lib/error.hpp"
|
||||
|
||||
#include <vector>
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@
|
|||
#ifndef LIB_SYNC_CLASSLOCK_H
|
||||
#define LIB_SYNC_CLASSLOCK_H
|
||||
|
||||
#include "lib/nobug-init.hpp"
|
||||
#include "lib/sync.hpp"
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue