Author: adrian.chadd
Date: Fri Apr 3 20:36:45 2009
New Revision: 13906
Modified:
branches/LUSCA_HEAD/libiapp/comm.c
branches/LUSCA_HEAD/libiapp/fd.c
Log:
Revert the last change for now - too much existing code (eg, bits
of the disk code, bits of the ipc/helper code) just dumps FDs into the
comm framework without any particuarly well documented method of doing
so, then calls fd_close() to wrap up.
Some transition work will be needed to trigger assert()ions where code is
being evilly stupid (or stupidly evil) and then start tidying them up,
far before the FD/comm/Disk code can be further untangled.
Modified: branches/LUSCA_HEAD/libiapp/comm.c
==============================================================================
--- branches/LUSCA_HEAD/libiapp/comm.c (original)
+++ branches/LUSCA_HEAD/libiapp/comm.c Fri Apr 3 20:36:45 2009
@@ -700,11 +700,6 @@
comm_close_finish(int fd)
{
sqinet_done(&fd_table[fd].local_address);
- commClose(fd);
-#if DELAY_POOLS
- if (fd_table[fd].slow_id)
- commRemoveSlow(fd);
-#endif
fd_close(fd); /* update fdstat */
close(fd);
CommStats.syscalls.sock.closes++;
Modified: branches/LUSCA_HEAD/libiapp/fd.c
==============================================================================
--- branches/LUSCA_HEAD/libiapp/fd.c (original)
+++ branches/LUSCA_HEAD/libiapp/fd.c Fri Apr 3 20:36:45 2009
@@ -134,7 +134,12 @@
assert(F->write_handler == NULL);
}
debug(51, 3) ("fd_close FD %d %s\n", fd, F->desc);
+ commClose(fd);
F->flags.open = 0;
+#if DELAY_POOLS
+ if (F->slow_id)
+ commRemoveSlow(fd);
+#endif
fdUpdateBiggest(fd, 0);
Number_FD--;
memset(F, '\0', sizeof(fde));
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"lusca-commit" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/lusca-commit?hl=en
-~----------~----~----~----~------~----~------~--~---
