Update of /cvsroot/monetdb/pathfinder/compiler/mil
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv11566/compiler/mil
Modified Files:
Tag: M5XQ
milgen.brg
Log Message:
propagated changes of Monday Oct 19 2009
from the development trunk to the M5XQ branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/19 - sjoerd: compiler/mil/milgen.brg,1.228
propagated changes of Monday Oct 19 2009
from the Nov2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/19 - sjoerd: compiler/mil/milgen.brg,1.222.2.5
propagated changes of Sunday Oct 18 2009 - Monday Oct 19 2009
from the Aug2009_NFI branch to the Nov2009 branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/18 - tsheyar: compiler/mil/milgen.brg,1.221.2.1.2.6
-- Formatting and better log messages.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: milgen.brg
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/mil/milgen.brg,v
retrieving revision 1.215.2.12
retrieving revision 1.215.2.13
diff -u -d -r1.215.2.12 -r1.215.2.13
--- milgen.brg 16 Oct 2009 16:16:55 -0000 1.215.2.12
+++ milgen.brg 19 Oct 2009 09:44:59 -0000 1.215.2.13
@@ -11031,7 +11031,7 @@
{
PFmil_t *bodymilprog;
PFarray_t *opt;
- bool nocache = 0;
+ bool nocache = false;
long long timeout = 0;
char *qid = "";
@@ -11040,7 +11040,9 @@
if (opt) {
qid = *((char **) PFarray_at (opt, 0));
if (PFarray_last(opt) > 1)
- PFlog ("Multiple session IDs -- Choosing \"%s\".", qid);
+ PFlog ("Multiple session IDs -- "
+ "Choosing pf:session-id \"%s\".",
+ qid);
}
opt = PFenv_lookup (PFoptions, PFqname(PFns_lib, "session-timeout"));
if (opt) {
@@ -11049,14 +11051,16 @@
PFoops (OOPS_FATAL, "Invalid session timeout: \"%s\".",
*((char **) PFarray_at (opt, 0)));
if (PFarray_last(opt) > 1)
- PFlog ("Multiple session timeouts -- Choosing \"%s\".",
+ PFlog ("Multiple session timeouts -- "
+ "Choosing pf:session-timeout \"%s\".",
*((char **) PFarray_at (opt, 0)));
}
opt = PFenv_lookup (PFoptions, PFqname(PFns_lib, "session-nocache"));
if (opt) {
char *mode = *((char **) PFarray_at (opt, 0));
if (PFarray_last(opt) > 1)
- PFlog ("Multiple session modes -- Choosing \"%s\".", mode);
+ PFlog ("Multiple session modes -- "
+ "Choosing pf:session-nocache \"%s\".", mode);
nocache = strcmp(mode, "true") == 0 || strcmp(mode, "yes") == 0;
}
@@ -11183,7 +11187,11 @@
assgn (var (PF_MIL_VAR_XRPC_HDL), lit_int(0)),
assgn (var (PF_MIL_VAR_XRPC_SEQNR), lit_lng(0)),
assgn (var (PF_MIL_VAR_XRPC_TIMEOUT), lit_lng(timeout)),
- assgn (var (PF_MIL_VAR_XRPC_MODE), lit_str
(qid?nocache?"use-cache-repeatable":"cache-repeatable":"none")),
+ assgn (var (PF_MIL_VAR_XRPC_MODE),
+ lit_str (qid ? nocache
+ ? "use-cache-repeatable"
+ : "cache-repeatable"
+ : "none")),
assgn (var (PF_MIL_VAR_XRPC_MODULE), lit_str("")),
assgn (var (PF_MIL_VAR_XRPC_METHOD), lit_str("")),
assgn (var (PF_MIL_VAR_XRPC_COORD), lit_str("")),
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
