Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Getting rid of recent "chown" since we decided to forego trying to run
[rsync/rsync.git]
/
io.c
diff --git
a/io.c
b/io.c
index
a83276d
..
f651116
100644
(file)
--- a/
io.c
+++ b/
io.c
@@
-52,18
+52,23
@@
extern int io_timeout;
extern struct stats stats;
extern struct stats stats;
+const char phase_unknown[] = "unknown";
+
/**
* The connection might be dropped at some point; perhaps because the
* remote instance crashed. Just giving the offset on the stream is
* not very helpful. So instead we try to make io_phase_name point to
* something useful.
*
/**
* The connection might be dropped at some point; perhaps because the
* remote instance crashed. Just giving the offset on the stream is
* not very helpful. So instead we try to make io_phase_name point to
* something useful.
*
+ * For buffered/multiplexed IO these names will be somewhat
+ * approximate; perhaps for ease of support we would rather make the
+ * buffer always flush when a single application-level IO finishes.
+ *
* @todo Perhaps we want some simple stack functionality, but there's
* no need to overdo it.
**/
* @todo Perhaps we want some simple stack functionality, but there's
* no need to overdo it.
**/
-const char *io_write_phase = "unknown";
-const char *io_read_phase = "unknown";
-
+const char *io_write_phase = phase_unknown;
+const char *io_read_phase = phase_unknown;
/** Ignore EOF errors while reading a module listing if the remote
version is 24 or less. */
/** Ignore EOF errors while reading a module listing if the remote
version is 24 or less. */
@@
-99,7
+104,7
@@
static void check_timeout(void)
}
}
}
}
-/** Setup the fd used to prop
o
gate errors */
+/** Setup the fd used to prop
a
gate errors */
void io_set_error_fd(int fd)
{
io_error_fd = fd;
void io_set_error_fd(int fd)
{
io_error_fd = fd;
@@
-621,6
+626,14
@@
void write_int(int f,int32 x)
}
}
+void write_int_named(int f, int32 x, const char *phase)
+{
+ io_write_phase = phase;
+ write_int(f, x);
+ io_write_phase = phase_unknown;
+}
+
+
/*
* Note: int64 may actually be a 32-bit type if ./configure couldn't find any
* 64-bit types on this platform.
/*
* Note: int64 may actually be a 32-bit type if ./configure couldn't find any
* 64-bit types on this platform.