socsvn commit: r257283 - in soc2013/dpl/head/lib/libzcap: . test zlibworker
dpl at FreeBSD.org
dpl at FreeBSD.org
Fri Sep 13 21:29:30 UTC 2013
Author: dpl
Date: Fri Sep 13 21:29:29 2013
New Revision: 257283
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=257283
Log:
Minimal update, my kernel crashes sometimes when executing test/testlib.sh
Modified:
soc2013/dpl/head/lib/libzcap/capsicum.c
soc2013/dpl/head/lib/libzcap/commands.c
soc2013/dpl/head/lib/libzcap/debug.h
soc2013/dpl/head/lib/libzcap/test/zcaplibtest.c
soc2013/dpl/head/lib/libzcap/zlibworker/commands.c
Modified: soc2013/dpl/head/lib/libzcap/capsicum.c
==============================================================================
--- soc2013/dpl/head/lib/libzcap/capsicum.c Fri Sep 13 20:56:42 2013 (r257282)
+++ soc2013/dpl/head/lib/libzcap/capsicum.c Fri Sep 13 21:29:29 2013 (r257283)
@@ -211,7 +211,7 @@
if( nvlist_send(box->socket, nvl) != 0 )
err(1, "zcaplib: nvlist_send Error");
if (DEBUG_ZCAP)
- printf("DEBUG: zcaplib: Awaiting command\n");
+ printf("DEBUG: zcaplib: Awaiting answer\n");
if ((new = nvlist_recv(box->socket)) == NULL)
err(1, "nvlist_recv(): nvlist_t is NULL");
return (new);
Modified: soc2013/dpl/head/lib/libzcap/commands.c
==============================================================================
--- soc2013/dpl/head/lib/libzcap/commands.c Fri Sep 13 20:56:42 2013 (r257282)
+++ soc2013/dpl/head/lib/libzcap/commands.c Fri Sep 13 21:29:29 2013 (r257283)
@@ -2,6 +2,7 @@
* Here live the capsicumed functions of this library.
*/
+#include "gzguts.h"
#include "zlib.h"
#include "commands.h"
#include "capsicum.h"
@@ -91,8 +92,8 @@
extern bool slist_initiated;
nvlist_t *nvl, *args, *result;
-size_t gzfilesize = sizeof(gzFile);
-size_t gzheadersize = sizeof(struct gz_header_s);
+size_t gzsize = sizeof(gzFile);
+size_t gzheadersize = sizeof(gz_state);
size_t zstreamsize = sizeof(z_stream);
@@ -265,7 +266,7 @@
result = sendCommand(nvl, strm);
ret = nvlist_get_number(result, "result");
- newstrm = dnvlist_get_binary(result, "newstrm", &zstreamsize, NULL, NULL);
+ newstrm = nvlist_get_binary(result, "newstrm", &zstreamsize);
if (newstrm != NULL)
memcpy(strm, newstrm, zstreamsize);
destroy();
@@ -784,7 +785,7 @@
gzFile file;
const void *ptr;
- if ((file = malloc(gzfilesize)) == NULL)
+ if ((file = malloc(gzsize)) == NULL)
err(1, "malloc");
initNvl();
@@ -794,11 +795,10 @@
nvlist_move_descriptor(args, "fd", fd);
nvlist_add_string(args, "mode", mode);
nvlist_add_nvlist(nvl, "args", args);
-
- result = sendCommand(nvl, file);
- ptr = nvlist_get_binary(result, "result", gzfilesize);
- memcpy(file, ptr, gzfilesize);
+ result = sendCommand(nvl, file);
+ ptr = nvlist_get_binary(result, "result", &gzsize);
+ memcpy(file, ptr, gzsize);
destroy();
return(file);
}
@@ -810,7 +810,7 @@
initNvl();
nvlist_add_number(nvl, "command", ZCAPCMD_GZBUFFER);
- nvlist_add_binary(args, "file", file, gzfilesize);
+ nvlist_add_binary(args, "file", file, gzsize);
nvlist_add_number(args, "size", size);
nvlist_add_nvlist(nvl, "args", args);
@@ -828,7 +828,7 @@
initNvl();
nvlist_add_number(nvl, "command", ZCAPCMD_GZSETPARAMS);
- nvlist_add_binary(args, "file", file, gzfilesize);
+ nvlist_add_binary(args, "file", file, gzsize);
nvlist_add_number(args, "level", level);
nvlist_add_number(args, "strategy", strategy);
nvlist_add_nvlist(nvl, "args", args);
@@ -848,14 +848,14 @@
initNvl();
nvlist_add_number(nvl, "command", ZCAPCMD_GZREAD);
- nvlist_add_binary(args, "file", file, gzfilesize);
+ nvlist_add_binary(args, "file", file, gzsize);
nvlist_add_number(args, "len", len);
nvlist_add_nvlist(nvl, "args", args);
result = sendCommand(nvl, file);
int ret = nvlist_get_number(result, "result");
- data = nvlist_get_binary(result, "data", len);
+ data = nvlist_get_binary(result, "data", &len);
memcpy(buf, data, (size_t)len);
destroy();
return(ret);
@@ -867,7 +867,7 @@
initNvl();
nvlist_add_number(nvl, "command", ZCAPCMD_GZWRITE);
- nvlist_add_binary(args, "file", file, gzfilesize);
+ nvlist_add_binary(args, "file", file, gzsize);
nvlist_add_binary(args, "data", buf, len);
nvlist_add_number(args, "len", len);
nvlist_add_nvlist(nvl, "args", args);
@@ -885,7 +885,7 @@
initNvl();
nvlist_add_number(nvl, "command", ZCAPCMD_GZPRINTF);
- nvlist_add_binary(args, "file", file, gzfilesize);
+ nvlist_add_binary(args, "file", file, gzsize);
nvlist_add_string(args, "str", str);
nvlist_add_nvlist(nvl, "args", args);
@@ -903,7 +903,7 @@
initNvl();
nvlist_add_number(nvl, "command", ZCAPCMD_GZPUTS);
- nvlist_add_binary(args, "file", file, gzfilesize);
+ nvlist_add_binary(args, "file", file, gzsize);
nvlist_add_string(args, "s", s);
nvlist_add_nvlist(nvl, "args", args);
@@ -921,7 +921,7 @@
initNvl();
nvlist_add_number(nvl, "command", ZCAPCMD_GZGETS);
- nvlist_add_binary(args, "file", file, gzfilesize);
+ nvlist_add_binary(args, "file", file, gzsize);
nvlist_add_number(args, "len", len);
nvlist_add_nvlist(nvl, "args", args);
@@ -943,7 +943,7 @@
initNvl();
nvlist_add_number(nvl, "command", ZCAPCMD_GZPUTC);
- nvlist_add_binary(args, "file", file, gzfilesize);
+ nvlist_add_binary(args, "file", file, gzsize);
nvlist_add_number(args, "c", c);
nvlist_add_nvlist(nvl, "args", args);
@@ -962,7 +962,7 @@
nvlist_add_number(nvl, "command", ZCAPCMD_GZUNGETC);
nvlist_add_number(args, "c", c);
- nvlist_add_binary(args, "file", file, gzfilesize);
+ nvlist_add_binary(args, "file", file, gzsize);
nvlist_add_nvlist(nvl, "args", args);
result = sendCommand(nvl, file);
@@ -979,7 +979,7 @@
initNvl();
nvlist_add_number(nvl, "command", ZCAPCMD_GZFLUSH);
- nvlist_add_binary(args, "file", file, gzfilesize);
+ nvlist_add_binary(args, "file", file, gzsize);
nvlist_add_number(args, "flush", flush);
nvlist_add_nvlist(nvl, "args", args);
@@ -997,7 +997,7 @@
initNvl();
nvlist_add_number(nvl, "command", ZCAPCMD_GZSEEK);
- nvlist_add_binary(args, "file", file, gzfilesize);
+ nvlist_add_binary(args, "file", file, gzsize);
nvlist_add_number(args, "offset", offset);
nvlist_add_number(args, "whence", whence);
nvlist_add_nvlist(nvl, "args", args);
@@ -1019,7 +1019,7 @@
initNvl();
nvlist_add_number(nvl, "command", command);
- nvlist_add_binary(args, "file", file, gzfilesize);
+ nvlist_add_binary(args, "file", file, gzsize);
nvlist_add_number(args, "command", command);
nvlist_add_nvlist(nvl, "args", args);
@@ -1042,7 +1042,7 @@
initNvl();
nvlist_add_number(nvl, "command", ZCAPCMD_GZPUTC);
- nvlist_add_binary(args, "file", file, gzfilesize);
+ nvlist_add_binary(args, "file", file, gzsize);
nvlist_add_nvlist(nvl, "args", args);
result = sendCommand(nvl, file);
Modified: soc2013/dpl/head/lib/libzcap/debug.h
==============================================================================
--- soc2013/dpl/head/lib/libzcap/debug.h Fri Sep 13 20:56:42 2013 (r257282)
+++ soc2013/dpl/head/lib/libzcap/debug.h Fri Sep 13 21:29:29 2013 (r257283)
@@ -1 +1 @@
-int DEBUG_ZCAP = 1;
+int DEBUG_ZCAP = 0;
Modified: soc2013/dpl/head/lib/libzcap/test/zcaplibtest.c
==============================================================================
--- soc2013/dpl/head/lib/libzcap/test/zcaplibtest.c Fri Sep 13 20:56:42 2013 (r257282)
+++ soc2013/dpl/head/lib/libzcap/test/zcaplibtest.c Fri Sep 13 21:29:29 2013 (r257283)
@@ -177,22 +177,22 @@
file = gzopen(filename, "wb");
if (file == NULL)
err(1, "Couldn't open %s to write", filename);
- printf("gzopen: %p\n", file);
+ printf("gzopen()\n");
- fprintf(stderr, "gzbuffer()\n");
int ret = gzbuffer(file, 8192);
if (ret != Z_OK)
printf("gzbuffer(): Error: %d\n", ret);
+ printf("gzbuffer: %d\n", ret);
- fprintf(stderr, "gzsetparams()\n");
ret = gzsetparams(file, 9, Z_HUFFMAN_ONLY);
if (ret != Z_OK)
printf("gzsetparams(): Error: %d\n", ret);
+ printf("gzsetparams: %d\n", ret);
- fprintf(stderr, "gzdirect()\n");
ret = gzdirect(file);
if (ret < 0)
printf("gzdirect(): Error: %d\n", ret);
+ printf("gzdirect: %d\n", ret);
fprintf(stderr, "Ending testgzbasic\n");
return file;
Modified: soc2013/dpl/head/lib/libzcap/zlibworker/commands.c
==============================================================================
--- soc2013/dpl/head/lib/libzcap/zlibworker/commands.c Fri Sep 13 20:56:42 2013 (r257282)
+++ soc2013/dpl/head/lib/libzcap/zlibworker/commands.c Fri Sep 13 21:29:29 2013 (r257283)
@@ -11,7 +11,7 @@
extern int zero;
extern void *data;
-size_t gzsize = sizeof(gzFile);
+size_t gzsize = sizeof(gz_state);
size_t zstreamsize = sizeof(z_stream);
/*
@@ -245,16 +245,15 @@
void *ret = NULL;
int fd;
const char *mode;
+
/*
- * In order to make this work, since the library has
- * allocated memory to store the gzFile struct, we
- * only have to pass the pointer to this data.
+ * We don't have to save the gzFile,
+ * zlib does that for us.
*/
fd = nvlist_take_descriptor(args, "fd");
mode = nvlist_get_string(args, "mode");
ret = gzdopen(fd, mode);
-
nvlist_add_binary(result, "result", ret, gzsize);
}
@@ -265,12 +264,10 @@
gzFile file;
unsigned size;
- fprintf(stderr, "zlibworker: zcapcmd_gzbuffer(): Starts\n");
file = (gzFile)nvlist_get_binary(args, "file", &gzsize);
size = nvlist_get_number(args, "size");
ret = gzbuffer(file, size);
-
nvlist_add_number(result, "result", ret);
}
More information about the svn-soc-all
mailing list