* PERFORMANCE OF THIS SOFTWARE.
*/
-#include <fcntl.h>
-#include <sys/mman.h>
#include "fcint.h"
typedef struct {
- FcChar8 *lang;
- FcCharSet charset;
+ const FcChar8 *lang;
+ const FcCharSet charset;
} FcLangCharSet;
typedef struct {
struct _FcLangSet {
FcChar32 map[NUM_LANG_SET_MAP];
- FcStrSetPtr extra;
+ FcStrSet *extra;
};
#define FcLangSetBitSet(ls, id) ((ls)->map[(id)>>5] |= ((FcChar32) 1 << ((id) & 0x1f)))
#define FcLangSetBitGet(ls, id) (((ls)->map[(id)>>5] >> ((id) & 0x1f)) & 1)
+static FcBool langsets_populated = FcFalse;
+
FcLangSet *
FcFreeTypeLangSet (const FcCharSet *charset,
const FcChar8 *exclusiveLang)
FcChar32 missing;
const FcCharSet *exclusiveCharset = 0;
FcLangSet *ls;
-
+
+ if (!langsets_populated)
+ {
+ FcLangCharSetPopulate ();
+ langsets_populated = FcTrue;
+ }
if (exclusiveLang)
exclusiveCharset = FcCharSetForLang (exclusiveLang);
FcChar32 map[FC_CHARSET_MAP_SIZE];
FcChar32 next;
- printf ("\n%s(%d) ", fcLangCharSets[i].lang, missing);
+ printf ("\n%s(%u) ", fcLangCharSets[i].lang, missing);
printf ("{");
for (ucs4 = FcCharSetFirstPage (missed, map, &next);
ucs4 != FC_CHARSET_DONE;
FcCharSetDestroy (missed);
}
else
- printf ("%s(%d) ", fcLangCharSets[i].lang, missing);
+ printf ("%s(%u) ", fcLangCharSets[i].lang, missing);
}
if (!missing)
FcLangSetBitSet (ls, i);
{
int i;
int country = -1;
+
+ if (!langsets_populated)
+ {
+ FcLangCharSetPopulate ();
+ langsets_populated = FcTrue;
+ }
+
for (i = 0; i < NUM_LANG_CHAR_SET; i++)
{
switch (FcLangCompare (lang, fcLangCharSets[i].lang)) {
}
if (country == -1)
return 0;
- return &fcLangCharSets[i].charset;
+ return &fcLangCharSets[country].charset;
}
FcLangSet *
return 0;
FcMemAlloc (FC_MEM_LANGSET, sizeof (FcLangSet));
memset (ls->map, '\0', sizeof (ls->map));
- ls->extra = FcStrSetPtrCreateDynamic(0);
+ ls->extra = 0;
return ls;
}
-void
-FcLangSetPtrDestroy (FcLangSetPtr li)
-{
- if (li.storage == FcStorageDynamic)
- FcLangSetDestroy(FcLangSetPtrU(li));
-}
-
void
FcLangSetDestroy (FcLangSet *ls)
{
- if (FcStrSetPtrU(ls->extra))
- FcStrSetDestroy (FcStrSetPtrU(ls->extra));
+ if (ls->extra)
+ FcStrSetDestroy (ls->extra);
FcMemFree (FC_MEM_LANGSET, sizeof (FcLangSet));
free (ls);
}
if (!new)
goto bail0;
memcpy (new->map, ls->map, sizeof (new->map));
- if (FcStrSetPtrU(ls->extra))
+ if (ls->extra)
{
FcStrList *list;
FcChar8 *extra;
- new->extra = FcStrSetPtrCreateDynamic(FcStrSetCreate ());
- if (!FcStrSetPtrU(new->extra))
+ new->extra = FcStrSetCreate ();
+ if (!new->extra)
goto bail1;
- list = FcStrListCreate (FcStrSetPtrU(ls->extra));
+ list = FcStrListCreate (ls->extra);
if (!list)
goto bail1;
while ((extra = FcStrListNext (list)))
- if (!FcStrSetAdd (FcStrSetPtrU(new->extra), extra))
+ if (!FcStrSetAdd (new->extra, extra))
{
FcStrListDone (list);
goto bail1;
FcLangSetBitSet (ls, id);
return FcTrue;
}
- if (!FcStrSetPtrU(ls->extra))
+ if (!ls->extra)
{
- ls->extra = FcStrSetPtrCreateDynamic(FcStrSetCreate ());
- if (!FcStrSetPtrU(ls->extra))
+ ls->extra = FcStrSetCreate ();
+ if (!ls->extra)
return FcFalse;
}
- return FcStrSetAdd (FcStrSetPtrU(ls->extra), lang);
+ return FcStrSetAdd (ls->extra, lang);
}
FcLangResult
if (FcLangSetBitGet (ls, i) && r < best)
best = r;
}
- if (FcStrSetPtrU(ls->extra))
+ if (ls->extra)
{
- FcStrList *list = FcStrListCreate (FcStrSetPtrU(ls->extra));
+ FcStrList *list = FcStrListCreate (ls->extra);
FcChar8 *extra;
- FcLangResult r;
if (list)
{
best = FcLangDifferentCountry;
break;
}
- if (FcStrSetPtrU(lsa->extra))
+ if (lsa->extra)
{
- r = FcLangSetCompareStrSet (lsb, FcStrSetPtrU(lsa->extra));
+ r = FcLangSetCompareStrSet (lsb, lsa->extra);
if (r < best)
best = r;
}
- if (best > FcLangEqual && FcStrSetPtrU(lsb->extra))
+ if (best > FcLangEqual && lsb->extra)
{
- r = FcLangSetCompareStrSet (lsa, FcStrSetPtrU(lsb->extra));
+ r = FcLangSetCompareStrSet (lsa, lsb->extra);
if (r < best)
best = r;
}
int id;
memset (ls.map, '\0', sizeof (ls.map));
- ls.extra = FcStrSetPtrCreateDynamic(0);
+ ls.extra = 0;
id = FcLangSetIndex (lang);
if (id > 0)
{
}
else
{
- ls.extra = FcStrSetPtrCreateDynamic(&strs);
+ ls.extra = &strs;
strs.num = 1;
strs.size = 1;
- strs.storage = FcStorageDynamic;
- strs.u.strs = &str;
+ strs.strs = &str;
strs.ref = 1;
str = (FcChar8 *) lang;
}
for (i = 0; i < NUM_LANG_SET_MAP; i++)
h ^= ls->map[i];
- if (FcStrSetPtrU(ls->extra))
- h ^= FcStrSetPtrU(ls->extra)->num;
+ if (ls->extra)
+ h ^= ls->extra->num;
return h;
}
}
}
}
- if (FcStrSetPtrU(ls->extra))
+ if (ls->extra)
{
- FcStrList *list = FcStrListCreate (FcStrSetPtrU(ls->extra));
+ FcStrList *list = FcStrListCreate (ls->extra);
FcChar8 *extra;
if (!list)
{
if (!first)
if (!FcStrBufChar (buf, '|'))
+ {
+ FcStrListDone (list);
return FcFalse;
+ }
if (!FcStrBufString (buf, extra))
- return FcFalse;
+ {
+ FcStrListDone (list);
+ return FcFalse;
+ }
first = FcFalse;
}
+ FcStrListDone (list);
}
return FcTrue;
}
if (lsa->map[i] != lsb->map[i])
return FcFalse;
}
- if (!FcStrSetPtrU(lsa->extra) && !FcStrSetPtrU(lsb->extra))
+ if (!lsa->extra && !lsb->extra)
return FcTrue;
- if (FcStrSetPtrU(lsa->extra) && FcStrSetPtrU(lsb->extra))
- return FcStrSetEqual (FcStrSetPtrU(lsa->extra), FcStrSetPtrU(lsb->extra));
+ if (lsa->extra && lsb->extra)
+ return FcStrSetEqual (lsa->extra, lsb->extra);
return FcFalse;
}
FcLangContains (fcLangCharSets[i].lang, lang))
return FcTrue;
}
- if (FcStrSetPtrU(ls->extra))
+ if (ls->extra)
{
- FcStrList *list = FcStrListCreate (FcStrSetPtrU(ls->extra));
+ FcStrList *list = FcStrListCreate (ls->extra);
FcChar8 *extra;
if (list)
}
}
}
- if (FcStrSetPtrU(lsb->extra))
+ if (lsb->extra)
{
- FcStrList *list = FcStrListCreate (FcStrSetPtrU(lsb->extra));
+ FcStrList *list = FcStrListCreate (lsb->extra);
FcChar8 *extra;
if (list)
return FcTrue;
}
-static FcLangSet * langsets = 0;
-static int langset_ptr = 0, langset_count = 0;
+static FcLangSet ** langsets = 0;
+static int langset_bank_count = 0, langset_ptr = 0, langset_count = 0;
-FcLangSet *
-FcLangSetPtrU (FcLangSetPtr li)
+void
+FcLangSetNewBank (void)
{
- switch (li.storage)
- {
- case FcStorageDynamic:
- return li.u.dyn;
- case FcStorageStatic:
- return &langsets[li.u.stat];
- default:
- return 0;
-
- }
+ langset_count = 0;
}
-FcLangSetPtr
-FcLangSetPtrCreateDynamic (FcLangSet *li)
+/* ideally, should only write one copy of any particular FcLangSet */
+int
+FcLangSetNeededBytes (const FcLangSet *l)
{
- FcLangSetPtr new;
- new.storage = FcStorageDynamic;
- new.u.dyn = li;
- return new;
+ langset_count++;
+ return sizeof (FcLangSet);
}
-void
-FcLangSetClearStatic (void)
+int
+FcLangSetNeededBytesAlign (void)
{
- FcStrSetClearStatic();
- langset_ptr = 0;
- langset_count = 0;
+ return fc_alignof (FcLangSet);
}
-/* should only write one copy of any particular FcLangSet */
-FcBool
-FcLangSetPrepareSerialize (FcLangSet *l)
+static FcBool
+FcLangSetEnsureBank (int bi)
{
- langset_count++;
- if (l && FcStrSetPtrU(l->extra))
- return FcStrSetPrepareSerialize (FcStrSetPtrU(l->extra));
+ if (!langsets || bi >= langset_bank_count)
+ {
+ int new_count = langset_bank_count + 2;
+ int i;
+ FcLangSet** tt;
+ tt = realloc(langsets, new_count * sizeof(FcLangSet *));
+ if (!tt)
+ return FcFalse;
+
+ langsets = tt;
+ for (i = langset_bank_count; i < new_count; i++)
+ langsets[i] = 0;
+ langset_bank_count = new_count;
+ }
+
return FcTrue;
}
-FcLangSetPtr
-FcLangSetSerialize(FcLangSet *l)
+void *
+FcLangSetDistributeBytes (FcCache * metadata, void * block_ptr)
{
- FcLangSetPtr new;
- int p = langset_ptr;
+ int bi = FcCacheBankToIndex(metadata->bank);
+ if (!FcLangSetEnsureBank(bi))
+ return 0;
+
+ block_ptr = ALIGN(block_ptr, FcLangSet);
+ langsets[bi] = block_ptr;
+ block_ptr = (void *)((char *)block_ptr +
+ langset_count * sizeof(FcLangSet));
+ langset_ptr = 0;
+ metadata->langset_count = langset_count;
+ return block_ptr;
+}
- if (!l) return FcLangSetPtrCreateDynamic(0);
+FcLangSet *
+FcLangSetSerialize(int bank, FcLangSet *l)
+{
+ int p = langset_ptr, bi = FcCacheBankToIndex(bank);
- if (!langsets)
- {
- FcLangSet* t;
- t = (FcLangSet *)malloc(langset_count * sizeof(FcLangSet));
- if (!t)
- return FcLangSetPtrCreateDynamic(0);
- langsets = t;
- langset_ptr = 0;
- }
+ if (!l) return 0;
- langsets[langset_ptr] = *l;
- if (FcStrSetPtrU(l->extra))
- langsets[langset_ptr].extra =
- FcStrSetSerialize(FcStrSetPtrU(l->extra));
- else
- langsets[langset_ptr].extra = FcStrSetPtrCreateDynamic(0);
+ langsets[bi][langset_ptr] = *l;
+ langsets[bi][langset_ptr].extra = 0;
langset_ptr++;
- new.storage = FcStorageStatic;
- new.u.stat = p;
- return new;
+ return &langsets[bi][p];
+}
+
+void *
+FcLangSetUnserialize (FcCache * metadata, void *block_ptr)
+{
+ int bi = FcCacheBankToIndex(metadata->bank);
+ if (!FcLangSetEnsureBank(bi))
+ return 0;
+
+ FcMemAlloc (FC_MEM_LANGSET, metadata->langset_count * sizeof(FcLangSet));
+ block_ptr = ALIGN(block_ptr, FcLangSet);
+ langsets[bi] = (FcLangSet *)block_ptr;
+ block_ptr = (void *)((char *)block_ptr +
+ metadata->langset_count * sizeof(FcLangSet));
+ return block_ptr;
}
git.wh0rd.org / fontconfig.git / blobdiff