diff --git a/src/client/Makefile.am b/src/client/Makefile.am --- a/src/client/Makefile.am +++ b/src/client/Makefile.am @@ -11,7 +11,7 @@ include_HEADERS = distren.h lib_LTLIBRARIES = libdistren.la -libdistren_la_SOURCES = distren.h libdistren.h libdistren.c libdistren_job.c +libdistren_la_SOURCES = distren.h libdistren.h libdistren.c libdistren_job.c libdistren_unbias.c #evidently the following should not be LDADD, but LDFLAGS because automake doesn't like the idea of LDADD for libraries for some reason... or I am very confused libdistren_la_LIBADD = @DISTLIBS_LIBS@ libdistren_la_CXXFLAGS = @DISTLIBS_CFLAGS@ diff --git a/src/client/libdistren.h b/src/client/libdistren.h --- a/src/client/libdistren.h +++ b/src/client/libdistren.h @@ -33,3 +33,25 @@ struct distren_job { char *jobid; }; + +/* + functions +*/ + +/** + Avoid poluting the public namespace until we fix visibility. + */ +#define _malloc _distren_malloc +/** + All of libdistren should use this rather than malloc.h's malloc. + */ +void *_malloc(distren_t distren, size_t size); + +/** + Avoid poluting the public namespace until we fix visibility. + */ +#define _free _distren_free +/** + All of libdisren should use this instead of malloc.h's free() +*/ +void _free(distren_t distren, void *tofree); diff --git a/src/client/libdistren_unbias.c b/src/client/libdistren_unbias.c new file mode 100644 --- /dev/null +++ b/src/client/libdistren_unbias.c @@ -0,0 +1,34 @@ +/* + Copyright 2008 Nathan Phillip Brink, Ethan Zonca, Matt Orlando + + This file is a part of DistRen. + + DistRen is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + DistRen is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with DistRen. If not, see . +*/ + +/* + Implementation of libdistren functions that exist to prevent this library from being biased toward certain methods of reporting errors/debug info or free()ing and malloc()ing + */ + +#include + +void *_malloc(distren_t distren, size_t size) +{ + return (*distren->malloc)(size); +} + +void _free(distren_t distren, void *tofree) +{ + (*distren->free)(tofree); +}