diff options
| author | Marcus Brinkmann <[email protected]> | 2010-06-10 13:49:19 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2010-06-10 13:49:19 +0000 |
| commit | dbb1112da152e0d1474dfb3d1446361cb5d5dcd3 (patch) | |
| tree | cf2d42222b430063592d2ac2744687f8ecb24fa2 /src/debug.h | |
| parent | * debug.h (TRACE_SUC6): New macro. (diff) | |
| download | gpgme-dbb1112da152e0d1474dfb3d1446361cb5d5dcd3.tar.gz gpgme-dbb1112da152e0d1474dfb3d1446361cb5d5dcd3.zip | |
2010-06-10 Marcus Brinkmann <[email protected]>
* debug.h (TRACE_SUC6): New macro.
* w32-io.c (MAX_SLAFD): New macro.
(fd_table): New static variable.
(new_fd, release_fd): New functions.
(fd_to_handle, handle_to_fd, handle_to_socket): Remove macros.
(MAX_READERS, MAX_WRITERS): Increase to 64.
(notify_table): Increase to MAX_SLAFD.
(struct reader_context_s, struct writer_context_s): Add member
file_sock.
(reader, writer): Use file_hd vs file_sock to decide if socket
operations to use. Remove auto-detect mode.
(create_reader, create_writer): Set file_sock. Unblock pending
thread only if this is a pipe fd.
(_gpgme_io_pipe): Allocate fds from table and return slot indices
instead of windows handles. This allows to properly handle RVIDs.
(_gpgme_io_close): Handle dup'ed file descriptors.
(build_commandline) [HAVE_W32_SYSTEM]: Use RVID from fd table now.
(_gpgme_io_spawn): Use fd table now.
(_gpgme_io_fd2str): Use RVID from fd table now.
(_gpgme_io_dup): Implement using fd table.
(_gpgme_io_socket): Allocate fds from table.
(_gpgme_io_connect): Use fd from table.
Diffstat (limited to 'src/debug.h')
| -rw-r--r-- | src/debug.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/debug.h b/src/debug.h index 29c5a322..cbfccca0 100644 --- a/src/debug.h +++ b/src/debug.h @@ -204,6 +204,10 @@ void _gpgme_debug_frame_end (void); _gpgme_debug (_gpgme_trace_level, "%s: leave: " fmt "\n", \ _gpgme_trace_func, arg1, arg2, arg3, arg4, arg5), \ _gpgme_debug_frame_end (), 0 +#define TRACE_SUC6(fmt, arg1, arg2, arg3, arg4, arg5, arg6) \ + _gpgme_debug (_gpgme_trace_level, "%s: leave: " fmt "\n", \ + _gpgme_trace_func, arg1, arg2, arg3, arg4, arg5, arg6), \ + _gpgme_debug_frame_end (), 0 #define TRACE_LOG(fmt) \ _gpgme_debug (_gpgme_trace_level, "%s: check: %s=%p, " fmt "\n", \ |