#include <stdlib.h>
#include <string.h>
#include <assert.h>
+#include <sys/mman.h>
#include "fcint.h"
+static FcPattern * fcpatterns = NULL;
+static int fcpattern_ptr, fcpattern_count;
+static FcPatternElt * fcpatternelts = NULL;
+static int fcpatternelt_ptr, fcpatternelt_count;
+static FcValueList * fcvaluelists = NULL;
+static int fcvaluelist_ptr, fcvaluelist_count;
+
+static FcBool
+FcPatternEltIsDynamic (FcPatternEltPtr pei);
+
+static FcPatternEltPtr
+FcPatternEltPtrCreateDynamic (FcPatternElt * e);
+
FcPattern *
FcPatternCreate (void)
{
FcMemAlloc (FC_MEM_PATTERN, sizeof (FcPattern));
p->num = 0;
p->size = 0;
- p->elts = 0;
+ p->elts = FcPatternEltPtrCreateDynamic(0);
p->ref = 1;
return p;
}
{
switch (v.type) {
case FcTypeString:
- FcStrFree ((FcChar8 *) v.u.s);
+ FcObjectPtrDestroy (v.u.si);
break;
case FcTypeMatrix:
- FcMatrixFree ((FcMatrix *) v.u.m);
+ FcMatrixPtrDestroy (v.u.mi);
break;
case FcTypeCharSet:
- FcCharSetDestroy ((FcCharSet *) v.u.c);
+ FcCharSetPtrDestroy (v.u.ci);
break;
case FcTypeLangSet:
- FcLangSetDestroy ((FcLangSet *) v.u.l);
+ FcLangSetPtrDestroy (v.u.li);
break;
default:
break;
{
switch (v.type) {
case FcTypeString:
- v.u.s = FcStrCopy (v.u.s);
- if (!v.u.s)
+ v.u.si = FcObjectStaticName(FcObjectPtrU(v.u.si));
+ if (!FcObjectPtrU(v.u.si))
v.type = FcTypeVoid;
break;
case FcTypeMatrix:
- v.u.m = FcMatrixCopy (v.u.m);
- if (!v.u.m)
+ v.u.mi = FcMatrixPtrCreateDynamic
+ (FcMatrixCopy (FcMatrixPtrU(v.u.mi)));
+ if (!FcMatrixPtrU(v.u.mi))
v.type = FcTypeVoid;
break;
case FcTypeCharSet:
- v.u.c = FcCharSetCopy ((FcCharSet *) v.u.c);
- if (!v.u.c)
+ v.u.ci = FcCharSetPtrCreateDynamic
+ (FcCharSetCopy (FcCharSetPtrU(v.u.ci)));
+ if (!FcCharSetPtrU(v.u.ci))
v.type = FcTypeVoid;
break;
case FcTypeLangSet:
- v.u.l = FcLangSetCopy (v.u.l);
- if (!v.u.l)
+ v.u.li = FcLangSetPtrCreateDynamic
+ (FcLangSetCopy (FcLangSetPtrU(v.u.li)));
+ if (!FcLangSetPtrU(v.u.li))
v.type = FcTypeVoid;
break;
default:
}
void
-FcValueListDestroy (FcValueList *l)
+FcValueListDestroy (FcValueListPtr l)
{
- FcValueList *next;
- for (; l; l = next)
+ FcValueListPtr next;
+ for (; FcValueListPtrU(l); l = next)
{
- switch (l->value.type) {
+ switch (FcValueListPtrU(l)->value.type) {
case FcTypeString:
- FcStrFree ((FcChar8 *) l->value.u.s);
+ FcObjectPtrDestroy (FcValueListPtrU(l)->value.u.si);
break;
case FcTypeMatrix:
- FcMatrixFree ((FcMatrix *) l->value.u.m);
+ FcMatrixPtrDestroy (FcValueListPtrU(l)->value.u.mi);
break;
case FcTypeCharSet:
- FcCharSetDestroy ((FcCharSet *) l->value.u.c);
+ FcCharSetDestroy
+ (FcCharSetPtrU (FcValueListPtrU(l)->value.u.ci));
break;
case FcTypeLangSet:
- FcLangSetDestroy ((FcLangSet *) l->value.u.l);
+ FcLangSetDestroy
+ (FcLangSetPtrU (FcValueListPtrU(l)->value.u.li));
break;
default:
break;
}
- next = l->next;
+ next = FcValueListPtrU(l)->next;
+
FcMemFree (FC_MEM_VALLIST, sizeof (FcValueList));
- free (l);
+ if (l.storage == FcStorageDynamic)
+ free(l.u.dyn);
}
}
case FcTypeDouble:
return va.u.d == vb.u.d;
case FcTypeString:
- return FcStrCmpIgnoreCase (va.u.s, vb.u.s) == 0;
+ return FcStrCmpIgnoreCase (FcObjectPtrU(va.u.si),
+ FcObjectPtrU(vb.u.si)) == 0;
case FcTypeBool:
return va.u.b == vb.u.b;
case FcTypeMatrix:
- return FcMatrixEqual (va.u.m, vb.u.m);
+ return FcMatrixEqual (FcMatrixPtrU(va.u.mi),
+ FcMatrixPtrU(vb.u.mi));
case FcTypeCharSet:
- return FcCharSetEqual (va.u.c, vb.u.c);
+ return FcCharSetEqual (FcCharSetPtrU(va.u.ci),
+ FcCharSetPtrU(vb.u.ci));
case FcTypeFTFace:
return va.u.f == vb.u.f;
case FcTypeLangSet:
- return FcLangSetEqual (va.u.l, vb.u.l);
+ return FcLangSetEqual (FcLangSetPtrU(va.u.li),
+ FcLangSetPtrU(vb.u.li));
}
return FcFalse;
}
case FcTypeDouble:
return FcDoubleHash (v.u.d);
case FcTypeString:
- return FcStringHash (v.u.s);
+ return FcStringHash (FcObjectPtrU(v.u.si));
case FcTypeBool:
return (FcChar32) v.u.b;
case FcTypeMatrix:
- return (FcDoubleHash (v.u.m->xx) ^
- FcDoubleHash (v.u.m->xy) ^
- FcDoubleHash (v.u.m->yx) ^
- FcDoubleHash (v.u.m->yy));
+ {
+ FcMatrix * m = FcMatrixPtrU(v.u.mi);
+ return (FcDoubleHash (m->xx) ^
+ FcDoubleHash (m->xy) ^
+ FcDoubleHash (m->yx) ^
+ FcDoubleHash (m->yy));
+ }
case FcTypeCharSet:
- return (FcChar32) v.u.c->num;
+ return (FcChar32) (FcCharSetPtrU(v.u.ci))->num;
case FcTypeFTFace:
return FcStringHash ((const FcChar8 *) ((FT_Face) v.u.f)->family_name) ^
FcStringHash ((const FcChar8 *) ((FT_Face) v.u.f)->style_name);
case FcTypeLangSet:
- return FcLangSetHash (v.u.l);
+ return FcLangSetHash (FcLangSetPtrU(v.u.li));
}
return FcFalse;
}
static FcBool
-FcValueListEqual (FcValueList *la, FcValueList *lb)
+FcValueListEqual (FcValueListPtr la, FcValueListPtr lb)
{
- if (la == lb)
+ if (FcValueListPtrU(la) == FcValueListPtrU(lb))
return FcTrue;
- while (la && lb)
+ while (FcValueListPtrU(la) && FcValueListPtrU(lb))
{
- if (!FcValueEqual (la->value, lb->value))
+ if (!FcValueEqual (FcValueListPtrU(la)->value,
+ FcValueListPtrU(lb)->value))
return FcFalse;
- la = la->next;
- lb = lb->next;
+ la = FcValueListPtrU(la)->next;
+ lb = FcValueListPtrU(lb)->next;
}
- if (la || lb)
+ if (FcValueListPtrU(la) || FcValueListPtrU(lb))
return FcFalse;
return FcTrue;
}
static FcChar32
-FcValueListHash (FcValueList *l)
+FcValueListHash (FcValueListPtr l)
{
FcChar32 hash = 0;
- while (l)
+ while (FcValueListPtrU(l))
{
- hash = ((hash << 1) | (hash >> 31)) ^ FcValueHash (l->value);
- l = l->next;
+ hash = ((hash << 1) | (hash >> 31)) ^
+ FcValueHash (FcValueListPtrU(l)->value);
+ l = FcValueListPtrU(l)->next;
}
return hash;
}
return;
for (i = 0; i < p->num; i++)
- FcValueListDestroy (p->elts[i].values);
+ FcValueListDestroy ((FcPatternEltU(p->elts)+i)->values);
p->num = 0;
- if (p->elts)
+ if (FcPatternEltU(p->elts) && FcPatternEltIsDynamic(p->elts))
{
FcMemFree (FC_MEM_PATELT, p->size * sizeof (FcPatternElt));
- free (p->elts);
- p->elts = 0;
+ free (FcPatternEltU(p->elts));
+ p->elts = FcPatternEltPtrCreateDynamic(0);
}
p->size = 0;
FcMemFree (FC_MEM_PATTERN, sizeof (FcPattern));
struct _FcValueListEnt {
FcValueListEnt *next;
- FcValueList *list;
+ FcValueListPtr list;
FcChar32 hash, pad;
};
}
static FcValueListEnt *
-FcValueListEntCreate (FcValueList *h)
+FcValueListEntCreate (FcValueListPtr h)
{
FcValueListAlign *ea;
FcValueListEnt *e;
- FcValueList *l, *new;
+ FcValueListPtr l;
+ FcValueList *new;
int n;
int size;
n = 0;
- for (l = h; l; l = l->next)
+ for (l = h; FcValueListPtrU(l); l = FcValueListPtrU(l)->next)
n++;
size = sizeof (FcValueListAlign) + n * sizeof (FcValueList);
- FcValueListFrozenCount[h->value.type]++;
- FcValueListFrozenBytes[h->value.type] += size;
- ea = malloc (size);
+ FcValueListFrozenCount[FcValueListPtrU(h)->value.type]++;
+ FcValueListFrozenBytes[FcValueListPtrU(h)->value.type] += size;
+ // this leaks for some reason
+ ea = malloc (sizeof (FcValueListAlign));
if (!ea)
return 0;
+ new = malloc (n * sizeof (FcValueList));
+ if (!new)
+ return 0;
+ memset(new, 0, n * sizeof (FcValueList));
FcMemAlloc (FC_MEM_VALLIST, size);
e = &ea->ent;
- e->list = (FcValueList *) (ea + 1);
- new = e->list;
- for (l = h; l; l = l->next, new++)
+ e->list = (FcValueListPtr) FcValueListPtrCreateDynamic(new);
+ for (l = h; FcValueListPtrU(l);
+ l = FcValueListPtrU(l)->next, new++)
{
- if (l->value.type == FcTypeString)
+ if (FcValueListPtrU(l)->value.type == FcTypeString)
{
new->value.type = FcTypeString;
- new->value.u.s = FcObjectStaticName (l->value.u.s);
+ new->value.u.si = FcObjectStaticName
+ (FcObjectPtrU(FcValueListPtrU(l)->value.u.si));
}
else
{
- new->value = FcValueSave (l->value);
+ new->value = FcValueSave (FcValueListPtrU(l)->value);
+ }
+ new->binding = FcValueListPtrU(l)->binding;
+ if (FcValueListPtrU(FcValueListPtrU(l)->next))
+ {
+ new->next = FcValueListPtrCreateDynamic(new + 1);
}
- new->binding = l->binding;
- if (l->next)
- new->next = new + 1;
else
- new->next = 0;
+ {
+ new->next = FcValueListPtrCreateDynamic(0);
+ }
}
return e;
}
static void
FcValueListEntDestroy (FcValueListEnt *e)
{
- FcValueList *l;
+ FcValueListPtr l;
- FcValueListFrozenCount[e->list->value.type]--;
+ FcValueListFrozenCount[FcValueListPtrU(e->list)->value.type]--;
/* XXX: We should perform these two operations with "size" as
computed in FcValueListEntCreate, but we don't have access to
FcMemFree (FC_MEM_VALLIST, size);
*/
- for (l = e->list; l; l = l->next)
+ for (l = e->list; FcValueListPtrU(l);
+ l = FcValueListPtrU(l)->next)
{
- if (l->value.type != FcTypeString)
- FcValueDestroy (l->value);
+ if (FcValueListPtrU(l)->value.type != FcTypeString)
+ FcValueDestroy (FcValueListPtrU(l)->value);
}
/* XXX: Are we being too chummy with the implementation here to
free(e) when it was actually the enclosing FcValueListAlign
static FcValueListEnt *FcValueListHashTable[FC_VALUE_LIST_HASH_SIZE];
-static FcValueList *
-FcValueListFreeze (FcValueList *l)
+static FcValueListPtr
+FcValueListFreeze (FcValueListPtr l)
{
FcChar32 hash = FcValueListHash (l);
FcValueListEnt **bucket = &FcValueListHashTable[hash % FC_VALUE_LIST_HASH_SIZE];
ent = FcValueListEntCreate (l);
if (!ent)
- return 0;
+ return FcValueListPtrCreateDynamic(0);
FcValueListUsed++;
ent->hash = hash;
int i;
for (i = 0; i < b->num; i++)
- hash = ((hash << 1) | (hash >> 31)) ^ ((long) b->elts[i].values);
+ hash = ((hash << 1) | (hash >> 31)) ^
+ (long) (FcValueListPtrU((FcPatternEltU(b->elts)+i)->values));
return hash;
}
struct _FcPatternEnt {
FcPatternEnt *next;
FcChar32 hash;
- FcPattern pattern;
+ FcPattern *pattern;
};
static int FcPatternTotal;
static FcPattern *
FcPatternBaseFreeze (FcPattern *b)
{
+ FcPattern *ep;
+ FcPatternElt *epp;
FcChar32 hash = FcPatternBaseHash (b);
FcPatternEnt **bucket = &FcPatternHashTable[hash % FC_VALUE_LIST_HASH_SIZE];
FcPatternEnt *ent;
int i;
- int size;
FcPatternTotal++;
for (ent = *bucket; ent; ent = ent->next)
{
- if (ent->hash == hash && b->num == ent->pattern.num)
- {
+ if (ent->hash == hash && b->num == ent->pattern->num)
+ {
for (i = 0; i < b->num; i++)
{
- if (b->elts[i].object != ent->pattern.elts[i].object)
+ if (FcObjectPtrCompare((FcPatternEltU(b->elts)+i)->object,
+ (FcPatternEltU(ent->pattern->elts)+i)->object) != 0)
break;
- if (b->elts[i].values != ent->pattern.elts[i].values)
+ if (FcValueListPtrU((FcPatternEltU(b->elts)+i)->values) !=
+ FcValueListPtrU((FcPatternEltU(ent->pattern->elts)+i)->values))
break;
}
if (i == b->num)
- return &ent->pattern;
+ return ent->pattern;
}
}
/*
* Compute size of pattern + elts
*/
- size = sizeof (FcPatternEnt) + b->num*sizeof (FcPatternElt);
- ent = malloc (size);
+ ent = malloc (sizeof (FcPatternEnt));
if (!ent)
return 0;
- FcMemAlloc (FC_MEM_PATTERN, size);
+ FcMemAlloc (FC_MEM_PATTERN, sizeof (FcPatternEnt));
FcPatternUsed++;
- ent->pattern.elts = (FcPatternElt *) (ent + 1);
- ent->pattern.num = b->num;
- ent->pattern.size = b->num;
- ent->pattern.ref = FC_REF_CONSTANT;
+ ep = FcPatternCreate();
+ if (!ep)
+ return 0;
+ ent->pattern = ep;
+ epp = malloc(b->num * sizeof (FcPatternElt));
+ if (!epp)
+ goto bail;
+ ep->elts = FcPatternEltPtrCreateDynamic(epp);
+
+ FcMemAlloc (FC_MEM_PATELT, sizeof (FcPatternElt)*(b->num));
+
+ ep->num = b->num;
+ ep->size = b->num;
+ ep->ref = FC_REF_CONSTANT;
for (i = 0; i < b->num; i++)
{
- ent->pattern.elts[i].values = b->elts[i].values;
- ent->pattern.elts[i].object = b->elts[i].object;
+ (FcPatternEltU(ep->elts)+i)->values =
+ (FcPatternEltU(b->elts)+i)->values;
+ (FcPatternEltU(ep->elts)+i)->object =
+ (FcPatternEltU(b->elts)+i)->object;
}
ent->hash = hash;
ent->next = *bucket;
*bucket = ent;
- return &ent->pattern;
+ return ent->pattern;
+ bail:
+ free(ent);
+ FcMemFree (FC_MEM_PATTERN, sizeof (FcPatternEnt));
+ FcPatternUsed--;
+ return 0;
}
static void
FcPatternFreeze (FcPattern *p)
{
FcPattern *b, *n = 0;
- int size;
+ FcPatternElt *e;
int i;
- size = sizeof (FcPattern) + p->num * sizeof (FcPatternElt);
- b = (FcPattern *) malloc (size);
+ if (p->ref == FC_REF_CONSTANT)
+ return p;
+
+ b = FcPatternCreate();
if (!b)
- return 0;
- FcMemAlloc (FC_MEM_PATTERN, size);
+ return 0;
+
b->num = p->num;
b->size = b->num;
b->ref = 1;
- b->elts = (FcPatternElt *) (b + 1);
+
+ e = malloc(b->num * sizeof (FcPatternElt));
+ if (!e)
+ return 0;
+ b->elts = FcPatternEltPtrCreateDynamic(e);
+ FcMemAlloc (FC_MEM_PATELT, sizeof (FcPatternElt)*(b->num));
+
/*
* Freeze object lists
*/
for (i = 0; i < p->num; i++)
{
- b->elts[i].object = p->elts[i].object;
- b->elts[i].values = FcValueListFreeze (p->elts[i].values);
- if (!b->elts[i].values)
+ (FcPatternEltU(b->elts)+i)->object =
+ (FcPatternEltU(p->elts)+i)->object;
+ (FcPatternEltU(b->elts)+i)->values =
+ FcValueListFreeze((FcPatternEltU(p->elts)+i)->values);
+ if (!FcValueListPtrU((FcPatternEltU(p->elts)+i)->values))
goto bail;
}
/*
printf ("Patterns: total %9d used %9d\n", FcPatternTotal, FcPatternUsed);
}
#endif
-bail:
- free (b);
+ bail:
+ free(FcPatternEltU(b->elts));
+ b->elts = FcPatternEltPtrCreateDynamic(0);
+ FcMemFree (FC_MEM_PATELT, sizeof (FcPatternElt)*(b->num));
+ b->num = -1;
#ifdef DEBUG
assert (FcPatternEqual (n, p));
#endif
FcPatternPosition (const FcPattern *p, const char *object)
{
int low, high, mid, c;
+ FcObjectPtr obj;
+ obj = FcObjectStaticName(object);
low = 0;
high = p->num - 1;
c = 1;
while (low <= high)
{
mid = (low + high) >> 1;
- c = strcmp (p->elts[mid].object, object);
+ c = FcObjectPtrCompare((FcPatternEltU(p->elts)+mid)->object, obj);
if (c == 0)
return mid;
if (c < 0)
int i = FcPatternPosition (p, object);
if (i < 0)
return 0;
- return &p->elts[i];
+ return FcPatternEltU(p->elts)+i;
}
FcPatternElt *
{
i = -i - 1;
- /* grow array */
+ /* reallocate array */
if (p->num + 1 >= p->size)
{
int s = p->size + 16;
- if (p->elts)
- e = (FcPatternElt *) realloc (p->elts, s * sizeof (FcPatternElt));
+ if (FcPatternEltU(p->elts))
+ {
+ FcPatternElt *e0 = FcPatternEltU(p->elts);
+ e = (FcPatternElt *) realloc (e0, s * sizeof (FcPatternElt));
+ if (!e) /* maybe it was mmapped */
+ {
+ e = malloc(s * sizeof (FcPatternElt));
+ if (e)
+ memcpy(e, e0, p->num * sizeof (FcPatternElt));
+ }
+ }
else
e = (FcPatternElt *) malloc (s * sizeof (FcPatternElt));
if (!e)
return FcFalse;
- p->elts = e;
+ p->elts = FcPatternEltPtrCreateDynamic(e);
if (p->size)
FcMemFree (FC_MEM_PATELT, p->size * sizeof (FcPatternElt));
FcMemAlloc (FC_MEM_PATELT, s * sizeof (FcPatternElt));
while (p->size < s)
{
- p->elts[p->size].object = 0;
- p->elts[p->size].values = 0;
+ (FcPatternEltU(p->elts)+p->size)->object = 0;
+ (FcPatternEltU(p->elts)+p->size)->values =
+ FcValueListPtrCreateDynamic(0);
p->size++;
}
}
/* move elts up */
- memmove (p->elts + i + 1,
- p->elts + i,
+ memmove (FcPatternEltU(p->elts) + i + 1,
+ FcPatternEltU(p->elts) + i,
sizeof (FcPatternElt) *
(p->num - i));
/* bump count */
p->num++;
- p->elts[i].object = FcObjectStaticName (object);
- p->elts[i].values = 0;
+ (FcPatternEltU(p->elts)+i)->object = FcObjectStaticName (object);
+ (FcPatternEltU(p->elts)+i)->values = FcValueListPtrCreateDynamic(0);
}
- return &p->elts[i];
+ return FcPatternEltU(p->elts)+i;
}
FcBool
return FcFalse;
for (i = 0; i < pa->num; i++)
{
- if (pa->elts[i].object != pb->elts[i].object)
+ if (FcObjectPtrCompare((FcPatternEltU(pa->elts)+i)->object,
+ (FcPatternEltU(pb->elts)+i)->object) != 0)
return FcFalse;
- if (!FcValueListEqual (pa->elts[i].values, pb->elts[i].values))
+ if (!FcValueListEqual ((FcPatternEltU(pa->elts)+i)->values,
+ (FcPatternEltU(pb->elts)+i)->values))
return FcFalse;
}
return FcTrue;
for (i = 0; i < p->num; i++)
{
h = (((h << 1) | (h >> 31)) ^
- FcStringHash ((const FcChar8 *) p->elts[i].object) ^
- FcValueListHash (p->elts[i].values));
+ FcStringHash ((const FcChar8 *) FcObjectPtrU(((FcPatternEltU(p->elts)+i)->object))) ^
+ FcValueListHash ((FcPatternEltU(p->elts)+i)->values));
}
return h;
}
FcBool
-FcPatternEqualSubset (const FcPattern *pa, const FcPattern *pb, const FcObjectSet *os)
+FcPatternEqualSubset (const FcPattern *pai, const FcPattern *pbi, const FcObjectSet *os)
{
FcPatternElt *ea, *eb;
int i;
for (i = 0; i < os->nobject; i++)
{
- ea = FcPatternFindElt (pa, os->objects[i]);
- eb = FcPatternFindElt (pb, os->objects[i]);
+ ea = FcPatternFindElt (pai, FcObjectPtrU(os->objects[i]));
+ eb = FcPatternFindElt (pbi, FcObjectPtrU(os->objects[i]));
if (ea)
{
if (!eb)
FcBool append)
{
FcPatternElt *e;
- FcValueList *new, **prev;
+ FcValueListPtr new, *prev;
+ FcValueList * newp;
if (p->ref == FC_REF_CONSTANT)
goto bail0;
- new = (FcValueList *) malloc (sizeof (FcValueList));
- if (!new)
+ newp = malloc (sizeof (FcValueList));
+ if (!newp)
goto bail0;
+ memset(newp, 0, sizeof (FcValueList));
+ new = FcValueListPtrCreateDynamic(newp);
FcMemAlloc (FC_MEM_VALLIST, sizeof (FcValueList));
/* dup string */
value = FcValueSave (value);
if (value.type == FcTypeVoid)
goto bail1;
- new->value = value;
- new->binding = binding;
- new->next = 0;
+ FcValueListPtrU(new)->value = value;
+ FcValueListPtrU(new)->binding = binding;
+ FcValueListPtrU(new)->next = FcValueListPtrCreateDynamic(0);
e = FcPatternInsertElt (p, object);
if (!e)
if (append)
{
- for (prev = &e->values; *prev; prev = &(*prev)->next);
+ for (prev = &e->values; FcValueListPtrU(*prev); prev = &FcValueListPtrU(*prev)->next)
+ ;
*prev = new;
}
else
{
- new->next = e->values;
+ FcValueListPtrU(new)->next = e->values;
e->values = new;
}
bail2:
switch (value.type) {
case FcTypeString:
- FcStrFree ((FcChar8 *) value.u.s);
+ FcStrFree ((FcChar8 *) FcObjectPtrU(value.u.si));
break;
case FcTypeMatrix:
- FcMatrixFree ((FcMatrix *) value.u.m);
+ FcMatrixFree (FcMatrixPtrU(value.u.mi));
break;
case FcTypeCharSet:
- FcCharSetDestroy ((FcCharSet *) value.u.c);
+ FcCharSetDestroy (FcCharSetPtrU(value.u.ci));
break;
case FcTypeLangSet:
- FcLangSetDestroy ((FcLangSet *) value.u.l);
+ FcLangSetDestroy (FcLangSetPtrU(value.u.li));
break;
default:
break;
}
bail1:
FcMemFree (FC_MEM_VALLIST, sizeof (FcValueList));
- free (new);
+ free (FcValueListPtrU(new));
bail0:
return FcFalse;
}
FcPatternDel (FcPattern *p, const char *object)
{
FcPatternElt *e;
- int i;
e = FcPatternFindElt (p, object);
if (!e)
return FcFalse;
- i = e - p->elts;
-
/* destroy value */
FcValueListDestroy (e->values);
/* shuffle existing ones down */
- memmove (e, e+1, (p->elts + p->num - (e + 1)) * sizeof (FcPatternElt));
+ memmove (e, e+1,
+ (FcPatternEltU(p->elts) + p->num - (e + 1)) *
+ sizeof (FcPatternElt));
p->num--;
- p->elts[p->num].object = 0;
- p->elts[p->num].values = 0;
+ (FcPatternEltU(p->elts)+p->num)->object = 0;
+ (FcPatternEltU(p->elts)+p->num)->values = FcValueListPtrCreateDynamic(0);
return FcTrue;
}
FcBool
FcPatternRemove (FcPattern *p, const char *object, int id)
{
- FcPatternElt *e;
- FcValueList **prev, *l;
+ FcPatternElt *e;
+ FcValueListPtr *prev, l;
e = FcPatternFindElt (p, object);
if (!e)
return FcFalse;
- for (prev = &e->values; (l = *prev); prev = &l->next)
+ for (prev = &e->values;
+ FcValueListPtrU(l = *prev);
+ prev = &FcValueListPtrU(l)->next)
{
if (!id)
{
- *prev = l->next;
- l->next = 0;
+ *prev = FcValueListPtrU(l)->next;
+ FcValueListPtrU(l)->next = FcValueListPtrCreateDynamic(0);
FcValueListDestroy (l);
- if (!e->values)
+ if (!FcValueListPtrU(e->values))
FcPatternDel (p, object);
return FcTrue;
}
FcValue v;
v.type = FcTypeString;
- v.u.s = s;
+ v.u.si = FcObjectStaticName(s);
return FcPatternAdd (p, object, v, FcTrue);
}
FcValue v;
v.type = FcTypeMatrix;
- v.u.m = (FcMatrix *) s;
+ v.u.mi = FcMatrixPtrCreateDynamic((FcMatrix *) s);
return FcPatternAdd (p, object, v, FcTrue);
}
FcValue v;
v.type = FcTypeCharSet;
- v.u.c = (FcCharSet *) c;
+ v.u.ci = FcCharSetPtrCreateDynamic((FcCharSet *)c);
return FcPatternAdd (p, object, v, FcTrue);
}
FcValue v;
v.type = FcTypeLangSet;
- v.u.l = (FcLangSet *) ls;
+ v.u.li = FcLangSetPtrCreateDynamic((FcLangSet *)ls);
return FcPatternAdd (p, object, v, FcTrue);
}
FcPatternGet (const FcPattern *p, const char *object, int id, FcValue *v)
{
FcPatternElt *e;
- FcValueList *l;
+ FcValueListPtr l;
e = FcPatternFindElt (p, object);
if (!e)
return FcResultNoMatch;
- for (l = e->values; l; l = l->next)
+ for (l = e->values; FcValueListPtrU(l); l = FcValueListPtrU(l)->next)
{
if (!id)
{
- *v = l->value;
+ *v = FcValueListPtrU(l)->value;
return FcResultMatch;
}
id--;
return r;
if (v.type != FcTypeString)
return FcResultTypeMismatch;
- *s = (FcChar8 *) v.u.s;
+ *s = (FcChar8 *) FcObjectPtrU(v.u.si);
return FcResultMatch;
}
return r;
if (v.type != FcTypeMatrix)
return FcResultTypeMismatch;
- *m = (FcMatrix *) v.u.m;
+ *m = FcMatrixPtrU(v.u.mi);
return FcResultMatch;
}
return r;
if (v.type != FcTypeCharSet)
return FcResultTypeMismatch;
- *c = (FcCharSet *) v.u.c;
+ *c = FcCharSetPtrU(v.u.ci);
return FcResultMatch;
}
return r;
if (v.type != FcTypeLangSet)
return FcResultTypeMismatch;
- *ls = (FcLangSet *) v.u.l;
+ *ls = FcLangSetPtrU(v.u.li);
return FcResultMatch;
}
FcPatternDuplicate (const FcPattern *orig)
{
FcPattern *new;
+ FcPatternElt *e;
int i;
- FcValueList *l;
+ FcValueListPtr l;
new = FcPatternCreate ();
if (!new)
goto bail0;
+ e = FcPatternEltU(orig->elts);
+
for (i = 0; i < orig->num; i++)
{
- for (l = orig->elts[i].values; l; l = l->next)
- if (!FcPatternAdd (new, orig->elts[i].object, l->value, FcTrue))
+ for (l = (e + i)->values;
+ FcValueListPtrU(l);
+ l = FcValueListPtrU(l)->next)
+ if (!FcPatternAdd (new, FcObjectPtrU((e + i)->object),
+ FcValueListPtrU(l)->value, FcTrue))
goto bail1;
}
{
int i;
FcPatternElt *e;
- FcValueList *v;
+ FcValueListPtr v;
for (i = 0; i < s->num; i++)
{
- e = &s->elts[i];
- for (v = e->values; v; v = v->next)
+ e = FcPatternEltU(s->elts)+i;
+ for (v = e->values; FcValueListPtrU(v);
+ v = FcValueListPtrU(v)->next)
{
- if (!FcPatternAddWithBinding (p, e->object,
- v->value, v->binding, FcTrue))
+ if (!FcPatternAddWithBinding (p, FcObjectPtrU(e->object),
+ FcValueListPtrU(v)->value,
+ FcValueListPtrU(v)->binding, FcTrue))
return FcFalse;
}
}
return FcTrue;
}
-const char *
-FcObjectStaticName (const char *name)
+FcPatternElt *
+FcPatternEltU (FcPatternEltPtr pei)
+{
+ switch (pei.storage)
+ {
+ case FcStorageStatic:
+ if (pei.u.stat == 0) return 0;
+ return &fcpatternelts[pei.u.stat];
+ case FcStorageDynamic:
+ return pei.u.dyn;
+ default:
+ return 0;
+ }
+}
+
+static FcPatternEltPtr
+FcPatternEltPtrCreateDynamic (FcPatternElt * e)
+{
+ FcPatternEltPtr new;
+ new.storage = FcStorageDynamic;
+ new.u.dyn = e;
+ return new;
+}
+
+static FcPatternEltPtr
+FcPatternEltPtrCreateStatic (int i)
+{
+ FcPatternEltPtr new;
+ new.storage = FcStorageStatic;
+ new.u.stat = i;
+ return new;
+}
+
+static FcBool
+FcPatternEltIsDynamic (FcPatternEltPtr pei)
+{
+ return pei.storage == FcStorageDynamic;
+}
+
+
+void
+FcPatternClearStatic (void)
+{
+ fcpatterns = 0;
+ fcpattern_ptr = 0;
+ fcpattern_count = 0;
+
+ fcpatternelts = 0;
+ fcpatternelt_ptr = 0;
+ fcpatternelt_count = 0;
+}
+
+void
+FcValueListClearStatic (void)
+{
+ fcvaluelists = 0;
+ fcvaluelist_ptr = 0;
+ fcvaluelist_count = 0;
+}
+
+static FcObjectPtr
+FcObjectSerialize (FcObjectPtr si);
+
+FcBool
+FcPatternPrepareSerialize (FcPattern * p)
+{
+ int i;
+
+ fcpattern_count++;
+ fcpatternelt_count += p->num;
+
+ for (i = 0; i < p->num; i++)
+ {
+ FcObjectPrepareSerialize
+ ((FcPatternEltU(p->elts)+i)->object);
+ if (!FcValueListPrepareSerialize
+ (FcValueListPtrU(((FcPatternEltU(p->elts)+i)->values))))
+ return FcFalse;
+ }
+
+ return FcTrue;
+}
+
+FcBool
+FcValueListPrepareSerialize (FcValueList *p)
+{
+ FcValueList *vl;
+
+ for (vl = p;
+ vl;
+ vl = FcValueListPtrU(vl->next))
+ {
+ FcValue v = vl->value;
+
+ switch (v.type)
+ {
+ case FcTypeMatrix:
+ FcMatrixPrepareSerialize(FcMatrixPtrU(v.u.mi));
+ break;
+ case FcTypeCharSet:
+ FcCharSetPrepareSerialize(FcCharSetPtrU(v.u.ci));
+ break;
+ case FcTypeLangSet:
+ FcLangSetPrepareSerialize(FcLangSetPtrU(v.u.li));
+ break;
+ case FcTypeString:
+ FcObjectPrepareSerialize(v.u.si);
+ default:
+ break;
+ }
+ fcvaluelist_count++;
+ }
+
+ return FcTrue;
+}
+
+FcPattern *
+FcPatternSerialize (FcPattern *old)
+{
+ FcPattern *p;
+ FcPatternElt *e, *nep;
+ FcValueList * nv;
+ FcValueListPtr v, nv_head, nvp;
+ int i, elts;
+
+ if (!fcpatterns)
+ {
+ p = malloc (sizeof (FcPattern) * fcpattern_count);
+ if (!p)
+ goto bail;
+
+ FcMemAlloc (FC_MEM_PATTERN, sizeof (FcPattern) * fcpattern_count);
+ fcpatterns = p;
+ fcpattern_ptr = 0;
+
+ e = malloc (sizeof (FcPatternElt) * fcpatternelt_count);
+ if (!e)
+ goto bail1;
+
+ FcMemAlloc (FC_MEM_PATELT, sizeof (FcPatternElt) * fcpatternelt_count);
+ fcpatternelts = e;
+ fcpatternelt_ptr = 0;
+ }
+
+ p = FcPatternCreate();
+ elts = fcpatternelt_ptr;
+ nep = &fcpatternelts[elts];
+ if (!nep)
+ return FcFalse;
+ fcpatternelt_ptr += old->num;
+
+ for (e = FcPatternEltU(old->elts), i=0; i < old->num; i++, e++)
+ {
+ v = e->values;
+ nvp = nv_head = FcValueListSerialize(FcValueListPtrU(v));
+ if (!FcValueListPtrU(nv_head))
+ goto bail2;
+ nv = FcValueListPtrU(nvp);
+
+ for (;
+ FcValueListPtrU(v);
+ v = FcValueListPtrU(v)->next,
+ nv = FcValueListPtrU(nv->next))
+ {
+
+ if (FcValueListPtrU(FcValueListPtrU(v)->next))
+ {
+ nvp = FcValueListSerialize
+ (FcValueListPtrU(FcValueListPtrU(v)->next));
+ nv->next = nvp;
+ }
+ }
+
+ nep[i].values = nv_head;
+ nep[i].object = FcObjectSerialize
+ (FcObjectStaticName(FcObjectPtrU(e->object)));
+ }
+
+ p->elts = FcPatternEltPtrCreateStatic(elts);
+ p->size = old->num;
+ p->ref = FC_REF_CONSTANT;
+ return p;
+
+ bail2:
+ free (fcpatternelts);
+ bail1:
+ free (fcpatterns);
+ bail:
+ return 0;
+ }
+
+FcValueListPtr
+FcValueListSerialize(FcValueList *pi)
+{
+ FcValueListPtr new;
+ FcValue * v;
+ FcValueList * vl;
+
+ if (!fcvaluelists)
+ {
+ vl = malloc (sizeof (FcValueList) * fcvaluelist_count);
+ if (!vl)
+ return FcValueListPtrCreateDynamic(0);
+
+ FcMemAlloc (FC_MEM_VALLIST, sizeof (FcValueList) * fcvaluelist_count);
+ fcvaluelists = vl;
+ fcvaluelist_ptr = 0;
+ }
+
+ fcvaluelists[fcvaluelist_ptr] = *pi;
+ new.storage = FcStorageStatic;
+ new.u.stat = fcvaluelist_ptr++;
+ v = &fcvaluelists[new.u.stat].value;
+ switch (v->type)
+ {
+ case FcTypeString:
+ if (FcObjectPtrU(v->u.si))
+ {
+ FcObjectPtr si =
+ FcObjectSerialize(FcObjectStaticName(FcObjectPtrU(v->u.si)));
+ if (!FcObjectPtrU(v->u.si))
+ return FcValueListPtrCreateDynamic(pi);
+ v->u.si = si;
+ }
+ break;
+ case FcTypeMatrix:
+ if (FcMatrixPtrU(v->u.mi))
+ {
+ FcMatrixPtr mi = FcMatrixSerialize(FcMatrixPtrU(v->u.mi));
+
+ if (!FcMatrixPtrU(mi))
+ return FcValueListPtrCreateDynamic(pi);
+ v->u.mi = mi;
+ }
+ break;
+ case FcTypeCharSet:
+ if (FcCharSetPtrU(v->u.ci))
+ {
+ FcCharSetPtr ci = FcCharSetSerialize(FcCharSetPtrU(v->u.ci));
+ if (!FcCharSetPtrU(v->u.ci))
+ return FcValueListPtrCreateDynamic(pi);
+ v->u.ci = ci;
+ }
+ break;
+ case FcTypeLangSet:
+ if (FcLangSetPtrU(v->u.li))
+ {
+ FcLangSetPtr li = FcLangSetSerialize(FcLangSetPtrU(v->u.li));
+ if (!FcLangSetPtrU(v->u.li))
+ return FcValueListPtrCreateDynamic(pi);
+ v->u.li = li;
+ }
+ break;
+ default:
+ break;
+ }
+ return new;
+}
+
+FcValueList *
+FcValueListPtrU (FcValueListPtr pi)
+{
+ switch (pi.storage)
+ {
+ case FcStorageStatic:
+ if (pi.u.stat == 0) return 0;
+ return &fcvaluelists[pi.u.stat];
+ case FcStorageDynamic:
+ return pi.u.dyn;
+ default:
+ return 0;
+ }
+}
+
+FcValueListPtr
+FcValueListPtrCreateDynamic(FcValueList * p)
{
+ FcValueListPtr r;
+
+ r.storage = FcStorageDynamic;
+ r.u.dyn = p;
+ return r;
+}
+
+/* Indices allow us to convert dynamic strings into static
+ * strings without having to reassign IDs. We do reassign IDs
+ * when serializing, which effectively performs mark-and-sweep
+ * garbage collection. */
+
+/* objectptr_count maps FcObjectPtr to:
+ + offsets in objectcontent_static_buf (if positive)
+ - entries in objectcontent_dynamic (if negative)
+*/
+static int objectptr_count = 1;
+static int objectptr_alloc = 0;
+static int * objectptr_indices = 0;
+
+/* invariant: objectcontent_static_buf must be sorted. */
+/* e.g. objectptr_static_buf = "name\0style\0weight\0" */
+static int objectcontent_static_bytes = 0;
+static char * objectcontent_static_buf;
+
+/* just a bunch of strings. */
+static int objectcontent_dynamic_count = 1;
+static int objectcontent_dynamic_alloc = 0;
+static const char ** objectcontent_dynamic = 0;
+static int * objectcontent_dynamic_refcount = 0;
+
#define OBJECT_HASH_SIZE 31
- static struct objectBucket {
- struct objectBucket *next;
- FcChar32 hash;
- } *buckets[OBJECT_HASH_SIZE];
+struct objectBucket {
+ struct objectBucket *next;
+ FcChar32 hash;
+};
+static struct objectBucket **buckets = 0;
+
+FcObjectPtr
+FcObjectStaticName (const char *name)
+{
FcChar32 hash = FcStringHash ((const FcChar8 *) name);
struct objectBucket **p;
struct objectBucket *b;
+ const char * nn;
int size;
+ FcObjectPtr new;
+
+ if (!buckets)
+ {
+ buckets = malloc(sizeof (struct objectBucket *)*OBJECT_HASH_SIZE);
+ memset (buckets, 0, sizeof (struct objectBucket *)*OBJECT_HASH_SIZE);
+ }
for (p = &buckets[hash % OBJECT_HASH_SIZE]; (b = *p); p = &(b->next))
- if (b->hash == hash && !strcmp (name, (char *) (b + 1)))
- return (char *) (b + 1);
- size = sizeof (struct objectBucket) + strlen (name) + 1;
+ {
+ FcObjectPtr bp = *((FcObjectPtr *) (b + 1));
+ if (b->hash == hash && FcObjectPtrU(bp) && !strcmp (name, FcObjectPtrU(bp)))
+ {
+ if (objectptr_indices[bp] < 0)
+ objectcontent_dynamic_refcount[-objectptr_indices[bp]]++;
+ return bp;
+ }
+ }
+
+ /* didn't find it, so add a new dynamic string */
+ if (objectcontent_dynamic_count >= objectcontent_dynamic_alloc)
+ {
+ int s = objectcontent_dynamic_alloc + 4;
+
+ const char ** d = realloc (objectcontent_dynamic,
+ s*sizeof(char *));
+ if (!d)
+ return 0;
+ FcMemFree(FC_MEM_STATICSTR,
+ objectcontent_dynamic_alloc * sizeof(char *));
+ FcMemAlloc(FC_MEM_STATICSTR, s*sizeof(char *));
+ objectcontent_dynamic = d;
+ objectcontent_dynamic_alloc = s;
+
+ int * rc = realloc (objectcontent_dynamic_refcount, s*sizeof(int));
+ if (!rc)
+ return 0;
+ FcMemFree(FC_MEM_STATICSTR,
+ objectcontent_dynamic_alloc * sizeof(int));
+ FcMemAlloc(FC_MEM_STATICSTR, s * sizeof(int));
+ objectcontent_dynamic_refcount = rc;
+ }
+ if (objectptr_count >= objectptr_alloc)
+ {
+ int s = objectptr_alloc + 4;
+ int * d = realloc (objectptr_indices, s*sizeof(int));
+ if (!d)
+ return 0;
+ FcMemFree(FC_MEM_STATICSTR, objectptr_alloc * sizeof(int));
+ FcMemAlloc(FC_MEM_STATICSTR, s);
+ objectptr_indices = d;
+ objectptr_indices[0] = 0;
+ objectptr_alloc = s;
+ }
+
+ size = sizeof (struct objectBucket) + sizeof (FcObjectPtr);
b = malloc (size);
- FcMemAlloc (FC_MEM_STATICSTR, size);
if (!b)
- return NULL;
+ return 0;
+ FcMemAlloc (FC_MEM_STATICSTR, size);
b->next = 0;
b->hash = hash;
- strcpy ((char *) (b + 1), name);
+ nn = malloc(strlen(name)+1);
+ if (!nn)
+ goto bail;
+ strcpy ((char *)nn, name);
+ objectptr_indices[objectptr_count] = -objectcontent_dynamic_count;
+ objectcontent_dynamic_refcount[objectcontent_dynamic_count] = 1;
+ objectcontent_dynamic[objectcontent_dynamic_count++] = nn;
+ new = objectptr_count++;
+ *((FcObjectPtr *)(b+1)) = new;
*p = b;
- return (char *) (b + 1);
+ return new;
+
+ bail:
+ free(b);
+ return 0;
+}
+
+void
+FcObjectPtrDestroy (FcObjectPtr p)
+{
+ if (objectptr_indices[p] < 0)
+ {
+ objectcontent_dynamic_refcount[-objectptr_indices[p]]--;
+ if (objectcontent_dynamic_refcount[-objectptr_indices[p]] == 0)
+ {
+ /* this code doesn't seem to be reached terribly often. */
+ /* (note that objectcontent_dynamic overapproximates
+ * the use count, because not every result from
+ * StaticName is stored. */
+ FcStrFree((char *)objectcontent_dynamic[-objectptr_indices[p]]);
+ objectcontent_dynamic[-objectptr_indices[p]] = 0;
+ }
+ }
+}
+
+const char *
+FcObjectPtrU (FcObjectPtr si)
+{
+ if (objectptr_indices[si] > 0)
+ return &objectcontent_static_buf[objectptr_indices[si]];
+ else
+ return objectcontent_dynamic[-objectptr_indices[si]];
+}
+
+static FcBool objectptr_first_serialization = FcFalse;
+static int * object_old_id_to_new = 0;
+
+static void
+FcObjectRebuildStaticNameHashtable (void)
+{
+ int i;
+ struct objectBucket *b, *bn;
+
+ if (buckets)
+ {
+ for (i = 0; i < OBJECT_HASH_SIZE; i++)
+ {
+ b = buckets[i];
+ while (b)
+ {
+ bn = b->next;
+ free(b);
+ FcMemFree (FC_MEM_STATICSTR,
+ sizeof (struct objectBucket)+sizeof (FcObjectPtr));
+ b = bn;
+ }
+ }
+ free (buckets);
+ }
+
+ buckets = malloc(sizeof (struct objectBucket *)*OBJECT_HASH_SIZE);
+ memset (buckets, 0, sizeof (struct objectBucket *)*OBJECT_HASH_SIZE);
+
+ for (i = 1; i < objectptr_count; i++)
+ {
+ if (FcObjectPtrU(i))
+ {
+ const char * name = FcObjectPtrU(i);
+ FcChar32 hash = FcStringHash ((const FcChar8 *) name);
+ struct objectBucket **p;
+ int size;
+
+ for (p = &buckets[hash % OBJECT_HASH_SIZE]; (b = *p);
+ p = &(b->next))
+ ;
+ size = sizeof (struct objectBucket) + sizeof (FcObjectPtr);
+ b = malloc (size);
+ if (!b)
+ return;
+ FcMemAlloc (FC_MEM_STATICSTR, size);
+ b->next = 0;
+ b->hash = hash;
+ *((FcObjectPtr *)(b+1)) = i;
+ *p = b;
+ }
+ }
+}
+
+/* Hmm. This will have a terrible effect on the memory size,
+ * because the mmapped strings now get reallocated on the heap.
+ * Is it all worth it? (Of course, the Serialization codepath is
+ * not problematic.) */
+static FcBool
+FcObjectPtrConvertToStatic(FcBool renumber)
+{
+ int active_count, i, j, longest_string = 0,
+ new_static_bytes = 1;
+ char * fixed_length_buf, * new_static_buf, * p;
+ int * new_indices;
+
+ if (renumber)
+ objectptr_first_serialization = FcFalse;
+
+ /* collect statistics */
+ for (i = 1, active_count = 1; i < objectptr_count; i++)
+ if (!renumber || object_old_id_to_new[i] == -1)
+ {
+ int sl = strlen(FcObjectPtrU(i));
+ active_count++;
+ if (sl > longest_string)
+ longest_string = sl;
+ new_static_bytes += sl + 1;
+ }
+
+ /* allocate storage */
+ fixed_length_buf = malloc
+ ((longest_string+1) * active_count * sizeof(char));
+ if (!fixed_length_buf)
+ goto bail;
+ new_static_buf = malloc (new_static_bytes * sizeof(char));
+ if (!new_static_buf)
+ goto bail1;
+ new_indices = malloc (active_count * sizeof(int));
+ if (!new_indices)
+ goto bail2;
+
+ FcMemAlloc (FC_MEM_STATICSTR, new_static_bytes);
+ FcMemFree (FC_MEM_STATICSTR, objectptr_count * sizeof (int));
+ FcMemAlloc (FC_MEM_STATICSTR, active_count * sizeof (int));
+
+ /* copy strings to temporary buffers */
+ for (j = 0, i = 1; i < objectptr_count; i++)
+ if (!renumber || object_old_id_to_new[i] == -1)
+ {
+ strcpy (fixed_length_buf+(j*(longest_string+1)), FcObjectPtrU(i));
+ j++;
+ }
+
+ /* sort the new statics */
+ qsort (fixed_length_buf, active_count-1, longest_string+1,
+ (int (*)(const void *, const void *)) FcStrCmp);
+
+ /* now we create the new static buffer in sorted order. */
+ p = new_static_buf+1;
+ for (i = 0; i < active_count-1; i++)
+ {
+ strcpy(p, fixed_length_buf + i * (longest_string+1));
+ p += strlen(p)+1;
+ }
+
+ /* create translation table by iterating over sorted strings
+ * and getting their old values */
+ p = new_static_buf+1;
+ for (i = 0; i < active_count-1; i++)
+ {
+ int n = FcObjectStaticName(fixed_length_buf+i*(longest_string+1));
+ if (renumber)
+ {
+ object_old_id_to_new[n] = i;
+ new_indices[i] = p-new_static_buf;
+ }
+ else
+ new_indices[n] = p-new_static_buf;
+ p += strlen(p)+1;
+ }
+
+ free (objectptr_indices);
+ objectptr_indices = new_indices;
+ objectptr_count = active_count;
+ objectptr_alloc = active_count;
+
+ /* free old storage */
+ for (i = 1; i < objectcontent_dynamic_count; i++)
+ {
+ if (objectcontent_dynamic[i])
+ {
+ FcMemFree (FC_MEM_STATICSTR, strlen(objectcontent_dynamic[i])+1);
+ free ((char *)objectcontent_dynamic[i]);
+ }
+ }
+ free (objectcontent_dynamic);
+ free (objectcontent_dynamic_refcount);
+ FcMemFree (FC_MEM_STATICSTR, objectcontent_dynamic_count*sizeof (int));
+ objectcontent_dynamic = 0;
+ objectcontent_dynamic_refcount = 0;
+ objectcontent_dynamic_count = 1;
+ objectcontent_dynamic_alloc = 0;
+ free (objectcontent_static_buf);
+ FcMemFree (FC_MEM_STATICSTR, objectcontent_static_bytes);
+ objectcontent_static_buf = new_static_buf;
+ objectcontent_static_bytes = new_static_bytes;
+
+ /* fix up hash table */
+ FcObjectRebuildStaticNameHashtable();
+
+ free (fixed_length_buf);
+ return FcTrue;
+
+ bail2:
+ free (new_static_buf);
+ bail1:
+ free (fixed_length_buf);
+ bail:
+ return FcFalse;
+}
+
+#define OBJECT_PTR_CONVERSION_TRIGGER 100000
+
+int
+FcObjectPtrCompare (const FcObjectPtr a, const FcObjectPtr b)
+{
+ /* This is the dynamic count. We could also use a static
+ * count, i.e. the number of slow strings being created.
+ * I think dyncount gives us a better estimate of inefficiency. -PL */
+ static int compare_count = OBJECT_PTR_CONVERSION_TRIGGER;
+
+ /* count on sortedness for fast objectptrs. */
+ if ((a == b) || (objectptr_indices[a] > 0 && objectptr_indices[b] > 0))
+ return objectptr_indices[a] - objectptr_indices[b];
+
+ compare_count--;
+ if (!compare_count)
+ {
+ FcObjectPtrConvertToStatic(FcFalse);
+ compare_count = OBJECT_PTR_CONVERSION_TRIGGER;
+ }
+
+ return strcmp (FcObjectPtrU(a), FcObjectPtrU(b));
+}
+
+void
+FcObjectClearStatic(void)
+{
+ objectptr_count = 1;
+ objectptr_alloc = 0;
+ objectptr_indices = 0;
+
+ objectcontent_static_bytes = 0;
+ objectcontent_static_buf = 0;
+
+ objectcontent_dynamic_count = 1;
+ objectcontent_dynamic_alloc = 0;
+ objectcontent_dynamic = 0;
+ objectcontent_dynamic_refcount = 0;
+
+ object_old_id_to_new = 0;
+}
+
+static FcObjectPtr
+FcObjectSerialize (FcObjectPtr si)
+{
+ if (objectptr_first_serialization)
+ if (!FcObjectPtrConvertToStatic(FcTrue))
+ return 0;
+
+ return object_old_id_to_new[si];
+}
+
+/* In the pre-serialization phase, mark the used strings with
+ * -1 in the mapping array. */
+/* The first call to the serialization phase assigns actual
+ * static indices to the strings (sweep). */
+FcBool
+FcObjectPrepareSerialize (FcObjectPtr si)
+{
+ if (object_old_id_to_new == 0)
+ {
+ object_old_id_to_new = malloc(objectptr_count * sizeof(int));
+ if (!object_old_id_to_new)
+ goto bail;
+ memset (object_old_id_to_new, 0,
+ objectptr_count * sizeof(int));
+ }
+
+ object_old_id_to_new[si] = -1;
+ objectptr_first_serialization = FcTrue;
+
+ return FcTrue;
+
+ bail:
+ return FcFalse;
}