Added a method to initialize the OpenGLImage loader directly

mworks-project · Jan 14, 2010 · e9975de · e9975de
1 parent 96b669e
commit e9975de
Show file tree

Hide file tree

Showing 34 changed files with 67 additions and 50 deletions.
diff --git a/Core/Communications/Conduits/tests/CodecAwareConduitTest.cpp b/Core/Communications/Conduits/tests/CodecAwareConduitTest.cpp
@@ -13,7 +13,7 @@
 #include "DummyEventTransport.h"
 #include "IPCEventTransport.h"
 
-//<disabled>CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( CodecAwareConduitTestFixture, "Unit Test" );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( CodecAwareConduitTestFixture, "Unit Test" );
 
 using namespace mw;
 

diff --git a/Core/Communications/Conduits/tests/EventHandlerConduitTest.cpp b/Core/Communications/Conduits/tests/EventHandlerConduitTest.cpp
@@ -17,7 +17,7 @@
 
 using namespace mw;
 
-////<disabled>CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( EventStreamConduitTestFixture, "Unit Test" );
+//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( EventStreamConduitTestFixture, "Unit Test" );
 
 
 void EventStreamConduitTestFixture::setUp(){

diff --git a/Core/Communications/Conduits/tests/SimpleConduitTest.cpp b/Core/Communications/Conduits/tests/SimpleConduitTest.cpp
@@ -14,7 +14,7 @@
 
 using namespace mw;
 
-//<disabled>CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( SimpleConduitTestFixture, "Unit Test" );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( SimpleConduitTestFixture, "Unit Test" );
 
 void SimpleEventCollector::handleEvent(shared_ptr<Event> event){
     boost::mutex::scoped_lock lock(last_event_lock);

diff --git a/Core/Communications/PythonConduitServerTest.cpp b/Core/Communications/PythonConduitServerTest.cpp
@@ -28,7 +28,7 @@
 
 using namespace mw;
 
-////<disabled>CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( PythonConduitServerTestFixture, "Unit Test" );
+//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( PythonConduitServerTestFixture, "Unit Test" );
 
 
 void PythonConduitServerTestFixture::setUp(){

diff --git a/Core/Communications/Serialization/tests/SerializationTest.cpp b/Core/Communications/Serialization/tests/SerializationTest.cpp
@@ -15,7 +15,7 @@
 #include <boost/archive/text_oarchive.hpp>
 using namespace mw;
 
-//<disabled>CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( SerializationTestFixture, "Unit Test" );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( SerializationTestFixture, "Unit Test" );
 
 
 void SerializationTestFixture::setUp(){

diff --git a/Core/Communications/Transports/tests/IPCEventTransportTest.cpp b/Core/Communications/Transports/tests/IPCEventTransportTest.cpp
@@ -11,7 +11,7 @@
 #include "IPCEventTransport.h"
 using namespace mw;
 
-//<disabled>CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( IPCEventTransportTestFixture, "Unit Test" );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( IPCEventTransportTestFixture, "Unit Test" );
 
 
 void IPCEventTransportTestFixture::testOneThread(){

diff --git a/Core/DataFiles/tests/DataFileTest.cpp b/Core/DataFiles/tests/DataFileTest.cpp
@@ -24,7 +24,7 @@ using namespace mw;
 #define BUFFER_HIGH_WATER_MARK	1
 #define MAX_EVENTS_TO_BUFFER	10000
 
-//<disabled>CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( DatumFileTestFixture, "Unit Test" );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( DatumFileTestFixture, "Unit Test" );
 //CPPUNIT_TEST_SUITE_REGISTRATION( DatumFileTestFixture );
 
 #define dft_CPPUNIT_ASSERT_TS(x)	dft_cppunit_lock->lock(); \

diff --git a/Core/Events/tests/BufferManagerTest.cpp b/Core/Events/tests/BufferManagerTest.cpp
@@ -43,7 +43,7 @@ void bmt_assert(const std::string &message,
 				const bool assertCondition);
 
 
-//<disabled>CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( BufferManagerTestFixture, "Unit Test" );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( BufferManagerTestFixture, "Unit Test" );
 
 void BufferManagerTestFixture::setUp() {
 	shared_ptr <Clock> shared_clock = Clock::instance(false);

diff --git a/Core/Events/tests/ScarabEventTest.cpp b/Core/Events/tests/ScarabEventTest.cpp
@@ -11,7 +11,7 @@
 #include "EventBuffer.h"
 using namespace mw;
 
-//<disabled>CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ScarabEventTestFixture, "Unit Test" );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ScarabEventTestFixture, "Unit Test" );
 
 void ScarabEventTestFixture::setUp(){
 

diff --git a/Core/GenericStructures/tests/ExpandableListTest.cpp b/Core/GenericStructures/tests/ExpandableListTest.cpp
@@ -11,7 +11,7 @@
 using namespace mw;
 
 
-//<disabled>CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ExpandableListTestFixture, "Unit Test" );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ExpandableListTestFixture, "Unit Test" );
 //CPPUNIT_TEST_SUITE_REGISTRATION( ExpandableListTestFixture );
 
 void ExpandableListTestFixture::setUp(){}

diff --git a/Core/GenericStructures/tests/LinkedListTest.cpp b/Core/GenericStructures/tests/LinkedListTest.cpp
@@ -10,7 +10,7 @@
 #include "LinkedListTest.h"
 using namespace mw;
 
-//<disabled>CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( LinkedListTestFixture, "Unit Test" );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( LinkedListTestFixture, "Unit Test" );
 
 void LinkedListTestFixture::setUp(){
 	a = shared_ptr<StimulusNode>(new StimulusNode());

diff --git a/Core/Interpreters/tests/PerlInterpreterTest.cpp b/Core/Interpreters/tests/PerlInterpreterTest.cpp
@@ -10,5 +10,5 @@
 #include "PerlInterpreterTest.h"
 using namespace mw;
 
-//<disabled>CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( PerlInterpreterTestFixture, "Unit Test" );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( PerlInterpreterTestFixture, "Unit Test" );
 //CPPUNIT_TEST_SUITE_REGISTRATION( PerlInterpreterTestFixture );
diff --git a/Core/ParadigmComponents/tests/ActionTest.cpp b/Core/ParadigmComponents/tests/ActionTest.cpp
@@ -15,7 +15,7 @@
 #include "CancelScheduledActionsAction.h"
 using namespace mw;
 
-//<disabled>CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ActionTestFixture, "Unit Test" );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ActionTestFixture, "Unit Test" );
 
 void ActionTestFixture::testSimpleAssignment1() {
 	shared_ptr<ConstantVariable>c1 = shared_ptr<ConstantVariable>(new ConstantVariable(Datum(M_FLOAT, 7.62)));

diff --git a/Core/PlatformDependent/tests/PlatformDependentServicesTest.cpp b/Core/PlatformDependent/tests/PlatformDependentServicesTest.cpp
@@ -13,7 +13,7 @@
 using namespace mw;
 
 
-//<disabled>CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( PlatformDependentServicesTestFixture, "Unit Test" );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( PlatformDependentServicesTestFixture, "Unit Test" );
 //CPPUNIT_TEST_SUITE_REGISTRATION( PlatformDependentServicesTestFixture );
 
 

diff --git a/Core/RealtimeServices/tests/ClockTest.cpp b/Core/RealtimeServices/tests/ClockTest.cpp
@@ -11,7 +11,7 @@
 #include "Clock.h"
 using namespace mw;
 
-//<disabled>CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ClockTestFixture, "Unit Test" );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ClockTestFixture, "Unit Test" );
 
 void ClockTestFixture::setUp() {
 	shared_ptr <Clock> shared_clock = Clock::instance(false);

diff --git a/Core/RealtimeServices/tests/SchedulerTest.cpp b/Core/RealtimeServices/tests/SchedulerTest.cpp
@@ -12,7 +12,7 @@
 using namespace mw;
 
 
-//<disabled>CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( SchedulerTestFixture, "Unit Test" );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( SchedulerTestFixture, "Unit Test" );
 
 void SchedulerTestFixture::setUp() {
 	shared_ptr <Scheduler> shared_scheduler = Scheduler::instance(false);
@@ -352,7 +352,19 @@ void SchedulerTestFixture::reportLatencies(std::vector<MWTime> times_array,
 		}
 		n++;
 	}
-
+
+#define DO_CUMULATIVE 1
+    if(DO_CUMULATIVE){
+        less_than_10us += less_than_5us;
+        less_than_50us += less_than_10us;
+        less_than_100us += less_than_50us;
+        less_than_500us += less_than_100us;
+        less_than_1000us += less_than_500us;
+        less_than_5000us += less_than_1000us;
+        less_than_10000us += less_than_5000us;
+        less_than_15000us += less_than_10000us;
+    }
+
 	fprintf(stderr, "Latency Statistics...\n"
 			"\t< 5us:  %.4g\n"
 			"\t< 10us:  %.4g\n"

diff --git a/Core/RealtimeServices/tests/SchedulerTest.h b/Core/RealtimeServices/tests/SchedulerTest.h
@@ -16,7 +16,7 @@
 namespace mw {
 #define N_SCHEDULED_EXECUTIONS	100
 #define SLACK_MARGIN	5
-#define ACCEPTABLE_ERROR_US	10000  // 10 ms
+#define ACCEPTABLE_ERROR_US	1000 // 100 us
 
 void *chaff_1(const MWTime interval);
 
@@ -37,12 +37,12 @@ class SchedulerTestFixture : public FullCoreEnvironmentTestFixture {
 
 	CPPUNIT_TEST_SUITE( SchedulerTestFixture );
 
-//	CPPUNIT_TEST( testPeriod10HzNoPayload );
-//	CPPUNIT_TEST( testPeriod100HzNoPayload );
-//	CPPUNIT_TEST( testPeriod10HzNoPayloadChaffX4 );
+	CPPUNIT_TEST( testPeriod10HzNoPayload );
+	CPPUNIT_TEST( testPeriod100HzNoPayload );
+	CPPUNIT_TEST( testPeriod10HzNoPayloadChaffX4 );
 	//CPPUNIT_TEST( testPeriod10HzNoPayloadChaffX20 );
-//	CPPUNIT_TEST( testPeriod10HzSmallPayload );
-//	CPPUNIT_TEST( testOneOffFiringSmallPayload );	
+	CPPUNIT_TEST( testPeriod10HzSmallPayload );
+	CPPUNIT_TEST( testOneOffFiringSmallPayload );	
 
 	CPPUNIT_TEST (testSchedulerLeaks);
 

diff --git a/Core/RealtimeServices/tests/TimerTest.cpp b/Core/RealtimeServices/tests/TimerTest.cpp
@@ -11,7 +11,7 @@
 #include "MonkeyWorksCore/TrialBuildingBlocks.h"
 #include "MonkeyWorksCore/GlobalVariable.h"
 
-////<disabled>CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TimerTestFixture, "Unit Test" );
+//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TimerTestFixture, "Unit Test" );
 
 
 #include <mach/mach_types.h>

diff --git a/Core/Scarab/tests/ScarabDataTest.cpp b/Core/Scarab/tests/ScarabDataTest.cpp
@@ -10,5 +10,5 @@
 #include "ScarabDataTest.h"
 using namespace mw;
 
-//<disabled>CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ScarabDataTestFixture, "Unit Test" );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ScarabDataTestFixture, "Unit Test" );
 //CPPUNIT_TEST_SUITE_REGISTRATION( ScarabDataTestFixture );
diff --git a/Core/Scarab/tests/ScarabFileTest.cpp b/Core/Scarab/tests/ScarabFileTest.cpp
@@ -10,5 +10,5 @@
 #include "ScarabFileTest.h"
 using namespace mw;
 
-//<disabled>CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ScarabFileTestFixture, "Unit Test" );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ScarabFileTestFixture, "Unit Test" );
 //CPPUNIT_TEST_SUITE_REGISTRATION( ScarabFileTestFixture );
diff --git a/Core/Scarab/tests/ScarabNetworkTest.cpp b/Core/Scarab/tests/ScarabNetworkTest.cpp
@@ -10,5 +10,5 @@
 #include "ScarabNetworkTest.h"
 using namespace mw;
 
-//<disabled>CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ScarabNetworkTestFixture, "Unit Test" );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ScarabNetworkTestFixture, "Unit Test" );
 //CPPUNIT_TEST_SUITE_REGISTRATION( ScarabNetworkTestFixture );
diff --git a/Core/Stimuli/StandardStimuli.cpp b/Core/Stimuli/StandardStimuli.cpp
@@ -534,6 +534,20 @@ shared_ptr<mw::Component> BlankScreenFactory::createObject(std::map<std::string,
 bool OpenGLImageLoader::initialized = false;
 Lockable *OpenGLImageLoader::lock = NULL;
 
+void OpenGLImageLoader::initialize(){
+    mprintf("initializing image loader facility");
+    OpenGLImageLoader::lock = new Lockable();
+    lock = OpenGLImageLoader::lock;
+
+    //lock->lock();
+    ilInit();
+    ilutInit();
+    ilutRenderer(ILUT_OPENGL);
+    ilutEnable(ILUT_OPENGL_CONV);
+    //lock->unlock();
+    OpenGLImageLoader::initialized = true;   
+}
+
 GLuint OpenGLImageLoader::load(std::string filename, StimulusDisplay *display,
                                                     int *width, int *height) {
 
@@ -785,17 +799,7 @@ GLuint OpenGLImageLoader::load(std::string filename, StimulusDisplay *display,
 	fclose(test);
 
     if(1 || !OpenGLImageLoader::initialized) {
-		mprintf("initializing image loader facility");
-		OpenGLImageLoader::lock = new Lockable();
-        lock = OpenGLImageLoader::lock;
-
-		//lock->lock();
-		ilInit();
-        ilutInit();
-        ilutRenderer(ILUT_OPENGL);
-		ilutEnable(ILUT_OPENGL_CONV);
-        //lock->unlock();
-		OpenGLImageLoader::initialized = true;
+        OpenGLImageLoader::initialize();
     }
 
 

diff --git a/Core/Stimuli/StandardStimuli.h b/Core/Stimuli/StandardStimuli.h
@@ -110,7 +110,8 @@ class OpenGLImageLoader {
 		static bool initialized;
 		static Lockable *lock;
 
-		static GLuint load(std::string filename, StimulusDisplay *display,
+        static void initialize();
+        static GLuint load(std::string filename, StimulusDisplay *display,
                                                    int *width, int *height);
 };
 

diff --git a/Core/Triggers/tests/TriggerTest.cpp b/Core/Triggers/tests/TriggerTest.cpp
@@ -10,5 +10,5 @@
 #include "TriggerTest.h"
 using namespace mw;
 
-//<disabled>CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TriggerTestFixture, "Unit Test" );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TriggerTestFixture, "Unit Test" );
 //CPPUNIT_TEST_SUITE_REGISTRATION( TriggerTestFixture );
diff --git a/Core/Utilities/tests/RegisteredSingletonTests.cpp b/Core/Utilities/tests/RegisteredSingletonTests.cpp
@@ -17,7 +17,7 @@ SINGLETON_INSTANCE_STATIC_DECLARATION(Dummy)
 
 #define NUMBER_OF_SINGLETON_TEST_LOOPS 10
 
-//<disabled>CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( RegisteredSingletonTestFixture, "Unit Test" );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( RegisteredSingletonTestFixture, "Unit Test" );
 
 void RegisteredSingletonTestFixture::setUp() {
 	boost::shared_ptr <Dummy> dummy_instance = Dummy::instance(false);

diff --git a/Core/Variables/tests/GenericDataTest.cpp b/Core/Variables/tests/GenericDataTest.cpp
@@ -10,7 +10,7 @@
 #include "GenericDataTest.h"
 using namespace mw;
 
-//<disabled>CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( GenericDataTestFixture, "Unit Test" );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( GenericDataTestFixture, "Unit Test" );
 //CPPUNIT_TEST_SUITE_REGISTRATION( GenericDataTestFixture );
 
 

diff --git a/Core/Variables/tests/ParsedExpressionVariableTest.cpp b/Core/Variables/tests/ParsedExpressionVariableTest.cpp
@@ -14,7 +14,7 @@
 #include "EventBuffer.h"
 using namespace mw;
 
-//<disabled>CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ParsedExpressionVariableTestFixture, "Unit Test" );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ParsedExpressionVariableTestFixture, "Unit Test" );
 
 void ParsedExpressionVariableTestFixture::testSimpleExpression() {
 

diff --git a/Core/Variables/tests/ScopedVariableTest.cpp b/Core/Variables/tests/ScopedVariableTest.cpp
@@ -14,7 +14,7 @@
 using namespace mw;
 
 
-//<disabled>CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ScopedVariableTestFixture, "Unit Test" );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ScopedVariableTestFixture, "Unit Test" );
 
 void ScopedVariableTestFixture::setUp(){
 	FullCoreEnvironmentTestFixture::setUp();

diff --git a/Core/Variables/tests/SelectionVariableTest.cpp b/Core/Variables/tests/SelectionVariableTest.cpp
@@ -15,7 +15,7 @@
 #include "Clock.h"
 using namespace mw;
 
-//<disabled>CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( SelectionVariableTestFixture, "Unit Test" );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( SelectionVariableTestFixture, "Unit Test" );
 //CPPUNIT_TEST_SUITE_REGISTRATION( SelectionVariableTestFixture );
 
 

diff --git a/Core/Variables/tests/VariablePropertiesTest.cpp b/Core/Variables/tests/VariablePropertiesTest.cpp
@@ -11,7 +11,7 @@
 #include "EventBuffer.h"
 using namespace mw;
 
-//<disabled>CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( VariablePropertiesTestFixture, "Unit Test" );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( VariablePropertiesTestFixture, "Unit Test" );
 
 void VariablePropertiesTestFixture::setUp(){
 	// Create a variable registry

diff --git a/Core/Variables/tests/VariableTest.cpp b/Core/Variables/tests/VariableTest.cpp
@@ -12,7 +12,7 @@
 #include "TrialBuildingBlocks.h"
 using namespace mw;
 
-//<disabled>CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( VariableTestFixture, "Unit Test" );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( VariableTestFixture, "Unit Test" );
 
 void VariableTestFixture::testSimpleConstant() {
  Datum seven_point_six_two(M_FLOAT, 7.62);

diff --git a/Core/Variables/tests/VectorTest.cpp b/Core/Variables/tests/VectorTest.cpp
@@ -10,5 +10,5 @@
 #include "VectorTest.h"
 using namespace mw;
 
-//<disabled>CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( VectorTestFixture, "Unit Test" );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( VectorTestFixture, "Unit Test" );
 //CPPUNIT_TEST_SUITE_REGISTRATION( VectorTestFixture );
diff --git a/Core/XMLParser/XMLParserTest.cpp b/Core/XMLParser/XMLParserTest.cpp
@@ -16,7 +16,7 @@
 #include "MonkeyWorksCore/VariableSave.h"
 
 
-//<disabled>CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( mw::XMLParserTestFixture, "Unit Test" );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( mw::XMLParserTestFixture, "Unit Test" );
 
 void mw::XMLParserTestFixture::setUp() {
 	mw::FullCoreEnvironmentTestFixture::setUp();

diff --git a/UnitTests/BoostMathExampleTest.cpp b/UnitTests/BoostMathExampleTest.cpp
@@ -21,7 +21,7 @@
 
 using namespace mw;
 
-//<disabled>CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( BoostMathExampleTestFixture, "Unit Test" );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( BoostMathExampleTestFixture, "Unit Test" );
 //CPPUNIT_TEST_SUITE_REGISTRATION( BoostMathExampleTestFixture );