Changeset: 6368ce61c04b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6368ce61c04b
Modified Files:
monetdb5/mal/mal_instruction.mx
monetdb5/mal/mal_sabaoth.mx
Branch: headless
Log Message:
prepare for split
diffs (240 lines):
diff --git a/monetdb5/mal/mal_instruction.mx b/monetdb5/mal/mal_instruction.mx
--- a/monetdb5/mal/mal_instruction.mx
+++ b/monetdb5/mal/mal_instruction.mx
@@ -33,7 +33,6 @@
#define MAXARG 4 /* BEWARE the code depends on this knowledge */
#define STMT_INCREMENT 32
-#define MAL_VAR_WINDOW 32
#define MAXVARS 32
#define MAXLISTING 64*1024
diff --git a/monetdb5/mal/mal_sabaoth.mx b/monetdb5/mal/mal_sabaoth.mx
--- a/monetdb5/mal/mal_sabaoth.mx
+++ b/monetdb5/mal/mal_sabaoth.mx
@@ -17,30 +17,44 @@
All Rights Reserved.
@
-@f mal_sabaoth
-@a Fabian Groffen
-@+ Cluster support
-The cluster facilitation currently only deals with (de-)registering of
-services offered by the local server to other servers.
-The name of this module is inspired by the Armada setting of anchient
-times and origanisational structures. Sabaoth, stands for ``Lord of
-Hosts'' in an army setting as found in the Bible's New Testament. This
-module allows an army of Mservers to be aware of each other on a local
-machine and redirect to each other when necessary.
-@- Implementation
@h
-
#ifndef _MAL_SABAOTH_DEF
#define _MAL_SABAOTH_DEF
#include <mal.h>
#include <mal_exception.h>
#include <msabaoth.h>
-@-
+mal_export void SABAOTHinit(str dbfarm, str dbname);
+mal_export str SABAOTHgetDBfarm(str *ret);
+mal_export str SABAOTHgetDBname(str *ret);
+mal_export str SABAOTHmarchScenario(int *ret, str *lang);
+mal_export str SABAOTHretreatScenario(int *ret, str *lang);
+mal_export str SABAOTHmarchConnection(int *ret, str *host, int *port);
+mal_export str SABAOTHgetLocalConnection(str *ret);
+mal_export str SABAOTHwildRetreat(int *ret);
+mal_export str SABAOTHregisterStart(int *ret);
+mal_export str SABAOTHregisterStop(int *ret);
+mal_export str SABAOTHgetMyStatus(sabdb** ret);
+mal_export str SABAOTHgetStatus(sabdb** ret, str dbname);
+mal_export str SABAOTHfreeStatus(sabdb** ret);
+mal_export str SABAOTHgetUplogInfo(sabuplog *ret, sabdb *db);
+mal_export str SABAOTHserialise(str *ret, sabdb *db);
+mal_export str SABAOTHdeserialise(sabdb **ret, str *sabdb);
+#endif
@c
-@{
+/* Author(s) Fabian Groffen
+ * Cluster support
+ * The cluster facilitation currently only deals with (de-)registering of
+ * services offered by the local server to other servers.
+ * The name of this module is inspired by the Armada setting of anchient
+ * times and origanisational structures. Sabaoth, stands for ``Lord of
+ * Hosts'' in an army setting as found in the Bible's New Testament. This
+ * module allows an army of Mservers to be aware of each other on a local
+ * machine and redirect to each other when necessary.
+*/
+
#include "monetdb_config.h"
#include "mal_sabaoth.h"
#include <stdio.h> /* fseek, rewind */
@@ -67,9 +81,7 @@
}
#define excFromMem(TPE, WHRE, X) { str _me = createException(TPE, WHRE,
"%s", X); free(X); return(_me); }
-@h
-mal_export void SABAOTHinit(str dbfarm, str dbname);
-@c
+
/**
* Initialises this Sabaoth instance to use the given dbfarm and dbname.
* dbname may be NULL to indicate that there is no active database. The
@@ -79,9 +91,6 @@
msab_init(dbfarm, dbname);
}
-@h
-mal_export str SABAOTHgetDBfarm(str *ret);
-@c
/**
* Returns the dbfarm as received during SABAOTHinit. Throws an
* exception if not initialised.
@@ -95,9 +104,6 @@
return(MAL_SUCCEED);
}
-@h
-mal_export str SABAOTHgetDBname(str *ret);
-@c
/**
* Returns the dbname as received during SABAOTHinit. Throws an
* exception if not initialised or dbname was set to NULL.
@@ -111,9 +117,6 @@
return(MAL_SUCCEED);
}
-@h
-mal_export str SABAOTHmarchScenario(int *ret, str *lang);
-@c
/**
* Writes the given language to the scenarios file. If the file doesn't
* exist, it is created. Multiple invocations of this function for the
@@ -127,9 +130,6 @@
return(MAL_SUCCEED);
}
-@h
-mal_export str SABAOTHretreatScenario(int *ret, str *lang);
-@c
/**
* Removes the given language from the scenarios file. If the scenarios
* file is empty (before or) after removing the language, the file is
@@ -143,9 +143,6 @@
return(MAL_SUCCEED);
}
-@h
-mal_export str SABAOTHmarchConnection(int *ret, str *host, int *port);
-@c
/**
* Writes an URI to the connection file based on the given arguments.
* If the file doesn't exist, it is created. Multiple invocations of
@@ -161,9 +158,6 @@
return(MAL_SUCCEED);
}
-@h
-mal_export str SABAOTHgetLocalConnection(str *ret);
-@c
/**
* Returns the connection string for the current database, or nil when
* there is none. If there are multiple connections defined, only the
@@ -196,9 +190,6 @@
return(MAL_SUCCEED);
}
-@h
-mal_export str SABAOTHwildRetreat(int *ret);
-@c
/**
* Removes all known publications of available services. The function
* name is a nostalgic phrase from "Defender of the Crown" from the
@@ -212,9 +203,6 @@
return(MAL_SUCCEED);
}
-@h
-mal_export str SABAOTHregisterStart(int *ret);
-@c
/**
* Writes a start attempt to the sabaoth start/stop log. Examination of
* the log at a later stage might reveal crashes of the server.
@@ -227,9 +215,6 @@
return(MAL_SUCCEED);
}
-@h
-mal_export str SABAOTHregisterStop(int *ret);
-@c
/**
* Writes a start attempt to the sabaoth start/stop log. Examination of
* the log at a later stage might reveal crashes of the server.
@@ -242,9 +227,6 @@
return(MAL_SUCCEED);
}
-@h
-mal_export str SABAOTHgetMyStatus(sabdb** ret);
-@c
/**
* Returns the status as NULL terminated sabdb struct list for the
* current database. Since the current database should always exist,
@@ -257,9 +239,6 @@
return(MAL_SUCCEED);
}
-@h
-mal_export str SABAOTHgetStatus(sabdb** ret, str dbname);
-@c
/**
* Returns a list of populated sabdb structs. If dbname == NULL, the
* list contains sabdb structs for all found databases in the dbfarm.
@@ -275,9 +254,6 @@
return(MAL_SUCCEED);
}
-@h
-mal_export str SABAOTHfreeStatus(sabdb** ret);
-@c
/**
* Frees up the sabdb structure returned by getStatus.
*/
@@ -288,9 +264,6 @@
return(MAL_SUCCEED);
}
-@h
-mal_export str SABAOTHgetUplogInfo(sabuplog *ret, sabdb *db);
-@c
/**
* Parses the .uplog file for the given database, and fills ret with the
* parsed information.
@@ -302,9 +275,6 @@
return(MAL_SUCCEED);
}
-@h
-mal_export str SABAOTHserialise(str *ret, sabdb *db);
-@c
/**
* Produces a string representation suitable for storage/sending.
*/
@@ -315,9 +285,6 @@
return(MAL_SUCCEED);
}
-@h
-mal_export str SABAOTHdeserialise(sabdb **ret, str *sabdb);
-@c
/**
* Produces a sabdb struct out of a serialised string.
*/
@@ -329,5 +296,3 @@
}
@}
-@h
-#endif
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
