[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59464] trunk/blender/source/blender: edge hash: take an arg for the guarded-malloc string (as ghash does)
Campbell Barton
ideasman42 at gmail.com
Sat Aug 24 15:08:55 CEST 2013
Revision: 59464
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59464
Author: campbellbarton
Date: 2013-08-24 13:08:55 +0000 (Sat, 24 Aug 2013)
Log Message:
-----------
edge hash: take an arg for the guarded-malloc string (as ghash does)
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/cloth.c
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/blenkernel/intern/mesh_validate.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
trunk/blender/source/blender/blenlib/BLI_edgehash.h
trunk/blender/source/blender/blenlib/intern/edgehash.c
trunk/blender/source/blender/editors/armature/meshlaplacian.c
trunk/blender/source/blender/editors/armature/reeb.c
trunk/blender/source/blender/modifiers/intern/MOD_explode.c
trunk/blender/source/blender/render/intern/source/convertblender.c
Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2013-08-24 13:04:03 UTC (rev 59463)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2013-08-24 13:08:55 UTC (rev 59464)
@@ -2405,7 +2405,7 @@
STACK_DECLARE(mpoly);
STACK_DECLARE(oldp);
- EdgeHash *ehash = BLI_edgehash_new();
+ EdgeHash *ehash = BLI_edgehash_new(__func__);
int i, j, c;
@@ -2607,7 +2607,7 @@
EdgeHashIterator *ehi;
MFace *mf = cddm->mface;
MEdge *med;
- EdgeHash *eh = BLI_edgehash_new();
+ EdgeHash *eh = BLI_edgehash_new(__func__);
int i, *index, numEdges, maxFaces = dm->numTessFaceData;
for (i = 0; i < maxFaces; i++, mf++) {
@@ -2668,7 +2668,7 @@
MPoly *mp = cddm->mpoly;
MLoop *ml;
MEdge *med, *origmed;
- EdgeHash *eh = BLI_edgehash_new();
+ EdgeHash *eh = BLI_edgehash_new(__func__);
int v1, v2;
int *eindex;
int i, j, *index, numEdges = cddm->dm.numEdgeData, maxFaces = dm->numPolyData;
Modified: trunk/blender/source/blender/blenkernel/intern/cloth.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cloth.c 2013-08-24 13:04:03 UTC (rev 59463)
+++ trunk/blender/source/blender/blenkernel/intern/cloth.c 2013-08-24 13:08:55 UTC (rev 59464)
@@ -1109,7 +1109,7 @@
MEM_freeN ( cloth->springs );
// create spring network hash
- edgehash = BLI_edgehash_new();
+ edgehash = BLI_edgehash_new(__func__);
// structural springs
for ( i = 0; i < numedges; i++ ) {
Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c 2013-08-24 13:04:03 UTC (rev 59463)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c 2013-08-24 13:08:55 UTC (rev 59464)
@@ -177,7 +177,7 @@
if (l1->type == CD_MEDGE) {
MEdge *e1 = l1->data;
MEdge *e2 = l2->data;
- EdgeHash *eh = BLI_edgehash_new();
+ EdgeHash *eh = BLI_edgehash_new(__func__);
int etot = m1->totedge;
for (j = 0; j < etot; j++, e1++) {
@@ -911,7 +911,7 @@
MPoly *mpoly;
MFace *mface;
MEdge *medge, *med;
- EdgeHash *hash = BLI_edgehash_new();
+ EdgeHash *hash = BLI_edgehash_new(__func__);
struct EdgeSort *edsort, *ed;
int a, totedge = 0;
unsigned int totedge_final = 0;
@@ -1243,7 +1243,7 @@
const MPoly *mp;
int i;
- eh = BLI_edgehash_new();
+ eh = BLI_edgehash_new(__func__);
for (i = 0, mp = mpoly; i < totpoly; i++, mp++) {
BKE_mesh_poly_edgehash_insert(eh, mp, mloop + mp->loopstart);
@@ -2307,7 +2307,7 @@
CustomData_external_read(fdata, id, CD_MASK_MDISPS, totface_i);
}
- eh = BLI_edgehash_new();
+ eh = BLI_edgehash_new(__func__);
/* build edge hash */
me = medge;
Modified: trunk/blender/source/blender/blenkernel/intern/mesh_validate.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh_validate.c 2013-08-24 13:04:03 UTC (rev 59463)
+++ trunk/blender/source/blender/blenkernel/intern/mesh_validate.c 2013-08-24 13:08:55 UTC (rev 59464)
@@ -216,7 +216,7 @@
bool do_edge_recalc = false;
- EdgeHash *edge_hash = BLI_edgehash_new();
+ EdgeHash *edge_hash = BLI_edgehash_new(__func__);
BLI_assert(!(do_fixes && mesh == NULL));
@@ -921,7 +921,7 @@
EdgeHashIterator *ehi;
MPoly *mp;
MEdge *med, *med_orig;
- EdgeHash *eh = BLI_edgehash_new();
+ EdgeHash *eh = BLI_edgehash_new(__func__);
int i, totedge, totpoly = mesh->totpoly;
int med_index;
/* select for newly created meshes which are selected [#25595] */
Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c 2013-08-24 13:04:03 UTC (rev 59463)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c 2013-08-24 13:08:55 UTC (rev 59464)
@@ -2484,7 +2484,7 @@
ParticleSpring *spring;
int i = 0;
- springhash = BLI_edgehash_new();
+ springhash = BLI_edgehash_new(__func__);
for (i=0, spring=psys->fluid_springs; i<psys->tot_fluidsprings; i++, spring++)
BLI_edgehash_insert(springhash, spring->particle_index[0], spring->particle_index[1], SET_INT_IN_POINTER(i+1));
Modified: trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2013-08-24 13:04:03 UTC (rev 59463)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2013-08-24 13:08:55 UTC (rev 59464)
@@ -334,7 +334,7 @@
}
/* create edges */
- ehash = BLI_edgehash_new();
+ ehash = BLI_edgehash_new(__func__);
for (i = 0; i < totface; i++) {
MPoly *mp = &((MPoly *) mpoly)[i];
@@ -1332,7 +1332,7 @@
if (!ccgdm->ehash) {
MEdge *medge;
- ccgdm->ehash = BLI_edgehash_new();
+ ccgdm->ehash = BLI_edgehash_new(__func__);
medge = ccgdm->dm.getEdgeArray((DerivedMesh *)ccgdm);
for (i = 0; i < ccgdm->dm.numEdgeData; i++) {
Modified: trunk/blender/source/blender/blenlib/BLI_edgehash.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_edgehash.h 2013-08-24 13:04:03 UTC (rev 59463)
+++ trunk/blender/source/blender/blenlib/BLI_edgehash.h 2013-08-24 13:08:55 UTC (rev 59464)
@@ -40,8 +40,9 @@
EDGEHASH_FLAG_ALLOW_DUPES = (1 << 0), /* only checked for in debug mode */
};
-EdgeHash *BLI_edgehash_new_ex(const unsigned int nentries_reserve);
-EdgeHash *BLI_edgehash_new(void);
+EdgeHash *BLI_edgehash_new_ex(const char *info,
+ const unsigned int nentries_reserve);
+EdgeHash *BLI_edgehash_new(const char *info);
void BLI_edgehash_free(EdgeHash *eh, EdgeHashFreeFP valfreefp);
void BLI_edgehash_insert(EdgeHash *eh, unsigned int v0, unsigned int v1, void *val);
void BLI_edgehash_assign(EdgeHash *eh, unsigned int v0, unsigned int v1, void *val);
Modified: trunk/blender/source/blender/blenlib/intern/edgehash.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/edgehash.c 2013-08-24 13:04:03 UTC (rev 59463)
+++ trunk/blender/source/blender/blenlib/intern/edgehash.c 2013-08-24 13:08:55 UTC (rev 59464)
@@ -162,9 +162,10 @@
/* Public API */
-EdgeHash *BLI_edgehash_new_ex(const unsigned int nentries_reserve)
+EdgeHash *BLI_edgehash_new_ex(const char *info,
+ const unsigned int nentries_reserve)
{
- EdgeHash *eh = MEM_callocN(sizeof(*eh), "EdgeHash");
+ EdgeHash *eh = MEM_mallocN(sizeof(*eh), info);
eh->nbuckets = _ehash_hashsizes[0]; /* eh->cursize */
eh->nentries = 0;
@@ -184,9 +185,9 @@
return eh;
}
-EdgeHash *BLI_edgehash_new(void)
+EdgeHash *BLI_edgehash_new(const char *info)
{
- return BLI_edgehash_new_ex(0);
+ return BLI_edgehash_new_ex(info, 0);
}
/**
Modified: trunk/blender/source/blender/editors/armature/meshlaplacian.c
===================================================================
--- trunk/blender/source/blender/editors/armature/meshlaplacian.c 2013-08-24 13:04:03 UTC (rev 59463)
+++ trunk/blender/source/blender/editors/armature/meshlaplacian.c 2013-08-24 13:08:55 UTC (rev 59464)
@@ -281,7 +281,7 @@
sys->varea = MEM_callocN(sizeof(float) * totvert, "LaplacianSystemVarea");
- sys->edgehash = BLI_edgehash_new();
+ sys->edgehash = BLI_edgehash_new(__func__);
for (a = 0, face = sys->faces; a < sys->totface; a++, face++) {
laplacian_increase_edge_count(sys->edgehash, (*face)[0], (*face)[1]);
laplacian_increase_edge_count(sys->edgehash, (*face)[1], (*face)[2]);
Modified: trunk/blender/source/blender/editors/armature/reeb.c
===================================================================
--- trunk/blender/source/blender/editors/armature/reeb.c 2013-08-24 13:04:03 UTC (rev 59463)
+++ trunk/blender/source/blender/editors/armature/reeb.c 2013-08-24 13:08:55 UTC (rev 59464)
@@ -198,7 +198,7 @@
rg = MEM_callocN(sizeof(ReebGraph), "reeb graph");
rg->totnodes = 0;
- rg->emap = BLI_edgehash_new();
+ rg->emap = BLI_edgehash_new(__func__);
rg->free_arc = REEB_freeArc;
Modified: trunk/blender/source/blender/modifiers/intern/MOD_explode.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_explode.c 2013-08-24 13:04:03 UTC (rev 59463)
+++ trunk/blender/source/blender/modifiers/intern/MOD_explode.c 2013-08-24 13:08:55 UTC (rev 59464)
@@ -568,7 +568,7 @@
int numlayer;
unsigned int ed_v1, ed_v2;
- edgehash = BLI_edgehash_new();
+ edgehash = BLI_edgehash_new(__func__);
/* recreate vertpa from facepa calculation */
for (i = 0, mf = mface; i < totface; i++, mf++) {
@@ -821,7 +821,7 @@
cfra = BKE_scene_frame_get(scene);
/* hash table for vertice <-> particle relations */
- vertpahash = BLI_edgehash_new();
+ vertpahash = BLI_edgehash_new(__func__);
for (i = 0; i < totface; i++) {
if (facepa[i] != totpart) {
Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c 2013-08-24 13:04:03 UTC (rev 59463)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c 2013-08-24 13:08:55 UTC (rev 59464)
@@ -3279,7 +3279,7 @@
index = dm->getEdgeDataArray(dm, CD_ORIGINDEX);
fed = CustomData_get_layer(&me->edata, CD_FREESTYLE_EDGE);
if (fed) {
- edge_hash = BLI_edgehash_new();
+ edge_hash = BLI_edgehash_new(__func__);
if (!index) {
if (me->totedge == totedge) {
for (a = 0; a < me->totedge; a++) {
More information about the Bf-blender-cvs
mailing list