Changeset: 5881304f3a66 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5881304f3a66 Modified Files: clients/Tests/exports.stable.out gdk/ChangeLog gdk/gdk.h gdk/gdk_bbp.c Branch: default Log Message:
Removed unused functions BBPhot and BBPcold. diffs (100 lines): diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -177,11 +177,9 @@ BAT *BATunique(BAT *b, BAT *s); BBPrec *BBP[N_BBPINIT]; void BBPaddfarm(const char *dirname, int rolemask); void BBPclear(bat bid); -void BBPcold(bat b); int BBPcurstamp(void); int BBPdecref(bat b, int logical); BAT *BBPdescriptor(bat b); -void BBPhot(bat b); int BBPin; int BBPincref(bat b, int logical); bat BBPindex(const char *nme); diff --git a/gdk/ChangeLog b/gdk/ChangeLog --- a/gdk/ChangeLog +++ b/gdk/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog file for MonetDB # This file is updated with Maddlog +* Fri Jul 22 2016 Sjoerd Mullender <sjo...@acm.org> +- Removed unused functions BBPhot and BBPcold. + * Wed Jul 6 2016 Sjoerd Mullender <sjo...@acm.org> - Removed BATderiveTailProps and BATderiveProps. Just set the properties you know about, or use BATsettrivprop. diff --git a/gdk/gdk.h b/gdk/gdk.h --- a/gdk/gdk.h +++ b/gdk/gdk.h @@ -1620,10 +1620,6 @@ gdk_export void GDKqsort_rev(void *h, vo * @tab BBPincref (bat bi, int logical) * @item int * @tab BBPdecref (bat bi, int logical) - * @item void - * @tab BBPhot (bat bi) - * @item void - * @tab BBPcold (bat bi) * @item str * @tab BBPname (bat bi) * @item bat @@ -1724,8 +1720,6 @@ gdk_export int BBPcurstamp(void); gdk_export void BBPlock(void); -gdk_export void BBPhot(bat b); -gdk_export void BBPcold(bat b); gdk_export void BBPunlock(void); gdk_export str BBPlogical(bat b, str buf); diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c --- a/gdk/gdk_bbp.c +++ b/gdk/gdk_bbp.c @@ -3229,45 +3229,6 @@ BBPtrim(size_t target) MT_lock_unset(&GDKtrimLock(i)); } -void -BBPhot(bat i) -{ - if (BBPcheck(i, "BBPhot")) { - int lock = locked_by ? MT_getpid() != locked_by : 1; - - if (lock) - MT_lock_set(&GDKswapLock(i)); - BBP_lastused(i) = BBPLASTUSED(BBPstamp() + 30000); - if (lock) - MT_lock_unset(&GDKswapLock(i)); - } -} - -void -BBPcold(bat i) -{ - if (BBPcheck(i, "BBPcold")) { - MT_Id pid = MT_getpid(); - int idx = threadmask(pid); - int lock = locked_by ? pid != locked_by : 1; - - MT_lock_set(&GDKtrimLock(idx)); - if (lock) - MT_lock_set(&GDKswapLock(i)); - /* make very cold and insert on top of trim list */ - BBP_lastused(i) = 0; - if (BBP_cache(i) && bbptrimlast < bbptrimmax) { - lastused[--bbptrimmax] = 0; - bbptrim[bbptrimmax].bid = i; - bbptrim[bbptrimmax].next = bbptrimfirst; - bbptrimfirst = bbptrimmax; - } - if (lock) - MT_lock_unset(&GDKswapLock(i)); - MT_lock_unset(&GDKtrimLock(idx)); - } -} - /* * BBPquickdesc loads a BAT descriptor without loading the entire BAT, * of which the result be used only for a *limited* number of _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list