Changeset: a03cd9c551a1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a03cd9c551a1
Modified Files:
MonetDB/src/common/stream.mx
MonetDB/src/gdk/gdk_atoms.mx
MonetDB/src/gdk/gdk_bbp.mx
MonetDB/src/gdk/gdk_logger.mx
MonetDB/src/gdk/gdk_posix.mx
MonetDB/src/gdk/gdk_search.mx
MonetDB/src/gdk/gdk_storage.mx
MonetDB/src/gdk/gdk_utils.mx
MonetDB4/src/mapi/mapi.mx
MonetDB4/src/modules/contrib/array.mx
MonetDB4/src/modules/contrib/oo7.mx
MonetDB4/src/modules/contrib/vector.mx
MonetDB4/src/modules/contrib/wisc.mx
MonetDB4/src/modules/plain/ascii_io.mx
MonetDB4/src/modules/plain/blob.mx
MonetDB4/src/modules/plain/builtin.mx
MonetDB4/src/modules/plain/enum.mx
MonetDB4/src/modules/plain/streams.mx
MonetDB4/src/monet/monet.mx
MonetDB4/src/monet/monet_client.mx
MonetDB4/src/monet/monet_deparse.mx
MonetDB4/src/monet/monet_interpreter.mx
MonetDB4/src/monet/monet_parse.mx
MonetDB4/src/monet/monet_process.mx
MonetDB4/src/monet/monet_queue.mx
MonetDB4/src/tools/Tests/client.stable.out
MonetDB4/src/tools/Tests/client.stable.out.64bit
MonetDB4/src/tools/Tests/multiClientSeq.stable.out
MonetDB4/src/tools/Tests/multiClientSeq.stable.out.64bit
MonetDB5/src/compiler/mal_compiler.mx
MonetDB5/src/mal/mal.mx
MonetDB5/src/mal/mal_atom.mx
MonetDB5/src/mal/mal_box.mx
MonetDB5/src/mal/mal_client.mx
MonetDB5/src/mal/mal_debugger.mx
MonetDB5/src/mal/mal_exception.mx
MonetDB5/src/mal/mal_factory.mx
MonetDB5/src/mal/mal_function.mx
MonetDB5/src/mal/mal_import.mx
MonetDB5/src/mal/mal_instruction.mx
MonetDB5/src/mal/mal_interpreter.mx
MonetDB5/src/mal/mal_linker.mx
MonetDB5/src/mal/mal_module.mx
MonetDB5/src/mal/mal_namespace.mx
MonetDB5/src/mal/mal_parser.mx
MonetDB5/src/mal/mal_profiler.mx
MonetDB5/src/mal/mal_readline.mx
MonetDB5/src/mal/mal_recycle.mx
MonetDB5/src/mal/mal_resolve.mx
MonetDB5/src/mal/mal_scenario.mx
MonetDB5/src/mal/mal_session.mx
MonetDB5/src/modules/atoms/blob.mx
MonetDB5/src/modules/atoms/streams.mx
MonetDB5/src/modules/kernel/array.mx
MonetDB5/src/modules/kernel/counters.mx
MonetDB5/src/modules/mal/Tests/inspect05.stable.out
MonetDB5/src/modules/mal/Tests/inspect05.stable.out.Debian
MonetDB5/src/modules/mal/Tests/inspect05.stable.out.Windows
MonetDB5/src/modules/mal/bbp.mx
MonetDB5/src/modules/mal/bpm.mx
MonetDB5/src/modules/mal/cluster.mx
MonetDB5/src/modules/mal/crackers/crackers_index.mx
MonetDB5/src/modules/mal/crackers/crackers_updates.mx
MonetDB5/src/modules/mal/groupby.mx
MonetDB5/src/modules/mal/histogram.mx
MonetDB5/src/modules/mal/language.mx
MonetDB5/src/modules/mal/mal_io.mx
MonetDB5/src/modules/mal/mal_mapi.mx
MonetDB5/src/modules/mal/manual.mx
MonetDB5/src/modules/mal/mdb.mx
MonetDB5/src/modules/mal/mkey.mx
MonetDB5/src/modules/mal/pcre.mx
MonetDB5/src/modules/mal/rdf/rdf_shredder.mx
MonetDB5/src/modules/mal/recycle.mx
MonetDB5/src/modules/mal/remote.mx
MonetDB5/src/modules/mal/replication.mx
MonetDB5/src/modules/mal/tablet.mx
MonetDB5/src/modules/mal/tablet_mk.mx
MonetDB5/src/modules/mal/tablet_si.mx
MonetDB5/src/modules/mal/tablet_sql.mx
MonetDB5/src/modules/mal/tokenizer.mx
MonetDB5/src/modules/mal/trader.mx
MonetDB5/src/modules/mal/urlbox.mx
MonetDB5/src/optimizer/opt_accumulators.mx
MonetDB5/src/optimizer/opt_aliases.mx
MonetDB5/src/optimizer/opt_coercion.mx
MonetDB5/src/optimizer/opt_commonTerms.mx
MonetDB5/src/optimizer/opt_constants.mx
MonetDB5/src/optimizer/opt_costModel.mx
MonetDB5/src/optimizer/opt_crack.mx
MonetDB5/src/optimizer/opt_datacell.mx
MonetDB5/src/optimizer/opt_datacyclotron.mx
MonetDB5/src/optimizer/opt_dataflow.mx
MonetDB5/src/optimizer/opt_deadcode.mx
MonetDB5/src/optimizer/opt_derivepath.mx
MonetDB5/src/optimizer/opt_dictionary.mx
MonetDB5/src/optimizer/opt_emptySet.mx
MonetDB5/src/optimizer/opt_evaluate.mx
MonetDB5/src/optimizer/opt_garbageCollector.mx
MonetDB5/src/optimizer/opt_history.mx
MonetDB5/src/optimizer/opt_inline.mx
MonetDB5/src/optimizer/opt_joinpath.mx
MonetDB5/src/optimizer/opt_joinselect.mx
MonetDB5/src/optimizer/opt_mapreduce.mx
MonetDB5/src/optimizer/opt_mergetable.mx
MonetDB5/src/optimizer/opt_mitosis.mx
MonetDB5/src/optimizer/opt_multiplex.mx
MonetDB5/src/optimizer/opt_octopus.mx
MonetDB5/src/optimizer/opt_prejoin.mx
MonetDB5/src/optimizer/opt_pushranges.mx
MonetDB5/src/optimizer/opt_qep.mx
MonetDB5/src/optimizer/opt_recycler.mx
MonetDB5/src/optimizer/opt_reduce.mx
MonetDB5/src/optimizer/opt_remap.mx
MonetDB5/src/optimizer/opt_remoteQueries.mx
MonetDB5/src/optimizer/opt_reorder.mx
MonetDB5/src/optimizer/opt_singleton.mx
MonetDB5/src/optimizer/opt_statistics.mx
MonetDB5/src/optimizer/opt_strengthReduction.mx
MonetDB5/src/optimizer/opt_support.mx
MonetDB5/src/optimizer/opt_tarantula.mx
MonetDB5/src/optimizer/optimizer.mx
MonetDB5/src/optimizer/optimizerWrapper.mx
MonetDB5/src/scheduler/run_memo.mx
MonetDB5/src/scheduler/run_octopus.mx
MonetDB5/src/scheduler/run_pipeline.mx
clients/src/mapiclient/dump.c
clients/src/mapiclient/mclient.mx
clients/src/mapiclient/msqldump.c
clients/src/mapiclient/stethoscope.c
clients/src/mapilib/Mapi.mx
clients/src/mapilib/tests/mapi_structs.py
geom/src/monetdb4/geom.mx
geom/src/monetdb5/geom.mx
pathfinder/modules/geoxml/serialize_geometry.mx
pathfinder/modules/pftijah/Tests/procs.stable.out
pathfinder/modules/pftijah/nexi.c
pathfinder/modules/pftijah/nexi_generate_mil.c
pathfinder/modules/pftijah/nexi_generate_plan.c
pathfinder/modules/pftijah/nexi_rewriter.c
pathfinder/modules/pftijah/pftijah.mx
pathfinder/modules/pftijah/pftijah_stem.mx
pathfinder/modules/pftijah/pftijah_tokenize.l
pathfinder/modules/pftijah/pftijah_util.mx
pathfinder/modules/pftijah/serialize_pftijah.mx
pathfinder/modules/pftijah/serialize_pftijah_options.mx
pathfinder/modules/pftijah/termdb.mx
pathfinder/modules/pftijah/tjc/tjc_main.c
pathfinder/runtime/Tests/procs.stable.out
pathfinder/runtime/pathfinder.mx
pathfinder/runtime/pf_support.mx
pathfinder/runtime/serialize.mx
pathfinder/runtime/serialize_dflt.mx
pathfinder/runtime/shredder.mx
pathfinder/runtime/xrpc_client.mx
pathfinder/runtime/xrpc_server.mx
pathfinder/runtime5/xquery_backend.mx
pathfinder/runtime5/xquery_scenario.mx
sql/src/backends/monet5/merovingian/merovingian_client.c
sql/src/backends/monet5/merovingian/merovingian_proxy.c
sql/src/backends/monet5/sql_emptyset.mx
sql/src/backends/monet5/sql_gencode.mx
sql/src/backends/monet5/sql_optimizer.mx
sql/src/backends/monet5/sql_result.mx
sql/src/backends/monet5/sql_scenario.mx
sql/src/benchmarks/tpch/dbgen/speed_seed.c
sql/src/gis/Tests/isoConformance.sql
sql/src/server/rel_dump.mx
sql/src/server/rel_subquery.mx
sql/src/server/sql_atom.mx
sql/src/server/sql_scan.mx
sql/src/server/sql_semantic.mx
Branch: default
Log Message:
Replaced the "stream_" prefix by "mnstr_".
Some external libraries had the same brilliant idea to create an
abstraction to do I/O, and they also called there functions with a
stream_ prefix. The two don't mix.
Only externally visible names have been changed, and only in the
"default" branch.
Needless to say, you'll have to recompile *everything*.
diffs (truncated from 17787 to 300 lines):
diff -r 419c11d5bfa7 -r a03cd9c551a1 MonetDB/src/common/stream.mx
--- a/MonetDB/src/common/stream.mx Wed Jul 28 09:53:58 2010 +0200
+++ b/MonetDB/src/common/stream.mx Wed Jul 28 10:18:23 2010 +0200
@@ -86,55 +86,55 @@
typedef struct stream stream;
/* some os specific initialization */
-stream_export int stream_init(void);
-
-/* all stream_readX/stream_writeX
+stream_export int mnstr_init(void);
+
+/* all mnstr_readX/mnstr_writeX
return
0 on error
!0 on success
*/
-stream_export int stream_readBte(stream *s, signed char *val);
-stream_export int stream_writeBte(stream *s, signed char val);
-stream_export int stream_readSht(stream *s, short *val);
-stream_export int stream_writeSht(stream *s, short val);
-stream_export int stream_readInt(stream *s, int *val);
-stream_export int stream_writeInt(stream *s, int val);
+stream_export int mnstr_readBte(stream *s, signed char *val);
+stream_export int mnstr_writeBte(stream *s, signed char val);
+stream_export int mnstr_readSht(stream *s, short *val);
+stream_export int mnstr_writeSht(stream *s, short val);
+stream_export int mnstr_readInt(stream *s, int *val);
+stream_export int mnstr_writeInt(stream *s, int val);
#ifdef SIZEOF_LNG
-stream_export int stream_readLng(stream *s, lng *val);
-stream_export int stream_writeLng(stream *s, lng val);
+stream_export int mnstr_readLng(stream *s, lng *val);
+stream_export int mnstr_writeLng(stream *s, lng val);
#endif
-stream_export int stream_readBteArray(stream *s, signed char *val, size_t cnt);
-stream_export int stream_writeBteArray(stream *s, const signed char *val,
size_t cnt);
-stream_export int stream_readShtArray(stream *s, short *val, size_t cnt);
-stream_export int stream_writeShtArray(stream *s, const short *val, size_t
cnt);
-stream_export int stream_readIntArray(stream *s, int *val, size_t cnt);
-stream_export int stream_writeIntArray(stream *s, const int *val, size_t cnt);
+stream_export int mnstr_readBteArray(stream *s, signed char *val, size_t cnt);
+stream_export int mnstr_writeBteArray(stream *s, const signed char *val,
size_t cnt);
+stream_export int mnstr_readShtArray(stream *s, short *val, size_t cnt);
+stream_export int mnstr_writeShtArray(stream *s, const short *val, size_t cnt);
+stream_export int mnstr_readIntArray(stream *s, int *val, size_t cnt);
+stream_export int mnstr_writeIntArray(stream *s, const int *val, size_t cnt);
#ifdef SIZEOF_LNG
-stream_export int stream_readLngArray(stream *s, lng *val, size_t cnt);
-stream_export int stream_writeLngArray(stream *s, const lng *val, size_t cnt);
+stream_export int mnstr_readLngArray(stream *s, lng *val, size_t cnt);
+stream_export int mnstr_writeLngArray(stream *s, const lng *val, size_t cnt);
#endif
-stream_export int stream_printf(stream *s, const char *format, ...);
-stream_export ssize_t stream_read(stream *s, void *buf, size_t elmsize, size_t
cnt);
-stream_export ssize_t stream_readline(stream *s, void *buf, size_t maxcnt);
-stream_export ssize_t stream_write(stream *s, const void *buf, size_t elmsize,
size_t cnt);
-stream_export void stream_close(stream *s);
-stream_export void stream_destroy(stream *s);
-stream_export char *stream_error(stream *s);
-stream_export int stream_flush(stream *s);
-stream_export int stream_fsync(stream *s);
+stream_export int mnstr_printf(stream *s, const char *format, ...);
+stream_export ssize_t mnstr_read(stream *s, void *buf, size_t elmsize, size_t
cnt);
+stream_export ssize_t mnstr_readline(stream *s, void *buf, size_t maxcnt);
+stream_export ssize_t mnstr_write(stream *s, const void *buf, size_t elmsize,
size_t cnt);
+stream_export void mnstr_close(stream *s);
+stream_export void mnstr_destroy(stream *s);
+stream_export char *mnstr_error(stream *s);
+stream_export int mnstr_flush(stream *s);
+stream_export int mnstr_fsync(stream *s);
#ifdef SIZEOF_LNG
-stream_export int stream_fgetpos(stream *s, lng *p);
-stream_export int stream_fsetpos(stream *s, lng p);
+stream_export int mnstr_fgetpos(stream *s, lng *p);
+stream_export int mnstr_fsetpos(stream *s, lng p);
#endif
-stream_export char *stream_name(stream *s);
-stream_export int stream_errnr(stream *s);
-stream_export void stream_clearerr(stream *s);
-stream_export int stream_type(stream *s);
-stream_export int stream_byteorder(stream *s);
-stream_export void stream_set_byteorder(stream *s, char bigendian);
-stream_export stream *stream_rstream(stream *s);
-stream_export stream *stream_wstream(stream *s);
+stream_export char *mnstr_name(stream *s);
+stream_export int mnstr_errnr(stream *s);
+stream_export void mnstr_clearerr(stream *s);
+stream_export int mnstr_type(stream *s);
+stream_export int mnstr_byteorder(stream *s);
+stream_export void mnstr_set_byteorder(stream *s, char bigendian);
+stream_export stream *mnstr_rstream(stream *s);
+stream_export stream *mnstr_wstream(stream *s);
stream_export stream *open_rstream(const char *filename);
stream_export stream *open_wstream(const char *filename);
@@ -202,7 +202,7 @@
stream_export stream *buffer_rastream(buffer *b, const char *name);
stream_export stream *buffer_wastream(buffer *b, const char *name);
-stream_export buffer *stream_get_buffer(stream *s);
+stream_export buffer *mnstr_get_buffer(stream *s);
/* note, the size is fixed to 8K, you cannot simply change it to any
value */
@@ -229,7 +229,7 @@
stream_export ssize_t bs_read_next(stream *s, void *buf, size_t nbytes, int
*last);
stream_export int isa_block_stream(stream *s);
/* read block of data including the end of block marker */
-stream_export ssize_t stream_read_block(stream *s, void *buf, size_t elmsize,
size_t cnt);
+stream_export ssize_t mnstr_read_block(stream *s, void *buf, size_t elmsize,
size_t cnt);
@+ buffered streams
@@ -274,12 +274,12 @@
stream_export void detach_teestream(stream *ts);
-typedef enum stream_errors {
+typedef enum mnstr_errors {
NO__ERROR = 0,
OPEN_ERROR,
READ_ERROR,
WRITE_ERROR
-} stream_errors;
+} mnstr_errors;
#endif /*_STREAM_H_*/
@c
@@ -371,7 +371,7 @@
#endif
int
-stream_init(void)
+mnstr_init(void)
{
static int inited = 0;
@@ -436,7 +436,7 @@
/* Read at most cnt elements of size elmsize from the stream. Returns
the number of elements actually read. */
ssize_t
-stream_read(stream *s, void *buf, size_t elmsize, size_t cnt)
+mnstr_read(stream *s, void *buf, size_t elmsize, size_t cnt)
{
#ifdef STREAM_DEBUG
printf("read %s " SZFMT " " SZFMT "\n", s->name ? s->name :
"<unnamed>", elmsize, cnt);
@@ -450,7 +450,7 @@
/* Read one line (seperated by \n) of atmost maxcnt characters from the
stream.
Returns the number of characters actually read, includes the trailing \n */
ssize_t
-stream_readline(stream *s, void *buf, size_t maxcnt)
+mnstr_readline(stream *s, void *buf, size_t maxcnt)
{
#ifdef STREAM_DEBUG
printf("readline %s " SZFMT "\n", s->name ? s->name : "<unnamed>",
maxcnt);
@@ -476,7 +476,7 @@
number of elements actually written. If elmsize or cnt equals zero,
returns cnt. */
ssize_t
-stream_write(stream *s, const void *buf, size_t elmsize, size_t cnt)
+mnstr_write(stream *s, const void *buf, size_t elmsize, size_t cnt)
{
#ifdef STREAM_DEBUG
printf("write %s " SZFMT " " SZFMT "\n", s->name ? s->name :
"<unnamed>", elmsize, cnt);
@@ -488,7 +488,7 @@
}
void
-stream_close(stream *s)
+mnstr_close(stream *s)
{
#ifdef STREAM_DEBUG
printf("close %s\n", s->name ? s->name : "<unnamed>");
@@ -498,7 +498,7 @@
}
void
-stream_destroy(stream *s)
+mnstr_destroy(stream *s)
{
#ifdef STREAM_DEBUG
printf("destroy %s\n", s->name ? s->name : "<unnamed>");
@@ -508,7 +508,7 @@
}
char *
-stream_error(stream *s)
+mnstr_error(stream *s)
{
if (s == 0)
return "Connection terminated";
@@ -516,7 +516,7 @@
}
int
-stream_flush(stream *s)
+mnstr_flush(stream *s)
{
if (!s)
return -1;
@@ -532,7 +532,7 @@
}
int
-stream_fsync(stream *s)
+mnstr_fsync(stream *s)
{
#ifdef STREAM_DEBUG
printf("fsync %s (%d)\n", s->name ? s->name : "<unnamed>", s->errnr);
@@ -548,7 +548,7 @@
}
int
-stream_fgetpos(stream *s, lng *p)
+mnstr_fgetpos(stream *s, lng *p)
{
#ifdef STREAM_DEBUG
printf("fgetpos %s\n", s->name ? s->name : "<unnamed>");
@@ -564,7 +564,7 @@
}
int
-stream_fsetpos(stream *s, lng p)
+mnstr_fsetpos(stream *s, lng p)
{
#ifdef STREAM_DEBUG
printf("fsetpos %s\n", s->name ? s->name : "<unnamed>");
@@ -580,7 +580,7 @@
char *
-stream_name(stream *s)
+mnstr_name(stream *s)
{
if (s == 0)
return "connection terminated";
@@ -588,7 +588,7 @@
}
int
-stream_errnr(stream *s)
+mnstr_errnr(stream *s)
{
if (s == 0)
return READ_ERROR;
@@ -596,14 +596,14 @@
}
void
-stream_clearerr(stream *s)
+mnstr_clearerr(stream *s)
{
if (s != NULL)
s->errnr = NO__ERROR;
}
int
-stream_type(stream *s)
+mnstr_type(stream *s)
{
if (s == 0)
return 0;
@@ -611,7 +611,7 @@
}
int
-stream_byteorder(stream *s)
+mnstr_byteorder(stream *s)
{
if (s == 0)
return 0;
@@ -619,10 +619,10 @@
}
void
-stream_set_byteorder(stream *s, char bigendian)
+mnstr_set_byteorder(stream *s, char bigendian)
{
#ifdef STREAM_DEBUG
- printf("stream_set_byteorder %s\n", s->name ? s->name : "<unnamed>");
+ printf("mnstr_set_byteorder %s\n", s->name ? s->name : "<unnamed>");
#endif
assert(s->access == ST_READ);
s->type = ST_BIN;
@@ -642,10 +642,10 @@
}
stream *
-stream_rstream(stream *s)
+mnstr_rstream(stream *s)
{
#ifdef STREAM_DEBUG
- printf("stream_rstream %s\n", s->name ? s->name : "<unnamed>");
+ printf("mnstr_rstream %s\n", s->name ? s->name : "<unnamed>");
#endif
assert(s->access == ST_READ);
s->type = ST_BIN;
@@ -655,10 +655,10 @@
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
