drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix previous fix for generating unique inode numbers for sockets 

* fhandler.h (fhandler_base::get_plain_ino): New inline method.
	Add comment to explain what it's supposed to be used for.
	* fhandler_socket.cc (fhandler_socket::get_proc_fd_name): Create
	filename using inode number.
	(fhandler_socket::fstat): Generate inode number from filename if
	ino is not set (that's the case in a stat(2) call).
	* pipe.cc: Throughout, use get_plain_ino when appropriate.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2016-01-11 19:10:45 +01:00
parent b4cf3f454d
commit 27086d628e
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
winsup/cygwin/fhandler.h
View File

@ -304,6 +304,8 @@ class fhandler_base
const char *get_name () const { return pc.get_posix (); } const char *get_name () const { return pc.get_posix (); }
const char *get_win32_name () { return pc.get_win32 (); } const char *get_win32_name () { return pc.get_win32 (); }
virtual dev_t get_dev () { return get_device (); } virtual dev_t get_dev () { return get_device (); }
/* Use get_plain_ino if the caller needs to avoid hashing if ino is 0. */
ino_t get_plain_ino () { return ino; }
ino_t get_ino () { return ino ?: ino = hash_path_name (0, pc.get_nt_native_path ()); } ino_t get_ino () { return ino ?: ino = hash_path_name (0, pc.get_nt_native_path ()); }
int64_t get_unique_id () const { return unique_id; } int64_t get_unique_id () const { return unique_id; }
/* Returns name used for /proc/<pid>/fd in buf. */ /* Returns name used for /proc/<pid>/fd in buf. */

6
winsup/cygwin/fhandler_socket.cc
View File

@ -250,7 +250,7 @@ fhandler_socket::~fhandler_socket ()
char * char *
fhandler_socket::get_proc_fd_name (char *buf) fhandler_socket::get_proc_fd_name (char *buf)
{ {
__small_sprintf (buf, "socket:[%lu]", get_socket ()); __small_sprintf (buf, "socket:[%lu]", get_plain_ino ());
return buf; return buf;
} }
@ -939,7 +939,9 @@ fhandler_socket::fstat (struct stat *buf)
if (!res) if (!res)
{ {
buf->st_dev = FHDEV (DEV_TCP_MAJOR, 0); buf->st_dev = FHDEV (DEV_TCP_MAJOR, 0);
buf->st_ino = (ino_t) get_ino (); if (!(buf->st_ino = get_plain_ino ()))
sscanf (get_name (), "/proc/%*d/fd/socket:[%lld]",
(long long *) &buf->st_ino);
buf->st_mode = S_IFSOCK | S_IRWXU | S_IRWXG | S_IRWXO; buf->st_mode = S_IFSOCK | S_IRWXU | S_IRWXG | S_IRWXO;
buf->st_size = 0; buf->st_size = 0;
} }

12
winsup/cygwin/pipe.cc
View File

@ -142,7 +142,8 @@ fhandler_pipe::open (int flags, mode_t mode)
__seterrno (); __seterrno ();
goto out; goto out;
} }
init (nio_hdl, fh->get_access (), mode & O_TEXT ?: O_BINARY, fh->get_ino ()); init (nio_hdl, fh->get_access (), mode & O_TEXT ?: O_BINARY,
fh->get_plain_ino ());
cfree (fh); cfree (fh);
CloseHandle (proc); CloseHandle (proc);
return 1; return 1;
@ -181,7 +182,7 @@ fhandler_pipe::ftruncate (off_t length, bool allow_truncate)
char * char *
fhandler_pipe::get_proc_fd_name (char *buf) fhandler_pipe::get_proc_fd_name (char *buf)
{ {
__small_sprintf (buf, "pipe:[%D]", get_ino ()); __small_sprintf (buf, "pipe:[%D]", get_plain_ino ());
return buf; return buf;
} }
@ -422,8 +423,7 @@ fhandler_pipe::fstat (struct stat *buf)
if (!ret) if (!ret)
{ {
buf->st_dev = FH_PIPE; buf->st_dev = FH_PIPE;
/* Don't use get_ino, it doesn't return 0 but a hash instead. */ if (!(buf->st_ino = get_plain_ino ()))
if (!(buf->st_ino = get_unique_id ()))
sscanf (get_name (), "/proc/%*d/fd/pipe:[%lld]", sscanf (get_name (), "/proc/%*d/fd/pipe:[%lld]",
(long long *) &buf->st_ino); (long long *) &buf->st_ino);
} }
@ -447,9 +447,9 @@ pipe_worker (int filedes[2], unsigned int psize, int mode)
cygheap_fdnew fdin; cygheap_fdnew fdin;
cygheap_fdnew fdout (fdin, false); cygheap_fdnew fdout (fdin, false);
char buf[sizeof ("/dev/fd/pipe:[9223372036854775807]")]; char buf[sizeof ("/dev/fd/pipe:[9223372036854775807]")];
__small_sprintf (buf, "/dev/fd/pipe:[%D]", fhs[0]->get_ino ()); __small_sprintf (buf, "/dev/fd/pipe:[%D]", fhs[0]->get_plain_ino ());
fhs[0]->pc.set_posix (buf); fhs[0]->pc.set_posix (buf);
__small_sprintf (buf, "pipe:[%D]", fhs[1]->get_ino ()); __small_sprintf (buf, "pipe:[%D]", fhs[1]->get_plain_ino ());
fhs[1]->pc.set_posix (buf); fhs[1]->pc.set_posix (buf);
fdin = fhs[0]; fdin = fhs[0];
fdout = fhs[1]; fdout = fhs[1];