[zumastor commit] r1733 - trunk/ddsnap

[codesite...@google.com]

Author: Daniel.Raymond.Phillips
Date: Fri Aug 22 21:05:03 2008
New Revision: 1733

Removed:
trunk/ddsnap/event.c
trunk/ddsnap/event.h
Modified:
trunk/ddsnap/Makefile
trunk/ddsnap/ddsnap.agent.c
trunk/ddsnap/ddsnap.c
trunk/ddsnap/ddsnap.h
trunk/ddsnap/ddsnapd.c

Log:
Remove deadweight code checked in by a deadweight google manager

Modified: trunk/ddsnap/Makefile
==============================================================================
--- trunk/ddsnap/Makefile (original)
+++ trunk/ddsnap/Makefile Fri Aug 22 21:05:03 2008
@@ -8,8 +8,8 @@
CPPFLAGS +=-D_FILE_OFFSET_BITS=64 -DDSNAP_MEM_MONITOR=30 $(INCLUDES)
CFLAGS +=-g -Wall -std=gnu99 -O2 -fno-strict-aliasing

-deps = Makefile trace.h diskio.h buffer.h list.h sock.h event.h
-ddsnap_agent_deps = $(deps) ddsnap.agent.h $(kernel)/dm-ddsnap.h
daemonize.h
+deps = Makefile trace.h diskio.h buffer.h list.h sock.h
+ddsnap_agent_deps = $(deps) ddsnap.h ddsnap.agent.h $(kernel)/dm-ddsnap.h
daemonize.h
ddsnapd_deps = $(deps) $(kernel)/dm-ddsnap.h daemonize.h ddsnap.h
ddsnap_deps = $(deps) ddsnap.h ddsnap.agent.h $(kernel)/dm-ddsnap.h
testdir = tests
@@ -56,15 +56,13 @@

buffer.o: buffer.c $(deps)

-event.o: event.c $(kernel)/dm-ddsnap.h event.h trace.h Makefile
-
daemonize.o: daemonize.c $(deps)

nblock_write: nblock_write.c
$(CC) nblock_write.c -o nblock_write

-ddsnap: ddsnap.c ddsnapd.o buffer.o event.o ddsnap.agent.o
xdelta/xdelta3.o delta.o diskio.o daemonize.o $(ddsnap_deps) build.h
- $(CC) ddsnap.c $(CFLAGS) $(CPPFLAGS) buffer.o event.o ddsnapd.o
ddsnap.agent.o xdelta/xdelta3.o delta.o diskio.o daemonize.o -o ddsnap
-lpopt -lz
+ddsnap: ddsnap.c ddsnapd.o buffer.o ddsnap.agent.o xdelta/xdelta3.o
delta.o diskio.o daemonize.o $(ddsnap_deps) build.h
+ $(CC) ddsnap.c $(CFLAGS) $(CPPFLAGS) buffer.o ddsnapd.o ddsnap.agent.o
xdelta/xdelta3.o delta.o diskio.o daemonize.o -o ddsnap -lpopt -lz

devspam: tests/devspam.c trace.h
$(CC) $< $(CFLAGS) $(CPPFLAGS) -o $@

Modified: trunk/ddsnap/ddsnap.agent.c
==============================================================================
--- trunk/ddsnap/ddsnap.agent.c (original)
+++ trunk/ddsnap/ddsnap.agent.c Fri Aug 22 21:05:03 2008
@@ -16,7 +16,6 @@
#include "trace.h"
#include "sock.h" // send_fd, read/writepipe, connect_socket
#include "daemonize.h"
-#include "event.h"

#define trace trace_off

Modified: trunk/ddsnap/ddsnap.c
==============================================================================
--- trunk/ddsnap/ddsnap.c (original)
+++ trunk/ddsnap/ddsnap.c Fri Aug 22 21:05:03 2008
@@ -33,7 +33,6 @@
#include "sock.h"
#include "trace.h"
#include "build.h"
-#include "event.h"

/* Utilities */

Modified: trunk/ddsnap/ddsnap.h
==============================================================================
--- trunk/ddsnap/ddsnap.h (original)
+++ trunk/ddsnap/ddsnap.h Fri Aug 22 21:05:03 2008
@@ -52,11 +52,10 @@
#define outbead(SOCK, CODE, STRUCT, VALUES...) ({ \
struct { struct head head; STRUCT body; } PACKED message = \
{ { CODE, sizeof(STRUCT) }, { VALUES } }; \
- event_hook(SOCK, CODE); \
writepipe(SOCK, &message, sizeof(message)); })

/* outhead calls event_hook, then writepipe, and returns writepipe's
value. */
-#define outhead(SOCK, CODE, SIZE) (event_hook(SOCK, CODE), writepipe(SOCK,
&(struct head){ CODE, SIZE }, sizeof(struct head) ))
+#define outhead(SOCK, CODE, SIZE) (writepipe(SOCK, &(struct head){ CODE,
SIZE }, sizeof(struct head) ))

struct server { struct server_head { u8 type; u8 length; } header; char
*address; } PACKED;

Modified: trunk/ddsnap/ddsnapd.c
==============================================================================
--- trunk/ddsnap/ddsnapd.c (original)
+++ trunk/ddsnap/ddsnapd.c Fri Aug 22 21:05:03 2008
@@ -41,7 +41,6 @@
#include "list.h"
#include "sock.h"
#include "trace.h"
-#include "event.h"

#define SECTORS_PER_BLOCK 7
#define CHUNK_SIZE 4096
@@ -4167,7 +4166,6 @@

static int cleanup(struct superblock *sb)
{
- event_hook(0, SHUTDOWN_SERVER); /* event hook for abort action */
commit_deferred_allocs(sb);
sb->image.flags &= ~SB_BUSY;
set_sb_dirty(sb);
@@ -4210,7 +4208,6 @@

struct server_head server_head = { .type = AF_UNIX, .length =
(strlen(server_sockname) + 1) };
trace(warn("server socket name is %s and length is %d", server_sockname,
server_head.length););
- event_hook(*agentfd, SERVER_READY);
if (writepipe(*agentfd, &(struct head){ SERVER_READY, sizeof(struct
server_head) }, sizeof(struct head)) < 0 ||
writepipe(*agentfd, &server_head, sizeof(server_head)) < 0 ||
writepipe(*agentfd, server_sockname, server_head.length) < 0)
@@ -4234,7 +4231,6 @@
warn("can not set process to throttle less (error %i, %s)", errno,
strerror(errno));
if ((err = prctl(PR_SET_MEMALLOC, 0, 0, 0, 0)))
warn("failed to enter memalloc mode (may deadlock) (error %i, %s)",
errno, strerror(errno));
- event_parse_options();

while (1) {
trace(warn("Waiting for activity"););