pike.git/ src/ array.c

1998-04-27

1998-04-27 22:33:17 by Fredrik Hübinette (Hubbe) <hubbe@hubbe.net>

• 928ad6d76f0065b9028e56453d1bcd19bd3de79b (53 lines) (+35/-18) ^{[ Show | Annotate ]}
  Branch: 7.9

removed some global variables and generally made things more thread safe

Rev: src/array.c:1.35
Rev: src/encode.c:1.21
Rev: src/fsort.c:1.10
Rev: src/fsort_template.h:1.4

19:   #include "gc.h"   #include "main.h"    - RCSID("$Id: array.c,v 1.34 1998/04/23 23:58:52 hubbe Exp $"); + RCSID("$Id: array.c,v 1.35 1998/04/27 22:33:17 hubbe Exp $");      struct array empty_array=   {
554:    return -1;   }    - static struct svalue *current_array_p; - static cmpfun current_cmpfun; -  - static int internal_cmpfun(INT32 *a,INT32 *b) + static int internal_cmpfun(INT32 *a, +  INT32 *b, +  cmpfun current_cmpfun, +  struct svalue *current_array_p)   {    return current_cmpfun(current_array_p + *a, current_array_p + *b);   }    -  + #define CMP(X,Y) internal_cmpfun((X),(Y),current_cmpfun, current_array_p) + #define TYPE INT32 + #define ID get_order_fsort + #define EXTRA_ARGS ,cmpfun current_cmpfun, struct svalue *current_array_p + #define XARGS ,current_cmpfun, current_array_p + #include "fsort_template.h" + #undef CMP + #undef TYPE + #undef ID + #undef EXTRA_ARGS + #undef XARGS +    INT32 *get_order(struct array *v, cmpfun fun)   {    INT32 e, *current_order; -  +  ONERROR tmp;       if(!v->size) return 0;    -  current_cmpfun = fun; +     current_order=(INT32 *)xalloc(v->size * sizeof(INT32)); -  +  SET_ONERROR(tmp, free, current_order);    for(e=0; e<v->size; e++) current_order[e]=e;    -  if(current_array_p) free((char *)current_array_p); -  current_array_p = ITEM(v); -  current_cmpfun = fun; -  fsort((char *)current_order, -  v->size, -  sizeof(INT32), -  (fsortfun)internal_cmpfun); +  get_order_fsort(current_order, +  current_order+v->size-1, +  fun, +  ITEM(v));    -  current_array_p=0; +  UNSET_ONERROR(tmp);    return current_order;   }   
673:    return is_gt(a,b);   }    + #define CMP(X,Y) alpha_svalue_cmpfun(X,Y) + #define TYPE struct svalue + #define ID low_sort_svalues + #include "fsort_template.h" + #undef CMP + #undef TYPE + #undef ID +  +    void sort_array_destructively(struct array *v)   {    if(!v->size) return; -  fsort((char *)ITEM(v), -  v->size, -  sizeof(struct svalue), -  (fsortfun)alpha_svalue_cmpfun); +  low_sort_svalues(ITEM(v), ITEM(v)+v->size-1);   }