Skip to content

Commit 5e2edcf

Browse files
committed
Add JSON formatter
Add support for output streaming Add formatting rate
1 parent 13408da commit 5e2edcf

19 files changed

+998
-288
lines changed

CHANGES.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,9 @@ Mar 2018
6464
* Add code to help add INDEX to columns in the SQL DDL output
6565
* Add optimisation to Makefiles
6666
* Even 64-bit values may be too large when they are not really counters
67+
68+
Apr 2018
69+
* Add -f option to generate JSON output format
70+
* Allow -o to specify stdout for output. Modify printf to select stdout/stderr
71+
as appropriate
72+
* Add processing rate (MB/sec) to output

bin/aix/convH

2.52 KB
Binary file not shown.

bin/aix/mqsmfcsv

48.9 KB
Binary file not shown.

bin/linux/mqsmfcsv

26 KB
Binary file not shown.

bin/win/mqsmfcsv.exe

17 KB
Binary file not shown.

mqsmfcsv.doc

10 KB
Binary file not shown.

src/M

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,29 @@ plat=`uname`
44

55
if [ "$plat" = "AIX" ]
66
then
7-
flags="-q32 -qmaxmem=-1"
7+
flags="-q32 -qmaxmem=-1 $CCEXTRAFLAGS"
88
cc="xlc"
99
targdir="../bin/aix"
10+
optim="-O3"
1011
else
11-
flags="-m32 "
12+
flags="-m32 $CCEXTRAFLAGS"
1213
cc="gcc"
1314
targdir="../bin/linux"
15+
optim="-O3"
1416
fi
1517
if [ "$CCDEBUG" != "" ]
1618
then
17-
flags="$flags -g"
19+
if [ "$plat" = "AIX" ]
20+
then
21+
flags="$flags -g "
22+
else
23+
flags="$flags -g -fsanitize=address,leak,undefined "
24+
fi
1825
else
19-
flags="$flags -O"
26+
flags="$flags $optim"
2027
fi
2128

22-
export PLATFLAGS=$flags CC=$cc VERS=904
29+
export PLATFLAGS=$flags CC=$cc VERS=905
2330
make -e -f Makefile.unix $*
2431

2532
rm -f $targdir/convH $targdir/mqsmfcsv

src/Makefile.gcc.win

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11

22
CC=i686-w64-mingw32-gcc
3-
CFLAGS= -I. -m32
3+
CFLAGS= -I. -m32 -O2
44
PLATFLAGS=
5-
VERS=904
5+
VERS=905
66
SRC = mqsmf.c \
77
smfDDL.c \
88
smfDate.c \
99
smfConv.c \
10+
smfJson.c \
1011
smfPrint.c \
1112
printDEBUG.c \
1213
printQ5ST.c \

src/Makefile.unix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ SRC = \
77
smfPrint.c \
88
smfDate.c \
99
smfConv.c \
10+
smfJson.c \
1011
printDEBUG.c \
1112
printQ5ST.c \
1213
printQCST.c \

src/Makefile.win

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
CFLAGS=-nologo /D_CRT_SECURE_NO_WARNINGS /Zp1 /J /O2
2-
VERS=904
2+
VERS=905
33
SRC = mqsmf.c \
44
smfDDL.c \
55
smfDate.c \
66
smfConv.c \
7+
smfJson.c \
78
smfPrint.c \
89
printDEBUG.c \
910
printQ5ST.c \

0 commit comments

Comments
 (0)