mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-04-23 03:32:51 -06:00
Merge branch 'majestic' of github.com:GrammaticalFramework/gf-core into majestic
This commit is contained in:
@@ -29,7 +29,7 @@ libpgf_la_SOURCES = \
|
|||||||
|
|
||||||
libpgf_la_LDFLAGS = -no-undefined
|
libpgf_la_LDFLAGS = -no-undefined
|
||||||
libpgf_la_LIBADD = -lrt
|
libpgf_la_LIBADD = -lrt
|
||||||
libpgf_la_CXXFLAGS = -fno-rtti
|
libpgf_la_CXXFLAGS = -fno-rtti -std=c++11
|
||||||
|
|
||||||
bin_PROGRAMS =
|
bin_PROGRAMS =
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,8 @@
|
|||||||
#include <sys/mman.h>
|
#include <sys/mman.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#include <pthread.h>
|
||||||
|
|
||||||
#include "data.h"
|
#include "data.h"
|
||||||
|
|
||||||
@@ -589,7 +591,7 @@ object PgfDB::malloc_internal(size_t bytes)
|
|||||||
invoked all that often in most programs. And the programs that
|
invoked all that often in most programs. And the programs that
|
||||||
it is called frequently in otherwise tend to fragment.
|
it is called frequently in otherwise tend to fragment.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
idx = largebin_index(nb);
|
idx = largebin_index(nb);
|
||||||
if (ms->have_fastchunks)
|
if (ms->have_fastchunks)
|
||||||
malloc_consolidate(ms);
|
malloc_consolidate(ms);
|
||||||
|
|||||||
@@ -112,6 +112,6 @@ private:
|
|||||||
DB_scope* next_scope;
|
DB_scope* next_scope;
|
||||||
};
|
};
|
||||||
|
|
||||||
extern PGF_INTERNAL_DECL thread_local DB_scope *last_db_scope __attribute__((tls_model("initial-exec")));
|
extern PGF_INTERNAL_DECL __thread DB_scope *last_db_scope __attribute__((tls_model("initial-exec")));
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user