Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: code/trunk/src/external/bullet/LinearMath/btAlignedAllocator.cpp @ 10759

Last change on this file since 10759 was 8351, checked in by rgrieder, 14 years ago

Merged kicklib2 branch back to trunk (includes former branches ois_update, mac_osx and kicklib).

Notes for updating

Linux:
You don't need an extra package for CEGUILua and Tolua, it's already shipped with CEGUI.
However you do need to make sure that the OgreRenderer is installed too with CEGUI 0.7 (may be a separate package).
Also, Orxonox now recognises if you install the CgProgramManager (a separate package available on newer Ubuntu on Debian systems).

Windows:
Download the new dependency packages versioned 6.0 and use these. If you have problems with that or if you don't like the in game console problem mentioned below, you can download the new 4.3 version of the packages (only available for Visual Studio 2005/2008).

Key new features:

  • *Support for Mac OS X*
  • Visual Studio 2010 support
  • Bullet library update to 2.77
  • OIS library update to 1.3
  • Support for CEGUI 0.7 —> Support for Arch Linux and even SuSE
  • Improved install target
  • Compiles now with GCC 4.6
  • Ogre Cg Shader plugin activated for Linux if available
  • And of course lots of bug fixes

There are also some regressions:

  • No support for CEGUI 0.5, Ogre 1.4 and boost 1.35 - 1.39 any more
  • In game console is not working in main menu for CEGUI 0.7
  • Tolua (just the C lib, not the application) and CEGUILua libraries are no longer in our repository. —> You will need to get these as well when compiling Orxonox
  • And of course lots of new bugs we don't yet know about
  • Property svn:eol-style set to native
File size: 4.5 KB
Line 
1/*
2Bullet Continuous Collision Detection and Physics Library
3Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
4
5This software is provided 'as-is', without any express or implied warranty.
6In no event will the authors be held liable for any damages arising from the use of this software.
7Permission is granted to anyone to use this software for any purpose,
8including commercial applications, and to alter it and redistribute it freely,
9subject to the following restrictions:
10
111. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
122. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
133. This notice may not be removed or altered from any source distribution.
14*/
15
16#include "btAlignedAllocator.h"
17
18int gNumAlignedAllocs = 0;
19int gNumAlignedFree = 0;
20int gTotalBytesAlignedAllocs = 0;//detect memory leaks
21
22static void *btAllocDefault(size_t size)
23{
24        return malloc(size);
25}
26
27static void btFreeDefault(void *ptr)
28{
29        free(ptr);
30}
31
32static btAllocFunc *sAllocFunc = btAllocDefault;
33static btFreeFunc *sFreeFunc = btFreeDefault;
34
35
36
37#if defined (BT_HAS_ALIGNED_ALLOCATOR)
38#include <malloc.h>
39static void *btAlignedAllocDefault(size_t size, int alignment)
40{
41        return _aligned_malloc(size, (size_t)alignment);
42}
43
44static void btAlignedFreeDefault(void *ptr)
45{
46        _aligned_free(ptr);
47}
48#elif defined(__CELLOS_LV2__)
49#include <stdlib.h>
50
51static inline void *btAlignedAllocDefault(size_t size, int alignment)
52{
53        return memalign(alignment, size);
54}
55
56static inline void btAlignedFreeDefault(void *ptr)
57{
58        free(ptr);
59}
60#else
61static inline void *btAlignedAllocDefault(size_t size, int alignment)
62{
63  void *ret;
64  char *real;
65  unsigned long offset;
66
67  real = (char *)sAllocFunc(size + sizeof(void *) + (alignment-1));
68  if (real) {
69    offset = (alignment - (unsigned long)(real + sizeof(void *))) & (alignment-1);
70    ret = (void *)((real + sizeof(void *)) + offset);
71    *((void **)(ret)-1) = (void *)(real);
72  } else {
73    ret = (void *)(real);
74  }
75  return (ret);
76}
77
78static inline void btAlignedFreeDefault(void *ptr)
79{
80  void* real;
81
82  if (ptr) {
83    real = *((void **)(ptr)-1);
84    sFreeFunc(real);
85  }
86}
87#endif
88
89
90static btAlignedAllocFunc *sAlignedAllocFunc = btAlignedAllocDefault;
91static btAlignedFreeFunc *sAlignedFreeFunc = btAlignedFreeDefault;
92
93void btAlignedAllocSetCustomAligned(btAlignedAllocFunc *allocFunc, btAlignedFreeFunc *freeFunc)
94{
95  sAlignedAllocFunc = allocFunc ? allocFunc : btAlignedAllocDefault;
96  sAlignedFreeFunc = freeFunc ? freeFunc : btAlignedFreeDefault;
97}
98
99void btAlignedAllocSetCustom(btAllocFunc *allocFunc, btFreeFunc *freeFunc)
100{
101  sAllocFunc = allocFunc ? allocFunc : btAllocDefault;
102  sFreeFunc = freeFunc ? freeFunc : btFreeDefault;
103}
104
105#ifdef BT_DEBUG_MEMORY_ALLOCATIONS
106//this generic allocator provides the total allocated number of bytes
107#include <stdio.h>
108
109void*   btAlignedAllocInternal  (size_t size, int alignment,int line,char* filename)
110{
111 void *ret;
112 char *real;
113 unsigned long offset;
114
115 gTotalBytesAlignedAllocs += size;
116 gNumAlignedAllocs++;
117
118 
119 real = (char *)sAllocFunc(size + 2*sizeof(void *) + (alignment-1));
120 if (real) {
121   offset = (alignment - (unsigned long)(real + 2*sizeof(void *))) &
122(alignment-1);
123   ret = (void *)((real + 2*sizeof(void *)) + offset);
124   *((void **)(ret)-1) = (void *)(real);
125       *((int*)(ret)-2) = size;
126
127 } else {
128   ret = (void *)(real);//??
129 }
130
131 printf("allocation#%d at address %x, from %s,line %d, size %d\n",gNumAlignedAllocs,real, filename,line,size);
132
133 int* ptr = (int*)ret;
134 *ptr = 12;
135 return (ret);
136}
137
138void    btAlignedFreeInternal   (void* ptr,int line,char* filename)
139{
140
141 void* real;
142 gNumAlignedFree++;
143
144 if (ptr) {
145   real = *((void **)(ptr)-1);
146       int size = *((int*)(ptr)-2);
147       gTotalBytesAlignedAllocs -= size;
148
149           printf("free #%d at address %x, from %s,line %d, size %d\n",gNumAlignedFree,real, filename,line,size);
150
151   sFreeFunc(real);
152 } else
153 {
154         printf("NULL ptr\n");
155 }
156}
157
158#else //BT_DEBUG_MEMORY_ALLOCATIONS
159
160void*   btAlignedAllocInternal  (size_t size, int alignment)
161{
162        gNumAlignedAllocs++;
163        void* ptr;
164        ptr = sAlignedAllocFunc(size, alignment);
165//      printf("btAlignedAllocInternal %d, %x\n",size,ptr);
166        return ptr;
167}
168
169void    btAlignedFreeInternal   (void* ptr)
170{
171        if (!ptr)
172        {
173                return;
174        }
175
176        gNumAlignedFree++;
177//      printf("btAlignedFreeInternal %x\n",ptr);
178        sAlignedFreeFunc(ptr);
179}
180
181#endif //BT_DEBUG_MEMORY_ALLOCATIONS
182
Note: See TracBrowser for help on using the repository browser.