database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-11 20:28:21 +03:00
Code Activity

Make use of qsort_arg in several places that were formerly using klugy

Browse Source 
static variables.  This avoids any risk of potential non-reentrancy,
and in particular offers a much cleaner workaround for the Intel compiler
bug that was affecting ginutil.c.
This commit is contained in:
Tom Lane
2006-10-05 17:57:40 +00:00
parent f2332ea1e9
commit e378f82e00
6 changed files with 77 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
contrib/btree_gist/btree_utils_var.c
View File

@ -439,18 +439,14 @@ gbt_var_penalty(float *res, const GISTENTRY *o, const GISTENTRY *n, const gbtree
}
/*
* Fortunately, this sort comparison routine needn't be reentrant...
*/
static const gbtree_vinfo *gbt_vsrt_cmp_tinfo;
static int
gbt_vsrt_cmp(const void *a, const void *b)
gbt_vsrt_cmp(const void *a, const void *b, void *arg)
{
GBT_VARKEY_R ar = gbt_var_key_readable(((const Vsrt *) a)->t);
GBT_VARKEY_R br = gbt_var_key_readable(((const Vsrt *) b)->t);
const gbtree_vinfo *tinfo = (const gbtree_vinfo *) arg;
return (*gbt_vsrt_cmp_tinfo->f_cmp) (ar.lower, br.lower);
return (*tinfo->f_cmp) (ar.lower, br.lower);
}
GIST_SPLITVEC *
@ -496,11 +492,11 @@ gbt_var_picksplit(const GistEntryVector *entryvec, GIST_SPLITVEC *v, const gbtre
}
/* sort */
gbt_vsrt_cmp_tinfo = tinfo;
qsort((void *) &arr[FirstOffsetNumber],
maxoff - FirstOffsetNumber + 1,
sizeof(Vsrt),
gbt_vsrt_cmp);
qsort_arg((void *) &arr[FirstOffsetNumber],
maxoff - FirstOffsetNumber + 1,
sizeof(Vsrt),
gbt_vsrt_cmp,
(void *) tinfo);
/* We do simply create two parts */