[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48260] trunk/blender: optionally use guarded alloc for tiles compositor, also replace allocation functions with a macro.
Campbell Barton
ideasman42 at gmail.com
Mon Jun 25 11:14:48 CEST 2012
Revision: 48260
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48260
Author: campbellbarton
Date: 2012-06-25 09:14:37 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
optionally use guarded alloc for tiles compositor, also replace allocation functions with a macro.
Modified Paths:
--------------
trunk/blender/intern/ghost/GHOST_IEvent.h
trunk/blender/intern/ghost/GHOST_IEventConsumer.h
trunk/blender/intern/ghost/GHOST_IWindow.h
trunk/blender/intern/ghost/GHOST_Rect.h
trunk/blender/intern/ghost/intern/GHOST_WindowManager.h
trunk/blender/intern/guardedalloc/MEM_guardedalloc.h
trunk/blender/intern/string/STR_String.h
trunk/blender/source/blender/compositor/intern/COM_Converter.h
trunk/blender/source/blender/compositor/intern/COM_Device.h
trunk/blender/source/blender/compositor/intern/COM_ExecutionGroup.h
trunk/blender/source/blender/compositor/intern/COM_ExecutionSystem.h
trunk/blender/source/blender/compositor/intern/COM_ExecutionSystemHelper.h
trunk/blender/source/blender/compositor/intern/COM_MemoryBuffer.h
trunk/blender/source/blender/compositor/intern/COM_MemoryProxy.h
trunk/blender/source/blender/compositor/intern/COM_NodeBase.h
trunk/blender/source/blender/compositor/intern/COM_Socket.h
trunk/blender/source/blender/compositor/intern/COM_SocketConnection.h
trunk/blender/source/blender/compositor/intern/COM_SocketReader.h
trunk/blender/source/blender/compositor/intern/COM_WorkPackage.h
trunk/blender/source/blender/compositor/intern/COM_WorkScheduler.h
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderSystem.h
trunk/blender/source/gameengine/Converter/BL_DeformableGameObject.h
trunk/blender/source/gameengine/Converter/BL_MeshDeformer.h
trunk/blender/source/gameengine/Converter/BL_ModifierDeformer.h
trunk/blender/source/gameengine/Converter/BL_ShapeDeformer.h
trunk/blender/source/gameengine/Converter/BL_SkinDeformer.h
trunk/blender/source/gameengine/Converter/BlenderWorldInfo.h
trunk/blender/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.h
trunk/blender/source/gameengine/Converter/KX_SoftBodyDeformer.h
trunk/blender/source/gameengine/Expressions/BoolValue.h
trunk/blender/source/gameengine/Expressions/ConstExpr.h
trunk/blender/source/gameengine/Expressions/EmptyValue.h
trunk/blender/source/gameengine/Expressions/ErrorValue.h
trunk/blender/source/gameengine/Expressions/Expression.h
trunk/blender/source/gameengine/Expressions/FloatValue.h
trunk/blender/source/gameengine/Expressions/IdentifierExpr.h
trunk/blender/source/gameengine/Expressions/IfExpr.h
trunk/blender/source/gameengine/Expressions/InputParser.h
trunk/blender/source/gameengine/Expressions/IntValue.h
trunk/blender/source/gameengine/Expressions/KX_HashedPtr.h
trunk/blender/source/gameengine/Expressions/Operator1Expr.h
trunk/blender/source/gameengine/Expressions/Operator2Expr.h
trunk/blender/source/gameengine/Expressions/PyObjectPlus.h
trunk/blender/source/gameengine/Expressions/StringValue.h
trunk/blender/source/gameengine/Expressions/Value.h
trunk/blender/source/gameengine/Expressions/VectorValue.h
trunk/blender/source/gameengine/Expressions/VoidValue.h
trunk/blender/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
trunk/blender/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
trunk/blender/source/gameengine/GameLogic/SCA_BasicEventManager.h
trunk/blender/source/gameengine/GameLogic/SCA_EventManager.h
trunk/blender/source/gameengine/GameLogic/SCA_ExpressionController.h
trunk/blender/source/gameengine/GameLogic/SCA_IActuator.h
trunk/blender/source/gameengine/GameLogic/SCA_IInputDevice.h
trunk/blender/source/gameengine/GameLogic/SCA_IScene.h
trunk/blender/source/gameengine/GameLogic/SCA_JoystickManager.h
trunk/blender/source/gameengine/GameLogic/SCA_KeyboardManager.h
trunk/blender/source/gameengine/GameLogic/SCA_LogicManager.h
trunk/blender/source/gameengine/GameLogic/SCA_MouseManager.h
trunk/blender/source/gameengine/GameLogic/SCA_PropertyEventManager.h
trunk/blender/source/gameengine/GameLogic/SCA_RandomEventManager.h
trunk/blender/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h
trunk/blender/source/gameengine/GameLogic/SCA_TimeEventManager.h
trunk/blender/source/gameengine/Ketsji/BL_Action.h
trunk/blender/source/gameengine/Ketsji/BL_ActionManager.h
trunk/blender/source/gameengine/Ketsji/BL_BlenderShader.h
trunk/blender/source/gameengine/Ketsji/BL_Material.h
trunk/blender/source/gameengine/Ketsji/BL_Shader.h
trunk/blender/source/gameengine/Ketsji/BL_Texture.h
trunk/blender/source/gameengine/Ketsji/KX_BulletPhysicsController.h
trunk/blender/source/gameengine/Ketsji/KX_CameraIpoSGController.h
trunk/blender/source/gameengine/Ketsji/KX_ClientObjectInfo.h
trunk/blender/source/gameengine/Ketsji/KX_Dome.h
trunk/blender/source/gameengine/Ketsji/KX_EmptyObject.h
trunk/blender/source/gameengine/Ketsji/KX_FontObject.h
trunk/blender/source/gameengine/Ketsji/KX_IInterpolator.h
trunk/blender/source/gameengine/Ketsji/KX_IPO_SGController.h
trunk/blender/source/gameengine/Ketsji/KX_IPhysicsController.h
trunk/blender/source/gameengine/Ketsji/KX_IScalarInterpolator.h
trunk/blender/source/gameengine/Ketsji/KX_ISceneConverter.h
trunk/blender/source/gameengine/Ketsji/KX_ISystem.h
trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.h
trunk/blender/source/gameengine/Ketsji/KX_LightIpoSGController.h
trunk/blender/source/gameengine/Ketsji/KX_MaterialIpoController.h
trunk/blender/source/gameengine/Ketsji/KX_MotionState.h
trunk/blender/source/gameengine/Ketsji/KX_ObColorIpoSGController.h
trunk/blender/source/gameengine/Ketsji/KX_OrientationInterpolator.h
trunk/blender/source/gameengine/Ketsji/KX_PositionInterpolator.h
trunk/blender/source/gameengine/Ketsji/KX_RayCast.h
trunk/blender/source/gameengine/Ketsji/KX_RayEventManager.h
trunk/blender/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h
trunk/blender/source/gameengine/Ketsji/KX_SG_NodeRelationships.h
trunk/blender/source/gameengine/Ketsji/KX_ScalarInterpolator.h
trunk/blender/source/gameengine/Ketsji/KX_ScalingInterpolator.h
trunk/blender/source/gameengine/Ketsji/KX_TimeCategoryLogger.h
trunk/blender/source/gameengine/Ketsji/KX_TimeLogger.h
trunk/blender/source/gameengine/Ketsji/KX_TouchEventManager.h
trunk/blender/source/gameengine/Ketsji/KX_WorldInfo.h
trunk/blender/source/gameengine/Ketsji/KX_WorldIpoController.h
trunk/blender/source/gameengine/Network/NG_NetworkDeviceInterface.h
trunk/blender/source/gameengine/Network/NG_NetworkMessage.h
trunk/blender/source/gameengine/Network/NG_NetworkObject.h
trunk/blender/source/gameengine/Network/NG_NetworkScene.h
trunk/blender/source/gameengine/Physics/Bullet/CcdGraphicController.h
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.h
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
trunk/blender/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
trunk/blender/source/gameengine/Physics/common/PHY_IController.h
trunk/blender/source/gameengine/Physics/common/PHY_IGraphicController.h
trunk/blender/source/gameengine/Physics/common/PHY_IMotionState.h
trunk/blender/source/gameengine/Physics/common/PHY_IPhysicsController.h
trunk/blender/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
trunk/blender/source/gameengine/Physics/common/PHY_IVehicle.h
trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.h
trunk/blender/source/gameengine/Rasterizer/RAS_BucketManager.h
trunk/blender/source/gameengine/Rasterizer/RAS_Deformer.h
trunk/blender/source/gameengine/Rasterizer/RAS_FramingManager.h
trunk/blender/source/gameengine/Rasterizer/RAS_ICanvas.h
trunk/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
trunk/blender/source/gameengine/Rasterizer/RAS_IRasterizer.h
trunk/blender/source/gameengine/Rasterizer/RAS_IRenderTools.h
trunk/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.h
trunk/blender/source/gameengine/Rasterizer/RAS_MeshObject.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
trunk/blender/source/gameengine/Rasterizer/RAS_Polygon.h
trunk/blender/source/gameengine/Rasterizer/RAS_Rect.h
trunk/blender/source/gameengine/Rasterizer/RAS_TexVert.h
trunk/blender/source/gameengine/SceneGraph/SG_BBox.h
trunk/blender/source/gameengine/SceneGraph/SG_Controller.h
trunk/blender/source/gameengine/SceneGraph/SG_DList.h
trunk/blender/source/gameengine/SceneGraph/SG_IObject.h
trunk/blender/source/gameengine/SceneGraph/SG_Node.h
trunk/blender/source/gameengine/SceneGraph/SG_ParentRelation.h
trunk/blender/source/gameengine/SceneGraph/SG_QList.h
trunk/blender/source/gameengine/SceneGraph/SG_Spatial.h
trunk/blender/source/gameengine/SceneGraph/SG_Tree.h
Modified: trunk/blender/intern/ghost/GHOST_IEvent.h
===================================================================
--- trunk/blender/intern/ghost/GHOST_IEvent.h 2012-06-25 08:58:50 UTC (rev 48259)
+++ trunk/blender/intern/ghost/GHOST_IEvent.h 2012-06-25 09:14:37 UTC (rev 48260)
@@ -86,13 +86,7 @@
virtual GHOST_TEventDataPtr getData() = 0;
#ifdef WITH_CXX_GUARDEDALLOC
-public:
- void *operator new(size_t num_bytes) {
- return MEM_mallocN(num_bytes, "GHOST:GHOST_IEvent");
- }
- void operator delete(void *mem) {
- MEM_freeN(mem);
- }
+ MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_IEvent")
#endif
};
Modified: trunk/blender/intern/ghost/GHOST_IEventConsumer.h
===================================================================
--- trunk/blender/intern/ghost/GHOST_IEventConsumer.h 2012-06-25 08:58:50 UTC (rev 48259)
+++ trunk/blender/intern/ghost/GHOST_IEventConsumer.h 2012-06-25 09:14:37 UTC (rev 48260)
@@ -64,9 +64,7 @@
virtual bool processEvent(GHOST_IEvent *event) = 0;
#ifdef WITH_CXX_GUARDEDALLOC
-public:
- void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GHOST:GHOST_IEventConsumer"); }
- void operator delete( void *mem ) { MEM_freeN(mem); }
+ MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_IEventConsumer")
#endif
};
Modified: trunk/blender/intern/ghost/GHOST_IWindow.h
===================================================================
--- trunk/blender/intern/ghost/GHOST_IWindow.h 2012-06-25 08:58:50 UTC (rev 48259)
+++ trunk/blender/intern/ghost/GHOST_IWindow.h 2012-06-25 09:14:37 UTC (rev 48260)
@@ -306,9 +306,7 @@
virtual GHOST_TSuccess setCursorGrab(GHOST_TGrabCursorMode mode, GHOST_Rect *bounds) { return GHOST_kSuccess; }
#ifdef WITH_CXX_GUARDEDALLOC
-public:
- void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GHOST:GHOST_IWindow"); }
- void operator delete( void *mem ) { MEM_freeN(mem); }
+ MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_IWindow")
#endif
};
Modified: trunk/blender/intern/ghost/GHOST_Rect.h
===================================================================
--- trunk/blender/intern/ghost/GHOST_Rect.h 2012-06-25 08:58:50 UTC (rev 48259)
+++ trunk/blender/intern/ghost/GHOST_Rect.h 2012-06-25 09:14:37 UTC (rev 48260)
@@ -190,9 +190,7 @@
GHOST_TInt32 m_b;
#ifdef WITH_CXX_GUARDEDALLOC
-public:
- void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GHOST:GHOST_Rect"); }
- void operator delete( void *mem ) { MEM_freeN(mem); }
+ MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_Rect")
#endif
};
Modified: trunk/blender/intern/ghost/intern/GHOST_WindowManager.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowManager.h 2012-06-25 08:58:50 UTC (rev 48259)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowManager.h 2012-06-25 09:14:37 UTC (rev 48260)
@@ -162,9 +162,7 @@
GHOST_IWindow *m_activeWindowBeforeFullScreen;
#ifdef WITH_CXX_GUARDEDALLOC
-public:
- void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GHOST:GHOST_WindowManager"); }
- void operator delete( void *mem ) { MEM_freeN(mem); }
+ MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_WindowManager")
#endif
};
Modified: trunk/blender/intern/guardedalloc/MEM_guardedalloc.h
===================================================================
--- trunk/blender/intern/guardedalloc/MEM_guardedalloc.h 2012-06-25 08:58:50 UTC (rev 48259)
+++ trunk/blender/intern/guardedalloc/MEM_guardedalloc.h 2012-06-25 09:14:37 UTC (rev 48260)
@@ -167,8 +167,22 @@
#ifndef NDEBUG
const char *MEM_name_ptr(void *vmemh);
#endif
-
+
#ifdef __cplusplus
+/* alloc funcs for C++ only */
+#define MEM_CXX_CLASS_ALLOC_FUNCS(_id) \
+public: \
+ void *operator new(size_t num_bytes) { \
+ return MEM_mallocN(num_bytes, _id); \
+ } \
+ void operator delete(void *mem) { \
+ MEM_freeN(mem); \
+ } \
+
+#endif
+
+
+#ifdef __cplusplus
}
#endif
Modified: trunk/blender/intern/string/STR_String.h
===================================================================
--- trunk/blender/intern/string/STR_String.h 2012-06-25 08:58:50 UTC (rev 48259)
+++ trunk/blender/intern/string/STR_String.h 2012-06-25 09:14:37 UTC (rev 48260)
@@ -204,9 +204,7 @@
#ifdef WITH_CXX_GUARDEDALLOC
-public:
- void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "CXX:STR_String"); }
- void operator delete(void *mem) { MEM_freeN(mem); }
+ MEM_CXX_CLASS_ALLOC_FUNCS("CXX:STR_String")
#endif
};
Modified: trunk/blender/source/blender/compositor/intern/COM_Converter.h
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_Converter.h 2012-06-25 08:58:50 UTC (rev 48259)
+++ trunk/blender/source/blender/compositor/intern/COM_Converter.h 2012-06-25 09:14:37 UTC (rev 48260)
@@ -66,5 +66,9 @@
* @see SocketConnection - a link between two sockets
*/
static void convertResolution(SocketConnection *connection, ExecutionSystem *system);
+
+#ifdef WITH_CXX_GUARDEDALLOC
+ MEM_CXX_CLASS_ALLOC_FUNCS("COM:Converter")
+#endif
};
#endif
Modified: trunk/blender/source/blender/compositor/intern/COM_Device.h
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_Device.h 2012-06-25 08:58:50 UTC (rev 48259)
+++ trunk/blender/source/blender/compositor/intern/COM_Device.h 2012-06-25 09:14:37 UTC (rev 48260)
@@ -48,6 +48,9 @@
*/
virtual void execute(WorkPackage *work) = 0;
+#ifdef WITH_CXX_GUARDEDALLOC
+ MEM_CXX_CLASS_ALLOC_FUNCS("COM:Device")
+#endif
};
#endif
Modified: trunk/blender/source/blender/compositor/intern/COM_ExecutionGroup.h
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_ExecutionGroup.h 2012-06-25 08:58:50 UTC (rev 48259)
+++ trunk/blender/source/blender/compositor/intern/COM_ExecutionGroup.h 2012-06-25 09:14:37 UTC (rev 48260)
@@ -394,7 +394,10 @@
* @see ExecutionSystem.execute
*/
CompositorPriority getRenderPriotrity();
-
+
+#ifdef WITH_CXX_GUARDEDALLOC
+ MEM_CXX_CLASS_ALLOC_FUNCS("COM:ExecutionGroup")
+#endif
};
#endif
Modified: trunk/blender/source/blender/compositor/intern/COM_ExecutionSystem.h
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_ExecutionSystem.h 2012-06-25 08:58:50 UTC (rev 48259)
+++ trunk/blender/source/blender/compositor/intern/COM_ExecutionSystem.h 2012-06-25 09:14:37 UTC (rev 48260)
@@ -232,5 +232,9 @@
void executeGroups(CompositorPriority priority);
+#ifdef WITH_CXX_GUARDEDALLOC
+ MEM_CXX_CLASS_ALLOC_FUNCS("COM:ExecutionSystem")
+#endif
};
-#endif
+
+#endif /* _COM_ExecutionSystem_h */
Modified: trunk/blender/source/blender/compositor/intern/COM_ExecutionSystemHelper.h
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_ExecutionSystemHelper.h 2012-06-25 08:58:50 UTC (rev 48259)
+++ trunk/blender/source/blender/compositor/intern/COM_ExecutionSystemHelper.h 2012-06-25 09:14:37 UTC (rev 48260)
@@ -123,5 +123,10 @@
* @param system the execution system to dump
*/
static void debugDump(ExecutionSystem *system);
+
+#ifdef WITH_CXX_GUARDEDALLOC
+ MEM_CXX_CLASS_ALLOC_FUNCS("COM:ExecutionSystemHelper")
+#endif
};
-#endif
+
+#endif /* _COM_ExecutionSystemHelper_h */
Modified: trunk/blender/source/blender/compositor/intern/COM_MemoryBuffer.h
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_MemoryBuffer.h 2012-06-25 08:58:50 UTC (rev 48259)
+++ trunk/blender/source/blender/compositor/intern/COM_MemoryBuffer.h 2012-06-25 09:14:37 UTC (rev 48260)
@@ -166,6 +166,10 @@
float *convertToValueBuffer();
private:
unsigned int determineBufferSize();
+
+#ifdef WITH_CXX_GUARDEDALLOC
+ MEM_CXX_CLASS_ALLOC_FUNCS("COM:MemoryBuffer")
+#endif
};
#endif
Modified: trunk/blender/source/blender/compositor/intern/COM_MemoryProxy.h
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_MemoryProxy.h 2012-06-25 08:58:50 UTC (rev 48259)
+++ trunk/blender/source/blender/compositor/intern/COM_MemoryProxy.h 2012-06-25 09:14:37 UTC (rev 48260)
@@ -102,6 +102,10 @@
* @brief get the allocated memory
*/
inline MemoryBuffer *getBuffer() { return this->buffer; }
+
+#ifdef WITH_CXX_GUARDEDALLOC
+ MEM_CXX_CLASS_ALLOC_FUNCS("COM:MemoryProxy")
+#endif
};
#endif
Modified: trunk/blender/source/blender/compositor/intern/COM_NodeBase.h
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_NodeBase.h 2012-06-25 08:58:50 UTC (rev 48259)
+++ trunk/blender/source/blender/compositor/intern/COM_NodeBase.h 2012-06-25 09:14:37 UTC (rev 48260)
@@ -141,6 +141,11 @@
*/
void addOutputSocket(DataType datatype);
void addOutputSocket(DataType datatype, bNodeSocket *socket);
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+ MEM_CXX_CLASS_ALLOC_FUNCS("COM:NodeBase")
+#endif
};
#endif
Modified: trunk/blender/source/blender/compositor/intern/COM_Socket.h
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_Socket.h 2012-06-25 08:58:50 UTC (rev 48259)
+++ trunk/blender/source/blender/compositor/intern/COM_Socket.h 2012-06-25 09:14:37 UTC (rev 48260)
@@ -74,6 +74,9 @@
void setEditorSocket(bNodeSocket *editorSocket) { this->editorSocket = editorSocket; }
bNodeSocket *getbNodeSocket() const { return this->editorSocket; }
+#ifdef WITH_CXX_GUARDEDALLOC
+ MEM_CXX_CLASS_ALLOC_FUNCS("COM:Socket")
+#endif
};
Modified: trunk/blender/source/blender/compositor/intern/COM_SocketConnection.h
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_SocketConnection.h 2012-06-25 08:58:50 UTC (rev 48259)
+++ trunk/blender/source/blender/compositor/intern/COM_SocketConnection.h 2012-06-25 09:14:37 UTC (rev 48260)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list