[Fontconfig] fontconfig: Branch 'master'

[Behdad Esfahbod]

 test/Makefile.am    |    9 +++++
 test/test-pthread.c |   79 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 88 insertions(+)

New commits:
commit 7680e9ee891a74f0e428e30604a5d0ff0e2e9383
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Jan 8 14:51:00 2013 -0600

    Add pthread test
    
    Not enabled by default since it requires config and fonts.

diff --git a/test/Makefile.am b/test/Makefile.am
index 3fd343a..3ba8e93 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -4,6 +4,15 @@ TESTS=run-test.sh
 
 TESTDATA=4x6.pcf 8x16.pcf out.expected fonts.conf.in
 
+if HAVE_PTHREAD
+check_PROGRAMS = test-pthread
+noinst_PROGRAMS = $(check_PROGRAMS)
+test_pthread_LDADD = $(top_builddir)/src/libfontconfig.la
+# We don't enable this test by default because it will require config and fonts
+# to meaningfully test anything, and we are not installed yet.
+#TESTS += test-pthread
+endif
+
 EXTRA_DIST=$(check_SCRIPTS) $(TESTDATA)
 
 CLEANFILES=
diff --git a/test/test-pthread.c b/test/test-pthread.c
new file mode 100644
index 0000000..7701a24
--- /dev/null
+++ b/test/test-pthread.c
@@ -0,0 +1,79 @@
+/* Code originally from Raimund Steger. */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <pthread.h>
+#include <fontconfig/fontconfig.h>
+
+#define NTHR 100
+#define NTEST 100
+
+struct thr_arg_s
+{
+	int thr_num;
+};
+
+static void test_match(int thr_num,int test_num)
+{
+	FcPattern *pat;
+	FcPattern *match;
+	FcResult  result;
+
+	FcInit();
+
+	pat = FcNameParse((const FcChar8 *)"New Century Schoolbook");
+		
+	FcConfigSubstitute(0,pat,FcMatchPattern);
+	FcDefaultSubstitute(pat);
+	
+	match = FcFontMatch(0,pat,&result);
+		
+	FcPatternDestroy(pat);
+	FcPatternDestroy(match);
+}
+
+static void *run_test_in_thread(void *arg)
+{
+	struct thr_arg_s *thr_arg=(struct thr_arg_s *)arg;
+	int thread_num = thr_arg->thr_num;
+	int i=0;
+
+	for(;i<NTEST;i++) test_match(thread_num,i);
+
+	printf("Thread %d: done\n",thread_num);
+
+	return NULL;
+}
+
+int main(int argc,char **argv)
+{
+	pthread_t threads[NTHR];
+	int i, j;
+
+	printf("Creating %d threads\n",NTHR);
+
+	for(i = 0;i<NTHR;i++)
+	{
+		struct thr_arg_s thr_arg;
+		int result;
+		thr_arg.thr_num=i;
+		result = pthread_create(&threads[i],NULL,run_test_in_thread,
+					(void *)&thr_arg);
+		if(result!=0)
+		{
+			fprintf(stderr,"Cannot create thread %d\n",i);
+			break;
+		}
+	}
+
+	for(j=0;j<i;j++)
+	{
+		pthread_join(threads[j],NULL);
+		printf("Joined thread %d\n",j);
+	}
+
+	FcFini();
+
+	return 0;
+}