Changeset: d66eaee29327 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d66eaee29327
Modified Files:
monetdb5/modules/kernel/Makefile.ag
monetdb5/modules/kernel/colmath.c.mx
monetdb5/modules/kernel/colmath.h.mx
monetdb5/modules/kernel/colmath.mal.mx
monetdb5/modules/kernel/colmmath.c.mx
monetdb5/modules/kernel/colmmath.h.mx
monetdb5/modules/kernel/colmmath.mal.mx
Branch: headless
Log Message:
Compilation again against gdk
diffs (172 lines):
diff --git a/monetdb5/modules/kernel/Makefile.ag
b/monetdb5/modules/kernel/Makefile.ag
--- a/monetdb5/modules/kernel/Makefile.ag
+++ b/monetdb5/modules/kernel/Makefile.ag
@@ -52,8 +52,8 @@
colcolor.c.mx \
colifthen.h.mx \
colifthen.c.mx \
- colmmath.h.mx \
- colmmath.c.mx \
+ colmath.h.mx \
+ colmath.c.mx \
colmtime.h.mx \
colmtime.c.mx \
colstr.c \
@@ -83,7 +83,7 @@
colcast.mal.mx \
colcalc.mal.mx \
colifthen.mal.mx \
- colmmath.mal.mx \
+ colmath.mal.mx \
colmtime.mal.mx \
colstr.mal \
column.mal.mx \
diff --git a/monetdb5/modules/kernel/colmmath.c.mx
b/monetdb5/modules/kernel/colmath.c.mx
rename from monetdb5/modules/kernel/colmmath.c.mx
rename to monetdb5/modules/kernel/colmath.c.mx
--- a/monetdb5/modules/kernel/colmmath.c.mx
+++ b/monetdb5/modules/kernel/colmath.c.mx
@@ -17,12 +17,7 @@
* All Rights Reserved.
*/
-@f colmmath
-/* M.L. Kersten */
-
-@-
- round is not binary...
- @:scienceFcnBinary(round,int)@
+@f colmath
@= scienceFcnImpl
str CMDscience_COL_@2_@1(int *ret, int *bid)
@@ -32,21 +27,24 @@
oid o;
@2 *lbase, *nbase;
- if ( (msg = getCOLdescriptor(&bl,l)) != MAL_SUCCEED )
+ if ( (msg = getCOLdescriptor(&bl,bid)) != MAL_SUCCEED )
throwagain(MAL,"colcalc.length",msg);
if ( (bn = COLnew(TYPE_@2, COLcount(bl)) ) == NULL ) {
CBPreleaseref(bl);
throw(MAL,"colstr.length",MAL_MALLOC_FAIL);
}
- COLaccessBegin(bl, USE_TAIL, MMAP_SEQUENTIAL);
+ lbase = (@2*) COLbase(bl);
+ nbase = (@2*) COLbase(bn);
+
+ COLaccessBegin(bl, USE_HEAP, MMAP_SEQUENTIAL);
if (bl->nonil){
COLforloop(bl,o)
nbase[o] = @1@3(lbase[o]);
} else
COLforloop(bl,o)
nbase[o] = lbase[o] == @2_nil? @2_nil: @1@3(lbase[o]);
- COLaccessEnd(bl, USE_TAIL, MMAP_SEQUENTIAL);
+ COLaccessEnd(bl, USE_HEAP, MMAP_SEQUENTIAL);
COLsetcount(bn, COLcount(bl));
bn->sorted = 0;
COLsetreadonly(bn);
@@ -62,21 +60,23 @@
oid o;
@2 *lbase, *nbase;
- if ( (msg = getCOLdescriptor(&bl,l)) != MAL_SUCCEED )
+ if ( (msg = getCOLdescriptor(&bl,bid)) != MAL_SUCCEED )
throwagain(MAL,"colcalc.length",msg);
if ( (bn = COLnew(TYPE_@2, COLcount(bl)) ) == NULL ) {
CBPreleaseref(bl);
throw(MAL,"colstr.length",MAL_MALLOC_FAIL);
}
+ lbase = (@2*) COLbase(bl);
+ nbase = (@2*) COLbase(bn);
- COLaccessBegin(b, USE_TAIL, MMAP_SEQUENTIAL);
+ COLaccessBegin(bl, USE_HEAP, MMAP_SEQUENTIAL);
if (bl->nonil){
COLforloop(bl,o)
nbase[o] = @1@3(lbase[o],*d);
} else
COLforloop(bl,o)
nbase[o] = lbase[o] == @2_nil? @2_nil:
@1@3(lbase[o],*d);
- COLaccessEnd(bl, USE_TAIL, MMAP_SEQUENTIAL);
+ COLaccessEnd(bl, USE_HEAP, MMAP_SEQUENTIAL);
COLsetcount(bn, COLcount(bl));
COLsetreadonly(bn);
bn->sorted = 0;
@@ -88,7 +88,8 @@
@:scienceFcnImpl(@1,dbl,)@
@:scienceFcnImpl(@1,flt,f)@
@c
-#include "colmmath.h"
+/* Author(s) M.L. Kersten */
+#include "colmath.h"
@:scienceImpl(asin)@
@:scienceImpl(acos)@
@@ -108,13 +109,13 @@
@:scienceImpl(ceil)@
@:scienceImpl(fabs)@
@:scienceImpl(floor)@
-@-
- round is not binary...
- @:scienceBinaryImpl(round,int)@
-@c
@:scienceBinaryImpl(fmod,dbl,)@
@:scienceBinaryImpl(fmod,flt,f)@
@:scienceBinaryImpl(atan2,dbl,)@
@:scienceBinaryImpl(atan2,flt,f)@
@:scienceBinaryImpl(pow,dbl,)@
@:scienceBinaryImpl(pow,flt,f)@
+/*
+ round is not binary...
+ @:scienceBinaryImpl(round,int)@
+*/
diff --git a/monetdb5/modules/kernel/colmmath.h.mx
b/monetdb5/modules/kernel/colmath.h.mx
rename from monetdb5/modules/kernel/colmmath.h.mx
rename to monetdb5/modules/kernel/colmath.h.mx
--- a/monetdb5/modules/kernel/colmmath.h.mx
+++ b/monetdb5/modules/kernel/colmath.h.mx
@@ -17,16 +17,16 @@
* All Rights Reserved.
*/
-@f colmmath
+@f colmath
@h
/* M.L. Kersten */
-#ifdef _BATMATH_H
-#define _BATMATH_H
+#ifndef _COLMATH_H
+#define _COLMATH_H
#include "monetdb_config.h"
-#include "gdk.h"
+#include <gdk.h>
+#include "mal_exception.h"
#include "math.h"
-#include "mal_exception.h"
#ifdef WIN32
#if !defined(LIBMAL) && !defined(LIBATOMS) && !defined(LIBKERNEL) &&
!defined(LIBMAL) && !defined(LIBOPTIMIZER) && !defined(LIBSCHEDULER) &&
!defined(LIBMONETDB5)
@@ -78,4 +78,4 @@
@:scienceBinaryImpl(atan2,flt,f)@
@:scienceBinaryImpl(pow,dbl,)@
@:scienceBinaryImpl(pow,flt,f)@
-#endif /* _BATMATH_H */
+#endif /* _COLMATH_H */
diff --git a/monetdb5/modules/kernel/colmmath.mal.mx
b/monetdb5/modules/kernel/colmath.mal.mx
rename from monetdb5/modules/kernel/colmmath.mal.mx
rename to monetdb5/modules/kernel/colmath.mal.mx
--- a/monetdb5/modules/kernel/colmmath.mal.mx
+++ b/monetdb5/modules/kernel/colmath.mal.mx
@@ -17,7 +17,7 @@
* All Rights Reserved.
*/
-@f colmmath
+@f colmath
/* M.L. Kersten */
@= scienceFcn
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
