Changeset: aa9da1651b5f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/aa9da1651b5f
Modified Files:
clients/Tests/exports.stable.out
monetdb5/mal/mal.c
monetdb5/mal/mal.h
monetdb5/mal/mal_internal.h
monetdb5/mal/mal_linker.c
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_resource.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/tokenizer.c
Branch: default
Log Message:
Unexport a bunch of lock variables.
diffs (125 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1069,16 +1069,12 @@ const char *malRef;
void mal_atom_reset(void);
ClientRec *mal_clients;
MT_Lock mal_contextLock;
-MT_Lock mal_copyLock;
-MT_Lock mal_delayLock;
_Noreturn void mal_exit(int status);
int mal_init(char *modules[], bool embedded, const char *initpasswd);
void mal_instruction_reset(void);
void mal_module(const char *name, mel_atom *atoms, mel_func *funcs);
void mal_module2(const char *name, mel_atom *atoms, mel_func *funcs, mel_init
initfunc, const char *code);
-MT_Lock mal_profileLock;
str mal_quote(const char *msg, size_t size);
-MT_Lock mal_remoteLock;
void mal_reset(void);
int mal_startup(void);
void mal_unquote(char *msg);
diff --git a/monetdb5/mal/mal.c b/monetdb5/mal/mal.c
--- a/monetdb5/mal/mal.c
+++ b/monetdb5/mal/mal.c
@@ -36,7 +36,6 @@ lng MALdebug;
#include "mal_atom.h"
MT_Lock mal_contextLock = MT_LOCK_INITIALIZER(mal_contextLock);
-MT_Lock mal_remoteLock = MT_LOCK_INITIALIZER(mal_remoteLock);
MT_Lock mal_profileLock = MT_LOCK_INITIALIZER(mal_profileLock);
MT_Lock mal_copyLock = MT_LOCK_INITIALIZER(mal_copyLock);
MT_Lock mal_delayLock = MT_LOCK_INITIALIZER(mal_delayLock);
diff --git a/monetdb5/mal/mal.h b/monetdb5/mal/mal.h
--- a/monetdb5/mal/mal.h
+++ b/monetdb5/mal/mal.h
@@ -66,11 +66,7 @@ mal_export stream *maleventstream;
#define GRPperformance (DEADBEEFMASK)
#define GRPforcemito (FORCEMITOMASK | NOSYNCMASK)
-mal_export MT_Lock mal_contextLock;
-mal_export MT_Lock mal_remoteLock;
-mal_export MT_Lock mal_profileLock ;
-mal_export MT_Lock mal_copyLock ;
-mal_export MT_Lock mal_delayLock ;
+mal_export MT_Lock mal_contextLock;
mal_export int mal_init(char *modules[], bool embedded, const char
*initpasswd);
mal_export _Noreturn void mal_exit(int status);
diff --git a/monetdb5/mal/mal_internal.h b/monetdb5/mal/mal_internal.h
--- a/monetdb5/mal/mal_internal.h
+++ b/monetdb5/mal/mal_internal.h
@@ -18,3 +18,7 @@ Client setClientContext(Client cntxt)
__attribute__((__visibility__("hidden")));
extern size_t qsize;
+
+extern MT_Lock mal_profileLock;
+extern MT_Lock mal_copyLock;
+extern MT_Lock mal_delayLock;
diff --git a/monetdb5/mal/mal_linker.c b/monetdb5/mal/mal_linker.c
--- a/monetdb5/mal/mal_linker.c
+++ b/monetdb5/mal/mal_linker.c
@@ -16,6 +16,7 @@
#include "mal_function.h" /* for throw() */
#include "mal_import.h" /* for slash_2_dir_sep() */
#include "mal_private.h"
+#include "mal_internal.h"
#include "mutils.h"
#include <sys/types.h> /* opendir */
diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c
--- a/monetdb5/mal/mal_profiler.c
+++ b/monetdb5/mal/mal_profiler.c
@@ -25,6 +25,7 @@
#include "mal_runtime.h"
#include "mal_utils.h"
#include "mal_resource.h"
+#include "mal_internal.h"
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
diff --git a/monetdb5/mal/mal_resource.c b/monetdb5/mal/mal_resource.c
--- a/monetdb5/mal/mal_resource.c
+++ b/monetdb5/mal/mal_resource.c
@@ -12,6 +12,7 @@
#include "mal_exception.h"
#include "mal_resource.h"
#include "mal_private.h"
+#include "mal_internal.h"
#include "mal_instruction.h"
/* Memory based admission does not seem to have a major impact so far. */
diff --git a/monetdb5/modules/mal/mal_mapi.c b/monetdb5/modules/mal/mal_mapi.c
--- a/monetdb5/modules/mal/mal_mapi.c
+++ b/monetdb5/modules/mal/mal_mapi.c
@@ -35,6 +35,7 @@
#include "mal_exception.h"
#include "mal_interpreter.h"
#include "mal_authorize.h"
+#include "mal_internal.h"
#include "msabaoth.h"
#include "mcrypt.h"
#include "stream.h"
diff --git a/monetdb5/modules/mal/remote.c b/monetdb5/modules/mal/remote.c
--- a/monetdb5/modules/mal/remote.c
+++ b/monetdb5/modules/mal/remote.c
@@ -101,6 +101,8 @@ typedef struct _connection {
#endif
#include <unistd.h> /* gethostname */
+static MT_Lock mal_remoteLock = MT_LOCK_INITIALIZER(mal_remoteLock);
+
static connection conns = NULL;
static unsigned char localtype = 0177;
diff --git a/monetdb5/modules/mal/tokenizer.c b/monetdb5/modules/mal/tokenizer.c
--- a/monetdb5/modules/mal/tokenizer.c
+++ b/monetdb5/modules/mal/tokenizer.c
@@ -44,6 +44,7 @@
#include "mal_interpreter.h"
#include "mal_linker.h"
#include "mal_exception.h"
+#include "mal_internal.h"
#define MAX_TKNZR_DEPTH 256
#define INDEX MAX_TKNZR_DEPTH
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
