Menu
▾
▴
[Xymon-developer] SF.net SVN: xymon:[6651] trunk
|
From: <st...@us...> - 2011-03-08 17:36:10
|
Revision: 6651
http://xymon.svn.sourceforge.net/xymon/?rev=6651&view=rev
Author: storner
Date: 2011-03-08 17:36:04 +0000 (Tue, 08 Mar 2011)
Log Message:
-----------
trunk: Merge 4.3.0 back into trunk, part 5: Delete compression-related files (for later addition)
Removed Paths:
-------------
trunk/build/Makefile.test-zlib
trunk/build/test-zlib.c
trunk/build/zlib.sh
trunk/lib/compression.c
trunk/lib/compression.h
Deleted: trunk/build/Makefile.test-zlib
===================================================================
--- trunk/build/Makefile.test-zlib 2011-03-08 17:20:28 UTC (rev 6650)
+++ trunk/build/Makefile.test-zlib 2011-03-08 17:36:04 UTC (rev 6651)
@@ -1,11 +0,0 @@
-include Makefile.$(OS)
-
-test-compile:
- @$(CC) $(CFLAGS) $(ZLIBINC) -o test-zlib.o -c test-zlib.c
-
-test-link:
- @$(CC) $(CFLAGS) $(ZLIBLIB) -o test-zlib test-zlib.o -lz
-
-clean:
- @rm -f test-zlib.o test-zlib
-
Deleted: trunk/build/test-zlib.c
===================================================================
--- trunk/build/test-zlib.c 2011-03-08 17:20:28 UTC (rev 6650)
+++ trunk/build/test-zlib.c 2011-03-08 17:36:04 UTC (rev 6651)
@@ -1,33 +0,0 @@
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <zlib.h>
-
-int main(int argc, char **argv)
-{
- z_stream strm;
- int n;
-
- strm.zalloc = Z_NULL;
- strm.zfree = Z_NULL;
- strm.opaque = Z_NULL;
- n = inflateInit(&strm);
- if (n == Z_VERSION_ERROR) {
- printf("Version mismatch: Compiled with %s, runtime has %s\n",
- ZLIB_VERSION, zlibVersion());
- }
- else {
- printf("zlib version %s\n", zlibVersion());
- if (ZLIB_VERNUM < 0x1230) {
- char *override = getenv("IGNOREOLDZLIB");
-
- printf("Your zlib version is too old, requires version 1.2.3 or later\n");
- if (override) printf("Ignoring this and continuing anyway\n");
-
- return (override ? 0 : 1);
- }
- }
-
- return 0;
-}
-
Deleted: trunk/build/zlib.sh
===================================================================
--- trunk/build/zlib.sh 2011-03-08 17:20:28 UTC (rev 6650)
+++ trunk/build/zlib.sh 2011-03-08 17:36:04 UTC (rev 6651)
@@ -1,72 +0,0 @@
- echo "Checking for zlib ..."
-
- ZLIBINC=""
- ZLIBLIB=""
- for DIR in /opt/zlib* /usr/local/zlib* /usr/local /usr /usr/pkg /opt/csw /opt/sfw
- do
- if test -f $DIR/include/zlib.h
- then
- ZLIBINC=$DIR/include
- fi
- if test -f $DIR/include/zlib/zlib.h
- then
- ZLIBINC=$DIR/include/zlib
- fi
-
- if test -f $DIR/lib/libz.so
- then
- ZLIBLIB=$DIR/lib
- fi
- if test -f $DIR/lib/libz.a
- then
- ZLIBLIB=$DIR/lib
- fi
- if test -f $DIR/lib64/libz.so
- then
- ZLIBLIB=$DIR/lib64
- fi
- if test -f $DIR/lib64/libz.a
- then
- ZLIBLIB=$DIR/lib64
- fi
- done
-
- if test "$USERZLIBINC" != ""; then
- ZLIBINC="$USERZLIBINC"
- fi
- if test "$USERZLIBLIB" != ""; then
- ZLIBLIB="$USERZLIBLIB"
- fi
-
- if test -z "$ZLIBINC" -o -z "$ZLIBLIB"; then
- echo "ZLIB include- or library-files not found."
- echo "Support for compressed communication with hobbitd is disabled "
- else
- cd build
- OS=`uname -s | tr '[/]' '[_]'` $MAKE -f Makefile.test-zlib clean
- OS=`uname -s | tr '[/]' '[_]'` ZLIBINC="-I$ZLIBINC" $MAKE -f Makefile.test-zlib test-compile
- if [ $? -eq 0 ]; then
- echo "Found ZLIB include files in $ZLIBINC"
- else
- echo "ERROR: ZLIB include files found in $ZLIBINC, but compile fails."
- exit 1
- fi
-
- OS=`uname -s | tr '[/]' '[_]'` ZLIBLIB="-L$ZLIBLIB" $MAKE -f Makefile.test-zlib test-link
- if [ $? -eq 0 ]; then
- echo "Found ZLIB libraries in $ZLIBLIB"
- ./test-zlib
- if [ $? -ne 0 ]; then
- echo "ZLIB version too old, must be at least version 1.2.x"
- exit 1
- fi
- else
- echo "ERROR: ZLIB library files found in $ZLIBLIB, but link fails."
- exit 1
- fi
-
- OS=`uname -s | tr '[/]' '[_]'` $MAKE -f Makefile.test-zlib clean
- cd ..
- fi
-
-
Deleted: trunk/lib/compression.c
===================================================================
--- trunk/lib/compression.c 2011-03-08 17:20:28 UTC (rev 6650)
+++ trunk/lib/compression.c 2011-03-08 17:36:04 UTC (rev 6651)
@@ -1,211 +0,0 @@
-/*----------------------------------------------------------------------------*/
-/* Hobbit monitor library. */
-/* */
-/* This is a library module, part of libbbgen. */
-/* It contains routines for interfacing to zlib compression routines. */
-/* */
-/* Copyright (C) 2008 Henrik Storner <he...@st...> */
-/* */
-/* This program is released under the GNU General Public License (GPL), */
-/* version 2. See the file "COPYING" for details. */
-/* */
-/*----------------------------------------------------------------------------*/
-
-static char rcsid[] = "$Id$";
-
-#include "config.h"
-
-#include <string.h>
-#include <stdlib.h>
-
-#if defined(HOBBITZLIB)
-#include <zlib.h>
-#endif
-
-#include "libbbgen.h"
-
-char *compressionmarker = "DeFl";
-int compressionmarkersz = 4;
-
-void *uncompress_stream_init(void)
-{
- z_stream *strm;
-
- strm = (z_stream *)malloc(sizeof(z_stream));
- strm->zalloc = Z_NULL;
- strm->zfree = Z_NULL;
- strm->opaque = Z_NULL;
- strm->avail_in = 0;
- strm->next_in = Z_NULL;
- if (inflateInit(strm) != Z_OK) {
- xfree(strm);
- return NULL;
- }
-
- return strm;
-}
-
-strbuffer_t *uncompress_stream_data(void *s, char *cmsg, int clen)
-{
- z_stream *strm = (z_stream *)s;
- strbuffer_t *dbuf = NULL;
- int n;
- unsigned int nbytes;
-
- dbuf = newstrbuffer(4096);
- strm->avail_in = clen;
- strm->next_in = cmsg;
-
- do {
- strm->avail_out = STRBUFSZ(dbuf) - STRBUFLEN(dbuf);
- if (strm->avail_out < 4096) {
- strbuffergrow(dbuf, 4096);
- strm->avail_out = STRBUFSZ(dbuf) - STRBUFLEN(dbuf);
- }
- strm->next_out = STRBUF(dbuf) + STRBUFLEN(dbuf);
-
- n = inflate(strm, Z_NO_FLUSH);
- switch (n) {
- case Z_STREAM_ERROR:
- case Z_NEED_DICT:
- case Z_DATA_ERROR:
- case Z_MEM_ERROR:
- freestrbuffer(dbuf);
- return NULL;
- }
- nbytes = STRBUFSZ(dbuf) - STRBUFLEN(dbuf) - strm->avail_out;
- strbufferuse(dbuf, nbytes);
- } while (strm->avail_out == 0);
-
- return dbuf;
-}
-
-
-void uncompress_stream_done(void *s)
-{
- inflateEnd((z_stream *)s);
- xfree(s);
-}
-
-
-strbuffer_t *uncompress_buffer(char *msg, int msglen, char *prestring)
-{
-#if defined(HOBBITZLIB)
- static z_stream *strm = NULL;
- strbuffer_t *dbuf;
- static int dbufmax = 0;
- int n;
- unsigned int nbytes, avbytes;
-
- if (!strm) {
- strm = uncompress_stream_init();
- if (!strm) return NULL;
- }
- else {
- inflateReset(strm); /* We'll reuse the strm struct */
- }
-
- if (dbufmax < 2*msglen) dbufmax = 2*msglen;
- dbuf = newstrbuffer(dbufmax);
- if (prestring) addtobuffer(dbuf, prestring);
-
- do {
- strm->avail_in = msglen - compressionmarkersz;
- strm->next_in = msg + compressionmarkersz;
-
- do {
- avbytes = STRBUFSZ(dbuf) - STRBUFLEN(dbuf) - 1; /* -1 for the trailing \0 */
- if (strm->avail_out < 4096) {
- strbuffergrow(dbuf, 4096);
- avbytes = STRBUFSZ(dbuf) - STRBUFLEN(dbuf) - 1;
- }
-
- strm->avail_out = avbytes;
- strm->next_out = STRBUF(dbuf) + STRBUFLEN(dbuf);
- n = inflate(strm, Z_NO_FLUSH);
-
- switch (n) {
- case Z_STREAM_ERROR:
- xfree(strm); strm = NULL;
- freestrbuffer(dbuf);
- return NULL;
- case Z_NEED_DICT:
- case Z_DATA_ERROR:
- case Z_MEM_ERROR:
- n = Z_DATA_ERROR;
- goto done;
- }
- nbytes = avbytes - strm->avail_out;
- strbufferuse(dbuf, nbytes);
- } while (strm->avail_out == 0);
- } while (n != Z_STREAM_END);
-
-done:
- if (n == Z_STREAM_END) {
- // errprintf("Inflated message from %d to %d bytes (%d %%)\n", msglen, STRBUFLEN(dbuf), 100*STRBUFLEN(dbuf)/msglen-100);
- return dbuf;
- }
- else {
- freestrbuffer(dbuf);
- return NULL;
- }
-
-#else
- return NULL;
-#endif
-}
-
-
-
-
-strbuffer_t *compress_buffer(char *msg, int msglen)
-{
-#if defined(HOBBITZLIB)
- static z_stream *strm = NULL;
- int ret;
- unsigned int sz;
- strbuffer_t *cmsg;
-
- if (!strm) {
- strm = (z_stream *)malloc(sizeof(z_stream));
- strm->zalloc = Z_NULL;
- strm->zfree = Z_NULL;
- strm->opaque = Z_NULL;
- ret = deflateInit(strm, Z_DEFAULT_COMPRESSION);
-
- if (ret != Z_OK) {
- xfree(strm);
- return NULL;
- }
- }
- else {
- /* Use deflateReset() instead of deflateEnd() so we can re-use the zlib token */
- deflateReset(strm);
- }
-
- strm->avail_in = msglen;
- strm->next_in = msg;
-
- sz = deflateBound(strm, msglen);
- cmsg = newstrbuffer(sz+compressionmarkersz);
- addtobuffer(cmsg, compressionmarker);
- strm->avail_out = sz;
- strm->next_out = STRBUF(cmsg)+compressionmarkersz;
- ret = deflate(strm, Z_FINISH);
- if ((ret != Z_STREAM_ERROR) && (strm->avail_in == 0)) {
- /* All was compressed OK */
- strbufferuse(cmsg, (sz - strm->avail_out));
- // errprintf("Compressed message from %d to %d bytes (%d %%)\n", msglen, STRBUFLEN(cmsg), 100 - (100*STRBUFLEN(cmsg)/msglen));
- }
- else {
- errprintf("Compression failed: ret=%d, avail_in=%u\n", ret, strm->avail_in);
- freestrbuffer(cmsg); cmsg = NULL;
- }
-
- return cmsg;
-
-#else
- return NULL;
-#endif
-}
-
Deleted: trunk/lib/compression.h
===================================================================
--- trunk/lib/compression.h 2011-03-08 17:20:28 UTC (rev 6650)
+++ trunk/lib/compression.h 2011-03-08 17:36:04 UTC (rev 6651)
@@ -1,25 +0,0 @@
-/*----------------------------------------------------------------------------*/
-/* Hobbit monitor library. */
-/* */
-/* Copyright (C) 2008 Henrik Storner <he...@hs...> */
-/* */
-/* This program is released under the GNU General Public License (GPL), */
-/* version 2. See the file "COPYING" for details. */
-/* */
-/*----------------------------------------------------------------------------*/
-
-#ifndef _COMPRESSION_H_
-#define _COMPRESSION_H_
-
-extern char *compressionmarker;
-extern int compressionmarkersz;
-
-extern void *uncompress_stream_init(void);
-extern strbuffer_t *uncompress_stream_data(void *s, char *cmsg, int clen);
-extern void uncompress_stream_done(void *s);
-
-extern strbuffer_t *uncompress_buffer(char *msg, int msglen, char *prestring);
-extern strbuffer_t *compress_buffer(char *msg, int msglen);
-
-#endif
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|