[Hdrflow-svn] SF.net SVN: hdrflow: [81] lib/openlibraries
Status: Pre-Alpha
Brought to you by:
glslang
Menu
▾
▴
[Hdrflow-svn] SF.net SVN: hdrflow: [81] lib/openlibraries
|
From: <gl...@us...> - 2007-04-14 22:44:42
|
Revision: 81
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=81&view=rev
Author: glslang
Date: 2007-04-14 15:44:40 -0700 (Sat, 14 Apr 2007)
Log Message:
-----------
+ tm benchmark
+ disable thread awareness of dlls
Modified Paths:
--------------
lib/openlibraries/openlibraries_vc8.sln
lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp
lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
lib/openlibraries/src/openpluginlib/py/py.cpp
Added Paths:
-----------
lib/openlibraries/test/openeffectslib/
lib/openlibraries/test/openeffectslib/tm_bench/
lib/openlibraries/test/openeffectslib/tm_bench/tm_bench.cpp
lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj
Modified: lib/openlibraries/openlibraries_vc8.sln
===================================================================
--- lib/openlibraries/openlibraries_vc8.sln 2007-04-13 22:04:25 UTC (rev 80)
+++ lib/openlibraries/openlibraries_vc8.sln 2007-04-14 22:44:40 UTC (rev 81)
@@ -391,6 +391,13 @@
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tm_bench", "test\openeffectslib\tm_bench\tm_bench_vc8.vcproj", "{534B6931-67CB-4ACA-BD58-6887F35AC4D9}"
+ ProjectSection(ProjectDependencies) = postProject
+ {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
+ {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
+ {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Multi-threaded Debug DLL|Win32 = Multi-threaded Debug DLL|Win32
@@ -629,6 +636,10 @@
{6D618CAE-230F-4ADD-936B-6C1D3D723236}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{6D618CAE-230F-4ADD-936B-6C1D3D723236}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{6D618CAE-230F-4ADD-936B-6C1D3D723236}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
+ {534B6931-67CB-4ACA-BD58-6887F35AC4D9}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
+ {534B6931-67CB-4ACA-BD58-6887F35AC4D9}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
+ {534B6931-67CB-4ACA-BD58-6887F35AC4D9}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
+ {534B6931-67CB-4ACA-BD58-6887F35AC4D9}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -669,6 +680,7 @@
{BD86F550-C573-4A68-955B-6CEDCC8F595D} = {FE28E322-51C9-4979-9A0A-93055023A503}
{9483FC7B-E396-43E6-84ED-EB021AC54252} = {FE28E322-51C9-4979-9A0A-93055023A503}
{C85EDDFB-1A91-4ABD-8E86-6AFDF0C85CBA} = {67E6C3A2-E542-4D5D-A4A4-61DF5CD73711}
+ {534B6931-67CB-4ACA-BD58-6887F35AC4D9} = {C2D61212-6194-4B66-837B-E8A2FA29AB0E}
{14B49ECE-F5DB-4985-A31D-C48483362F9F} = {135B4433-9BD9-42C8-A552-61CA0CBA6CDC}
{E6EFFB88-1563-4AB7-9D07-5B8853CD8ECF} = {135B4433-9BD9-42C8-A552-61CA0CBA6CDC}
{B972DCEB-386E-42D2-8C5E-DD2942EC7F63} = {BEF92EC2-7872-48E2-BF6F-3DE4EBA9C037}
Modified: lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp
===================================================================
--- lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp 2007-04-13 22:04:25 UTC (rev 80)
+++ lib/openlibraries/src/openpluginlib/pl/openpluginlib.cpp 2007-04-14 22:44:40 UTC (rev 81)
@@ -277,6 +277,16 @@
}
}
+#ifdef WIN32
+extern "C" BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
+{
+ if( fdwReason == DLL_PROCESS_ATTACH )
+ DisableThreadLibraryCalls( hInstDLL );
+
+ return TRUE;
+}
+#endif
+
bool init( const string& lookup_path )
{
boost::recursive_mutex::scoped_lock lock( mutex );
Modified: lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
===================================================================
--- lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2007-04-13 22:04:25 UTC (rev 80)
+++ lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2007-04-14 22:44:40 UTC (rev 81)
@@ -72,6 +72,7 @@
AdditionalLibraryDirectories="C:\Boost\lib;"C:\Program Files\NVIDIA Corporation\Cg\lib""
GenerateDebugInformation="true"
SubSystem="2"
+ EntryPointSymbol=""
ImportLibrary="$(TargetDir)openpluginlib_pl-vc80-d-0_4_0.lib"
TargetMachine="1"
/>
@@ -361,11 +362,11 @@
>
</File>
<File
- RelativePath=".\property.hpp"
+ RelativePath=".\pcos\property.hpp"
>
</File>
<File
- RelativePath=".\pcos\property.hpp"
+ RelativePath=".\property.hpp"
>
</File>
<File
Modified: lib/openlibraries/src/openpluginlib/py/py.cpp
===================================================================
--- lib/openlibraries/src/openpluginlib/py/py.cpp 2007-04-13 22:04:25 UTC (rev 80)
+++ lib/openlibraries/src/openpluginlib/py/py.cpp 2007-04-14 22:44:40 UTC (rev 81)
@@ -5,6 +5,12 @@
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
+#ifdef WIN32
+#define STRICT
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#endif
+
#include <openpluginlib/py/python.hpp>
#include <openpluginlib/py/py.hpp>
@@ -25,3 +31,13 @@
opl::detail::py_pcos_property( );
opl::detail::py_pcos_visitor( );
}
+
+#ifdef WIN32
+extern "C" BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
+{
+ if( fdwReason == DLL_PROCESS_ATTACH )
+ DisableThreadLibraryCalls( hInstDLL );
+
+ return TRUE;
+}
+#endif
Added: lib/openlibraries/test/openeffectslib/tm_bench/tm_bench.cpp
===================================================================
--- lib/openlibraries/test/openeffectslib/tm_bench/tm_bench.cpp (rev 0)
+++ lib/openlibraries/test/openeffectslib/tm_bench/tm_bench.cpp 2007-04-14 22:44:40 UTC (rev 81)
@@ -0,0 +1,38 @@
+
+// el - A effects library representation.
+
+// Copyright (C) 2007 Goncalo N. M. de Carvalho
+// Released under the GPL.
+// For more information, see http://www.openlibraries.org.
+
+#include <iostream>
+
+#include <openpluginlib/pl/openpluginlib.hpp>
+#include <openpluginlib/pl/timer.hpp>
+#include <openmedialib/ml/ml.hpp>
+
+namespace ml = olib::openmedialib::ml;
+namespace pl = olib::openpluginlib;
+
+int main( int argc, char* argv[ ] )
+{
+ pl::init( "" );
+
+ ml::input_type_ptr input = ml::create_input( pl::string( argv[ 1 ] ) + pl::string( "/sequence:" ) );
+ ml::filter_type_ptr filter = ml::create_filter( L"tm_linear" );
+
+ pl::rdtsc_default_timer r;
+
+ r.reset( );
+ r.start( );
+
+ if( input && filter )
+ {
+ filter->connect( input );
+ filter->fetch( );
+ }
+
+ r.stop( );
+ pl::rdtsc_default_timer::value_type elapsed = r.elapsed( );
+ std::cout << "rdtsc: elapsed time is " << elapsed.tv_sec << " seconds and " << elapsed.tv_usec << " microseconds.\n";
+}
Property changes on: lib/openlibraries/test/openeffectslib/tm_bench/tm_bench.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Added: lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj
===================================================================
--- lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj (rev 0)
+++ lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj 2007-04-14 22:44:40 UTC (rev 81)
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="tm_bench"
+ ProjectGUID="{534B6931-67CB-4ACA-BD58-6887F35AC4D9}"
+ RootNamespace="tm_bench"
+ Keyword="Win32Proj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Multi-threaded Debug DLL|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="$(SolutionDir)\src;"C:\Boost\include\boost-1_33_1""
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING;HAVE_CG_RUNTIME;HAVE_BOOST_FILESYSTEM"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="4"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ DisableSpecificWarnings="4503"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories="C:\Boost\lib"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Multi-threaded Release DLL|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="$(SolutionDir)\src;"C:\Boost\include\boost-1_33_1""
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;OPENMEDIALIB_BUILD;HAVE_FLEX_STRING;HAVE_CG_RUNTIME;HAVE_BOOST_FILESYSTEM"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="4"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4503"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="C:\Boost\lib"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath=".\tm_bench.cpp"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ <File
+ RelativePath=".\VTune\tm_bench.vpj"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Property changes on: lib/openlibraries/test/openeffectslib/tm_bench/tm_bench_vc8.vcproj
___________________________________________________________________
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
