diff options
| -rw-r--r-- | winsup/cygwin/ChangeLog | 35 | ||||
| -rw-r--r-- | winsup/cygwin/devices.h | 1 | ||||
| -rw-r--r-- | winsup/cygwin/dtable.cc | 1 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler.h | 1 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_proc.cc | 141 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_process.cc | 553 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_procnet.cc | 2 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_registry.cc | 2 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_virtual.cc | 6 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_virtual.h | 27 |
10 files changed, 445 insertions, 324 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 022a25103..dd9e45fd3 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,40 @@ 2009-01-20 Corinna Vinschen <corinna@vinschen.de> + * devices.h (FH_PROCESSFD): New device type. + * dtable.cc (build_fh_pc): Add case for FH_PROCESSFD. + * fhandler.h (class fhandler_virtual): Drop bufalloc member. + * fhandler_virtual.h: New header. + * fhandler_proc.cc: Remove types proc_type_t and proc_tab_t in favor + of types virt_type_t and virt_tab_t from fhandler_virtual.h. + Change prototypes of format_XXX functions accordingly. + (proc_tab): Drop size member info. + (fhandler_proc::fill_filebuf): Don't allocate filebuf here. Allocate + it in the format_XXX functions. + * fhandler_process.cc: Reorganize global process content data into a + new struct virt_tab_t. Accommodate throughout. + (format_process_winexename): New function. + (format_process_winpid): New function. + (format_process_exename): New function. + (format_process_root): New function. + (format_process_cwd): New function. + (format_process_cmdline): New function. + (format_process_ppid): New function. + (format_process_uid): New function. + (format_process_pgid): New function. + (format_process_sid): New function. + (format_process_gid): New function. + (format_process_ctty): New function. + (format_process_fd): New function. + * fhandler_procnet.cc (fhandler_procnet::fill_filebuf): Don't use + bufalloc. + * fhandler_registry.cc (fhandler_registry::fill_filebuf): Define + bufalloc locally. + * fhandler_virtual.cc (fhandler_virtual::fhandler_virtual): Drop + initialization of bufalloc. + (fhandler_virtual::dup): Drop copying bufalloc. + +2009-01-20 Corinna Vinschen <corinna@vinschen.de> + * thread.h (struct pthread_rwlock::RWLOCK_READER): Add counter n. * thread.cc (pthread_rwlock::rdlock): If a thread already owns a read lock, just count the number of locks for it, per SUSv4. diff --git a/winsup/cygwin/devices.h b/winsup/cygwin/devices.h index 9c8efa325..d1a76a4ff 100644 --- a/winsup/cygwin/devices.h +++ b/winsup/cygwin/devices.h @@ -52,6 +52,7 @@ enum fh_devices FH_NETDRIVE= FHDEV (0, 246), FH_DEV = FHDEV (0, 245), FH_PROCNET = FHDEV (0, 244), + FH_PROCESSFD = FHDEV (0, 243), DEV_FLOPPY_MAJOR = 2, FH_FLOPPY = FHDEV (DEV_FLOPPY_MAJOR, 0), diff --git a/winsup/cygwin/dtable.cc b/winsup/cygwin/dtable.cc index d8d7c2ba7..4c002908e 100644 --- a/winsup/cygwin/dtable.cc +++ b/winsup/cygwin/dtable.cc @@ -507,6 +507,7 @@ build_fh_pc (path_conv& pc) fh = cnew (fhandler_registry) (); break; case FH_PROCESS: + case FH_PROCESSFD: fh = cnew (fhandler_process) (); break; case FH_PROCNET: diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h index 9d7cbd9f3..66f90a058 100644 --- a/winsup/cygwin/fhandler.h +++ b/winsup/cygwin/fhandler.h @@ -1227,7 +1227,6 @@ class fhandler_virtual : public fhandler_base { protected: char *filebuf; - size_t bufalloc; _off64_t filesize; _off64_t position; int fileid; // unique within each class diff --git a/winsup/cygwin/fhandler_proc.cc b/winsup/cygwin/fhandler_proc.cc index cd8cd7116..eba39a349 100644 --- a/winsup/cygwin/fhandler_proc.cc +++ b/winsup/cygwin/fhandler_proc.cc @@ -16,9 +16,11 @@ details. */ #include "security.h" #include "path.h" #include "fhandler.h" +#include "fhandler_virtual.h" #include "pinfo.h" #include "dtable.h" #include "cygheap.h" +#include "tls_pbuf.h" #include <sys/utsname.h> #include <sys/param.h> #include "ntdll.h" @@ -30,53 +32,37 @@ details. */ #define _COMPILING_NEWLIB #include <dirent.h> -enum proc_type_t { - proc_symlink = -2, - proc_file = -1, - proc_none = 0, - proc_directory = 1, - proc_rootdir = 2 -}; - -struct proc_tab_t { - const char *name; - __dev32_t fhandler; - proc_type_t type; - size_t bufsize; - _off64_t (*format_func)(char *, size_t); -}; - -static _off64_t format_proc_loadavg (char *, size_t); -static _off64_t format_proc_meminfo (char *, size_t); -static _off64_t format_proc_stat (char *, size_t); -static _off64_t format_proc_version (char *, size_t); -static _off64_t format_proc_uptime (char *, size_t); -static _off64_t format_proc_cpuinfo (char *, size_t); -static _off64_t format_proc_partitions (char *, size_t); -static _off64_t format_proc_self (char *, size_t); +static _off64_t format_proc_loadavg (void *, char *&); +static _off64_t format_proc_meminfo (void *, char *&); +static _off64_t format_proc_stat (void *, char *&); +static _off64_t format_proc_version (void *, char *&); +static _off64_t format_proc_uptime (void *, char *&); +static _off64_t format_proc_cpuinfo (void *, char *&); +static _off64_t format_proc_partitions (void *, char *&); +static _off64_t format_proc_self (void *, char *&); /* names of objects in /proc */ -static const proc_tab_t proc_tab[] = { - { ".", FH_PROC, proc_directory, 0, NULL }, - { "..", FH_PROC, proc_directory, 0, NULL }, - { "loadavg", FH_PROC, proc_file, 16, format_proc_loadavg }, - { "meminfo", FH_PROC, proc_file, 2048, format_proc_meminfo }, - { "registry", FH_REGISTRY, proc_directory, 0, NULL }, - { "stat", FH_PROC, proc_file, 16384, format_proc_stat }, - { "version", FH_PROC, proc_file, 100, format_proc_version }, - { "uptime", FH_PROC, proc_file, 80, format_proc_uptime }, - { "cpuinfo", FH_PROC, proc_file, 16384, format_proc_cpuinfo }, - { "partitions", FH_PROC, proc_file, 4096, format_proc_partitions }, - { "self", FH_PROC, proc_symlink, 16, format_proc_self }, - { "registry32", FH_REGISTRY, proc_directory, 0, NULL }, - { "registry64", FH_REGISTRY, proc_directory, 0, NULL }, - { "net", FH_PROCNET, proc_directory, 0, NULL }, - { NULL, 0, proc_none, 0, NULL }, +static const virt_tab_t proc_tab[] = { + { ".", FH_PROC, virt_directory, NULL }, + { "..", FH_PROC, virt_directory, NULL }, + { "loadavg", FH_PROC, virt_file, format_proc_loadavg }, + { "meminfo", FH_PROC, virt_file, format_proc_meminfo }, + { "registry", FH_REGISTRY, virt_directory, NULL }, + { "stat", FH_PROC, virt_file, format_proc_stat }, + { "version", FH_PROC, virt_file, format_proc_version }, + { "uptime", FH_PROC, virt_file, format_proc_uptime }, + { "cpuinfo", FH_PROC, virt_file, format_proc_cpuinfo }, + { "partitions", FH_PROC, virt_file, format_proc_partitions }, + { "self", FH_PROC, virt_symlink, format_proc_self }, + { "registry32", FH_REGISTRY, virt_directory, NULL }, + { "registry64", FH_REGISTRY, virt_directory, NULL }, + { "net", FH_PROCNET, virt_directory, NULL }, + { NULL, 0, virt_none, NULL } }; #define PROC_DIR_COUNT 4 -static const int PROC_LINK_COUNT = (sizeof (proc_tab) / sizeof (proc_tab_t)) - 1; +static const int PROC_LINK_COUNT = (sizeof (proc_tab) / sizeof (virt_tab_t)) - 1; /* name of the /proc filesystem */ const char proc[] = "/proc"; @@ -136,14 +122,14 @@ fhandler_proc::exists () debug_printf ("exists (%s)", path); path += proc_len; if (*path == 0) - return proc_rootdir; + return virt_rootdir; for (int i = 0; proc_tab[i].name; i++) if (!strcmp (path + 1, proc_tab[i].name)) { fileid = i; return proc_tab[i].type; } - return 0; + return virt_none; } fhandler_proc::fhandler_proc (): @@ -176,9 +162,9 @@ fhandler_proc::fstat (struct __stat64 *buf) for (int i = 0; proc_tab[i].name; i++) if (!strcmp (path, proc_tab[i].name)) { - if (proc_tab[i].type == proc_directory) + if (proc_tab[i].type == virt_directory) buf->st_mode |= S_IFDIR | S_IXUSR | S_IXGRP | S_IXOTH; - else if (proc_tab[i].type == proc_symlink) + else if (proc_tab[i].type == virt_symlink) buf->st_mode = S_IFLNK | S_IRWXU | S_IRWXG | S_IRWXO; else { @@ -333,33 +319,36 @@ fhandler_proc::fill_filebuf () { if (fileid < PROC_LINK_COUNT && proc_tab[fileid].format_func) { - filebuf = (char *) crealloc_abort (filebuf, - bufalloc = proc_tab[fileid].bufsize); - filesize = proc_tab[fileid].format_func (filebuf, bufalloc); + filesize = proc_tab[fileid].format_func (NULL, filebuf); return true; } return false; } static _off64_t -format_proc_version (char *destbuf, size_t maxsize) +format_proc_version (void *, char *&destbuf) { struct utsname uts_name; uname (&uts_name); + destbuf = (char *) crealloc_abort (destbuf, strlen (uts_name.sysname) + + strlen (uts_name.release) + + strlen (uts_name.version) + + 4); return __small_sprintf (destbuf, "%s %s %s\n", uts_name.sysname, uts_name.release, uts_name.version); } static _off64_t -format_proc_loadavg (char *destbuf, size_t maxsize) +format_proc_loadavg (void *, char *&destbuf) { + destbuf = (char *) crealloc_abort (destbuf, 16); return __small_sprintf (destbuf, "%u.%02u %u.%02u %u.%02u\n", 0, 0, 0, 0, 0, 0); } static _off64_t -format_proc_meminfo (char *destbuf, size_t maxsize) +format_proc_meminfo (void *, char *&destbuf) { unsigned long mem_total = 0UL, mem_free = 0UL, swap_total = 0UL, swap_free = 0UL; @@ -370,6 +359,7 @@ format_proc_meminfo (char *destbuf, size_t maxsize) PSYSTEM_PAGEFILE_INFORMATION spi = NULL; ULONG size = 512; NTSTATUS ret = STATUS_SUCCESS; + spi = (PSYSTEM_PAGEFILE_INFORMATION) malloc (size); if (spi) { @@ -404,6 +394,7 @@ format_proc_meminfo (char *destbuf, size_t maxsize) } if (spi) free (spi); + destbuf = (char *) crealloc_abort (destbuf, 512); return __small_sprintf (destbuf, " total: used: free:\n" "Mem: %10lu %10lu %10lu\n" "Swap: %10lu %10lu %10lu\n" @@ -424,7 +415,7 @@ format_proc_meminfo (char *destbuf, size_t maxsize) } static _off64_t -format_proc_uptime (char *destbuf, size_t maxsize) +format_proc_uptime (void *, char *&destbuf) { unsigned long long uptime = 0ULL, idle_time = 0ULL; @@ -451,24 +442,27 @@ format_proc_uptime (char *destbuf, size_t maxsize) if (NT_SUCCESS (ret)) idle_time = (spi.IdleTime.QuadPart / sbi.NumberProcessors) / 100000ULL; + destbuf = (char *) crealloc_abort (destbuf, 80); return __small_sprintf (destbuf, "%U.%02u %U.%02u\n", uptime / 100, long (uptime % 100), idle_time / 100, long (idle_time % 100)); } static _off64_t -format_proc_stat (char *destbuf, size_t maxsize) +format_proc_stat (void *, char *&destbuf) { unsigned long pages_in = 0UL, pages_out = 0UL, interrupt_count = 0UL, context_switches = 0UL, swap_in = 0UL, swap_out = 0UL; time_t boot_time = 0; - - char *eobuf = destbuf; NTSTATUS ret; SYSTEM_PERFORMANCE_INFORMATION spi; SYSTEM_TIME_OF_DAY_INFORMATION stodi; - SYSTEM_BASIC_INFORMATION sbi; + tmp_pathbuf tp; + + char *buf = tp.c_get (); + char *eobuf = buf; + if ((ret = NtQuerySystemInformation (SystemBasicInformation, (PVOID) &sbi, sizeof sbi, NULL)) != STATUS_SUCCESS) @@ -541,7 +535,9 @@ format_proc_stat (char *destbuf, size_t maxsize) interrupt_count, context_switches, boot_time); - return eobuf - destbuf; + destbuf = (char *) crealloc_abort (destbuf, eobuf - buf); + memcpy (destbuf, buf, eobuf - buf); + return eobuf - buf; } #define read_value(x,y) \ @@ -567,7 +563,7 @@ format_proc_stat (char *destbuf, size_t maxsize) } while (0) static _off64_t -format_proc_cpuinfo (char *destbuf, size_t maxsize) +format_proc_cpuinfo (void *, char *&destbuf) { SYSTEM_INFO siSystemInfo; HKEY hKey; @@ -576,10 +572,12 @@ format_proc_cpuinfo (char *destbuf, size_t maxsize) int cpu_number; const int BUFSIZE = 256; CHAR szBuffer[BUFSIZE]; - char *bufptr = destbuf; + tmp_pathbuf tp; - GetSystemInfo (&siSystemInfo); + char *buf = tp.c_get (); + char *bufptr = buf; + GetSystemInfo (&siSystemInfo); for (cpu_number = 0; ; cpu_number++) { if (cpu_number) @@ -962,22 +960,25 @@ format_proc_cpuinfo (char *destbuf, size_t maxsize) bufptr += __small_sprintf (bufptr, "\n"); } - return bufptr - destbuf; + destbuf = (char *) crealloc_abort (destbuf, bufptr - buf); + memcpy (destbuf, buf, bufptr - buf); + return bufptr - buf; } #undef read_value static _off64_t -format_proc_partitions (char *destbuf, size_t maxsize) +format_proc_partitions (void *, char *&destbuf) { - char *bufptr = destbuf; - print ("major minor #blocks name\n\n"); - char devname[NAME_MAX + 1]; OBJECT_ATTRIBUTES attr; HANDLE dirhdl, devhdl; IO_STATUS_BLOCK io; NTSTATUS status; + tmp_pathbuf tp; + + char *buf = tp.c_get (); + char *bufptr = buf; /* Open \Device object directory. */ wchar_t wpath[MAX_PATH] = L"\\Device"; @@ -987,9 +988,10 @@ format_proc_partitions (char *destbuf, size_t maxsize) if (!NT_SUCCESS (status)) { debug_printf ("NtOpenDirectoryObject %x", status); - return bufptr - destbuf; + return 0; } + print ("major minor #blocks name\n\n"); /* Traverse \Device directory ... */ PDIRECTORY_BASIC_INFORMATION dbi = (PDIRECTORY_BASIC_INFORMATION) alloca (640); @@ -1113,12 +1115,15 @@ format_proc_partitions (char *destbuf, size_t maxsize) } NtClose (dirhdl); - return bufptr - destbuf; + destbuf = (char *) crealloc_abort (destbuf, bufptr - buf); + memcpy (destbuf, buf, bufptr - buf); + return bufptr - buf; } static _off64_t -format_proc_self (char *destbuf, size_t maxsize) +format_proc_self (void *, char *&destbuf) { + destbuf = (char *) crealloc_abort (destbuf, 16); return __small_sprintf (destbuf, "%d", getpid ()); } diff --git a/winsup/cygwin/fhandler_process.cc b/winsup/cygwin/fhandler_process.cc index 25dfbea80..1f0198a82 100644 --- a/winsup/cygwin/fhandler_process.cc +++ b/winsup/cygwin/fhandler_process.cc @@ -15,6 +15,7 @@ details. */ #include "security.h" #include "path.h" #include "fhandler.h" +#include "fhandler_virtual.h" #include "pinfo.h" #include "shared_info.h" #include "dtable.h" @@ -29,62 +30,52 @@ details. */ #define _COMPILING_NEWLIB #include <dirent.h> -static const int PROCESS_PPID = 2; -static const int PROCESS_WINPID = 3; -static const int PROCESS_WINEXENAME = 4; -static const int PROCESS_STATUS = 5; -static const int PROCESS_UID = 6; -static const int PROCESS_GID = 7; -static const int PROCESS_PGID = 8; -static const int PROCESS_SID = 9; -static const int PROCESS_CTTY = 10; -static const int PROCESS_STAT = 11; -static const int PROCESS_STATM = 12; -static const int PROCESS_CMDLINE = 13; -static const int PROCESS_MAPS = 14; -static const int PROCESS_FD = 15; -static const int PROCESS_EXENAME = 16; -/* Keep symlinks always the last entries. */ -static const int PROCESS_ROOT = 17; -static const int PROCESS_EXE = 18; -static const int PROCESS_CWD = 19; - -/* The position of "root" defines the beginning of symlik entries. */ -#define is_symlink(nr) ((nr) >= PROCESS_ROOT) - -static const char * const process_listing[] = +static _off64_t format_process_maps (void *, char *&); +static _off64_t format_process_stat (void *, char *&); +static _off64_t format_process_status (void *, char *&); +static _off64_t format_process_statm (void *, char *&); +static _off64_t format_process_winexename (void *, char *&); +static _off64_t format_process_winpid (void *, char *&); +static _off64_t format_process_exename (void *, char *&); +static _off64_t format_process_root (void *, char *&); +static _off64_t format_process_cwd (void *, char *&); +static _off64_t format_process_cmdline (void *, char *&); +static _off64_t format_process_ppid (void *, char *&); +static _off64_t format_process_uid (void *, char *&); +static _off64_t format_process_pgid (void *, char *&); +static _off64_t format_process_sid (void *, char *&); +static _off64_t format_process_gid (void *, char *&); +static _off64_t format_process_ctty (void *, char *&); +static _off64_t format_process_fd (void *, char *&); + +static const virt_tab_t process_tab[] = { - ".", - "..", - "ppid", - "winpid", - "winexename", - "status", - "uid", - "gid", - "pgid", - "sid", - "ctty", - "stat", - "statm", - "cmdline", - "maps", - "fd", - "exename", - /* Keep symlinks always the last entries. */ - "root", - "exe", - "cwd", - NULL + { ".", FH_PROCESS, virt_directory, NULL }, + { "..", FH_PROCESS, virt_directory, NULL }, + { "ppid", FH_PROCESS, virt_file, format_process_ppid }, + { "winpid", FH_PROCESS, virt_file, format_process_winpid }, + { "winexename", FH_PROCESS, virt_file, format_process_winexename }, + { "status", FH_PROCESS, virt_file, format_process_status }, + { "uid", FH_PROCESS, virt_file, format_process_uid }, + { "gid", FH_PROCESS, virt_file, format_process_gid }, + { "pgid", FH_PROCESS, virt_file, format_process_pgid }, + { "sid", FH_PROCESS, virt_file, format_process_sid }, + { "ctty", FH_PROCESS, virt_file, format_process_ctty }, + { "stat", FH_PROCESS, virt_file, format_process_stat }, + { "statm", FH_PROCESS, virt_file, format_process_statm }, + { "cmdline", FH_PROCESS, virt_file, format_process_cmdline }, + { "maps", FH_PROCESS, virt_file, format_process_maps }, + { "fd", FH_PROCESSFD, virt_directory, format_process_fd }, + { "exename", FH_PROCESS, virt_file, format_process_exename }, + { "root", FH_PROCESS, virt_symlink, format_process_root }, + { "exe", FH_PROCESS, virt_symlink, format_process_exename }, + { "cwd", FH_PROCESS, virt_symlink, format_process_cwd }, + { NULL, 0, virt_none, NULL } }; static const int PROCESS_LINK_COUNT = - (sizeof (process_listing) / sizeof (const char *)) - 1; + (sizeof (process_tab) / sizeof (virt_tab_t)) - 1; -static _off64_t format_process_maps (_pinfo *p, char *&destbuf, size_t maxsize); -static _off64_t format_process_stat (_pinfo *p, char *destbuf, size_t maxsize); -static _off64_t format_process_status (_pinfo *p, char *destbuf, size_t maxsize); -static _off64_t format_process_statm (_pinfo *p, char *destbuf, size_t maxsize); static int get_process_state (DWORD dwProcessId); static bool get_mem_values (DWORD dwProcessId, unsigned long *vmsize, unsigned long *vmrss, unsigned long *vmtext, @@ -106,28 +97,33 @@ fhandler_process::exists () if (*path == 0) return 2; - for (int i = 0; process_listing[i]; i++) - if (!strcmp (path + 1, process_listing[i])) - { - fileid = i; - return is_symlink (i) ? -2 : (i == PROCESS_FD) ? 1 : -1; - } - if (!strncmp (strchr (path, '/') + 1, "fd/", 3)) - { - fileid = PROCESS_FD; - if (fill_filebuf ()) - return -2; - /* Check for nameless device entries. */ - path = strrchr (path, '/'); - if (path && *++path) + for (int i = 0; process_tab[i].name; i++) + { + if (!strcmp (path + 1, process_tab[i].name)) { - if (!strncmp (path, "pipe:[", 6)) - return -3; - else if (!strncmp (path, "socket:[", 8)) - return -4; + fileid = i; + return process_tab[i].type; + } + if (process_tab[i].type == virt_directory + && !strncmp (path + 1, process_tab[i].name, + strlen (process_tab[i].name)) + && path[1 + strlen (process_tab[i].name)] == '/') + { + fileid = i; + if (fill_filebuf ()) + return virt_symlink; + /* Check for nameless device entries. */ + path = strrchr (path, '/'); + if (path && *++path) + { + if (!strncmp (path, "pipe:[", 6)) + return virt_pipe; + else if (!strncmp (path, "socket:[", 8)) + return virt_socket; + } } } - return 0; + return virt_none; } fhandler_process::fhandler_process (): @@ -154,11 +150,11 @@ fhandler_process::fstat (struct __stat64 *buf) switch (file_type) { - case 0: + case virt_none: set_errno (ENOENT); return -1; - case 1: - case 2: + case virt_directory: + case virt_rootdir: buf->st_ctime = buf->st_mtime = buf->st_birthtime = p->start_time; buf->st_ctim.tv_nsec = buf->st_mtim.tv_nsec = buf->st_birthtim.tv_nsec = 0; @@ -171,22 +167,22 @@ fhandler_process::fstat (struct __stat64 *buf) else buf->st_nlink = 3; return 0; - case -2: + case virt_symlink: buf->st_uid = p->uid; buf->st_gid = p->gid; buf->st_mode = S_IFLNK | S_IRWXU | S_IRWXG | S_IRWXO; return 0; - case -3: + case virt_pipe: buf->st_uid = p->uid; buf->st_gid = p->gid; buf->st_mode = S_IFIFO | S_IRUSR | S_IWUSR; return 0; - case -4: + case virt_socket: buf->st_uid = p->uid; buf->st_gid = p->gid; buf->st_mode = S_IFSOCK | S_IRUSR | S_IWUSR; return 0; - case -1: + case virt_file: default: buf->st_uid = p->uid; buf->st_gid = p->gid; @@ -199,7 +195,7 @@ DIR * fhandler_process::opendir (int fd) { DIR *dir = fhandler_virtual::opendir (fd); - if (dir && fileid == PROCESS_FD) + if (dir && process_tab[fileid].fhandler == FH_PROCESSFD) fill_filebuf (); return dir; } @@ -208,20 +204,20 @@ int fhandler_process::readdir (DIR *dir, dirent *de) { int res = ENMFILE; - if (fileid == PROCESS_FD) + if (process_tab[fileid].fhandler == FH_PROCESSFD) { if (dir->__d_position >= 2 + filesize / sizeof (int)) goto out; } else if (dir->__d_position >= PROCESS_LINK_COUNT) goto out; - if (fileid == PROCESS_FD && dir->__d_position > 1) + if (process_tab[fileid].fhandler == FH_PROCESSFD && dir->__d_position > 1) { int *p = (int *) filebuf; __small_sprintf (de->d_name, "%d", p[dir->__d_position++ - 2]); } else - strcpy (de->d_name, process_listing[dir->__d_position++]); + strcpy (de->d_name, process_tab[dir->__d_position++].name); dir->__flags |= dirent_saw_dot | dirent_saw_dot_dot; res = 0; out: @@ -268,10 +264,10 @@ fhandler_process::open (int flags, mode_t mode) } process_file_no = -1; - for (int i = 0; process_listing[i]; i++) + for (int i = 0; process_tab[i].name; i++) { - if (path_prefix_p (process_listing[i], path + 1, - strlen (process_listing[i]), false)) + if (path_prefix_p (process_tab[i].name, path + 1, + strlen (process_tab[i].name), false)) process_file_no = i; } if (process_file_no == -1) @@ -289,7 +285,7 @@ fhandler_process::open (int flags, mode_t mode) goto out; } } - if (process_file_no == PROCESS_FD) + if (process_tab[process_file_no].fhandler == FH_PROCESSFD) { flags |= O_DIROPEN; goto success; @@ -322,6 +318,11 @@ out: return res; } +struct process_fd_t { + const char *path; + _pinfo *p; +}; + bool fhandler_process::fill_filebuf () { @@ -338,173 +339,211 @@ fhandler_process::fill_filebuf () return false; } - switch (fileid) + if (process_tab[fileid].format_func) { - case PROCESS_FD: - { - size_t fs; - char *fdp = strrchr (path, '/'); - if (!fdp || *++fdp == 'f') /* The "fd" directory itself. */ - { - if (filebuf) - cfree (filebuf); - filebuf = p->fds (fs); - } - else - { - if (filebuf) - cfree (filebuf); - int fd = atoi (fdp); - if (fd < 0 || (fd == 0 && !isdigit (*fdp))) - { - set_errno (ENOENT); - return false; - } - filebuf = p->fd (fd, fs); - if (!filebuf || !*filebuf) - { - set_errno (ENOENT); - return false; - } - } - filesize = fs; - break; - } - case PROCESS_UID: - case PROCESS_GID: - case PROCESS_PGID: - case PROCESS_SID: - case PROCESS_CTTY: - case PROCESS_PPID: - { - filebuf = (char *) crealloc_abort (filebuf, bufalloc = 40); - int num; - switch (fileid) - { - case PROCESS_PPID: - num = p->ppid; - break; - case PROCESS_UID: - num = p->uid; - break; - case PROCESS_PGID: - num = p->pgid; - break; - case PROCESS_SID: - num = p->sid; - break; - case PROCESS_GID: - num = p->gid; - break; - case PROCESS_CTTY: - num = p->ctty; - break; - default: // what's this here for? - num = 0; - break; - } - __small_sprintf (filebuf, "%d\n", num); - filesize = strlen (filebuf); - break; - } - case PROCESS_ROOT: - case PROCESS_CWD: - case PROCESS_CMDLINE: - { - if (filebuf) - { - cfree (filebuf); - filebuf = NULL; - } - size_t fs; - switch (fileid) - { - case PROCESS_ROOT: - filebuf = p->root (fs); - break; - case PROCESS_CWD: - filebuf = p->cwd (fs); - break; - case PROCESS_CMDLINE: - filebuf = p->cmdline (fs); - break; - } - filesize = fs; - if (!filebuf || !*filebuf) - { - filebuf = cstrdup ("<defunct>"); - filesize = strlen (filebuf) + 1; - } - break; - } - case PROCESS_EXENAME: - case PROCESS_EXE: - { - filebuf = (char *) crealloc_abort (filebuf, bufalloc = NT_MAX_PATH); - if (p->process_state & PID_EXITED) - strcpy (filebuf, "<defunct>"); - else - { - mount_table->conv_to_posix_path (p->progname, filebuf, 1); - int len = strlen (filebuf); - if (len > 4) - { - char *s = filebuf + len - 4; - if (ascii_strcasematch (s, ".exe")) - *s = 0; - } - } - filesize = strlen (filebuf); - break; - } - case PROCESS_WINPID: - { - filebuf = (char *) crealloc_abort (filebuf, bufalloc = 40); - __small_sprintf (filebuf, "%d\n", p->dwProcessId); - filesize = strlen (filebuf); - break; - } - case PROCESS_WINEXENAME: - { - int len = strlen (p->progname); - filebuf = (char *) crealloc_abort (filebuf, bufalloc = (len + 2)); - strcpy (filebuf, p->progname); - filebuf[len] = '\n'; - filesize = len + 1; - break; - } - case PROCESS_STATUS: - { - filebuf = (char *) crealloc_abort (filebuf, bufalloc = 2048); - filesize = format_process_status (*p, filebuf, bufalloc); - break; - } - case PROCESS_STAT: - { - filebuf = (char *) crealloc_abort (filebuf, bufalloc = 2048); - filesize = format_process_stat (*p, filebuf, bufalloc); - break; - } - case PROCESS_STATM: - { - filebuf = (char *) crealloc_abort (filebuf, bufalloc = 2048); - filesize = format_process_statm (*p, filebuf, bufalloc); - break; - } - case PROCESS_MAPS: - { - filebuf = (char *) crealloc_abort (filebuf, bufalloc = 2048); - filesize = format_process_maps (*p, filebuf, bufalloc); - break; - } + if (process_tab[fileid].fhandler == FH_PROCESSFD) + { + process_fd_t fd = { path, p }; + filesize = process_tab[fileid].format_func (&fd, filebuf); + } + else + filesize = process_tab[fileid].format_func (p, filebuf); + return !filesize ? false : true; + } + return false; +} + +static _off64_t +format_process_fd (void *data, char *&destbuf) +{ + _pinfo *p = ((process_fd_t *) data)->p; + const char *path = ((process_fd_t *) data)->path; + size_t fs = 0; + char *fdp = strrchr (path, '/'); + + if (!fdp || *++fdp == 'f') /* The "fd" directory itself. */ + { + if (destbuf) + cfree (destbuf); + destbuf = p->fds (fs); + } + else + { + if (destbuf) + cfree (destbuf); + int fd = atoi (fdp); + if (fd < 0 || (fd == 0 && !isdigit (*fdp))) + { + set_errno (ENOENT); + return 0; + } + destbuf = p->fd (fd, fs); + if (!destbuf || !*destbuf) + { + set_errno (ENOENT); + return 0; + } + } + return fs; +} + +static _off64_t +format_process_ppid (void *data, char *&destbuf) +{ + _pinfo *p = (_pinfo *) data; + destbuf = (char *) crealloc_abort (destbuf, 40); + return __small_sprintf (destbuf, "%d\n", p->ppid); +} + +static _off64_t +format_process_uid (void *data, char *&destbuf) +{ + _pinfo *p = (_pinfo *) data; + destbuf = (char *) crealloc_abort (destbuf, 40); + return __small_sprintf (destbuf, "%d\n", p->uid); +} + +static _off64_t +format_process_pgid (void *data, char *&destbuf) +{ + _pinfo *p = (_pinfo *) data; + destbuf = (char *) crealloc_abort (destbuf, 40); + return __small_sprintf (destbuf, "%d\n", p->pgid); +} + +static _off64_t +format_process_sid (void *data, char *&destbuf) +{ + _pinfo *p = (_pinfo *) data; + destbuf = (char *) crealloc_abort (destbuf, 40); + return __small_sprintf (destbuf, "%d\n", p->sid); +} + +static _off64_t +format_process_gid (void *data, char *&destbuf) +{ + _pinfo *p = (_pinfo *) data; + destbuf = (char *) crealloc_abort (destbuf, 40); + return __small_sprintf (destbuf, "%d\n", p->gid); +} + +static _off64_t +format_process_ctty (void *data, char *&destbuf) +{ + _pinfo *p = (_pinfo *) data; + destbuf = (char *) crealloc_abort (destbuf, 40); + return __small_sprintf (destbuf, "%d\n", p->ctty); +} + +static _off64_t +format_process_root (void *data, char *&destbuf) +{ + _pinfo *p = (_pinfo *) data; + size_t fs; + + if (destbuf) + { + cfree (destbuf); + destbuf = NULL; + } + destbuf = p->root (fs); + if (!destbuf || !*destbuf) + { + destbuf = cstrdup ("<defunct>"); + fs = strlen (destbuf) + 1; } + return fs; +} - return true; +static _off64_t +format_process_cwd (void *data, char *&destbuf) +{ + _pinfo *p = (_pinfo *) data; + size_t fs; + + if (destbuf) + { + cfree (destbuf); + destbuf = NULL; + } + destbuf = p->cwd (fs); + if (!destbuf || !*destbuf) + { + destbuf = cstrdup ("<defunct>"); + fs = strlen (destbuf) + 1; + } + return fs; } static _off64_t -format_process_maps (_pinfo *p, char *&destbuf, size_t maxsize) +format_process_cmdline (void *data, char *&destbuf) { + _pinfo *p = (_pinfo *) data; + size_t fs; + + if (destbuf) + { + cfree (destbuf); + destbuf = NULL; + } + destbuf = p->cmdline (fs); + if (!destbuf || !*destbuf) + { + destbuf = cstrdup ("<defunct>"); + fs = strlen (destbuf) + 1; + } + return fs; +} + +static _off64_t +format_process_exename (void *data, char *&destbuf) +{ + _pinfo *p = (_pinfo *) data; + int len; + tmp_pathbuf tp; + + char *buf = tp.c_get (); + if (p->process_state & PID_EXITED) + stpcpy (buf, "<defunct>"); + else + { + mount_table->conv_to_posix_path (p->progname, buf, 1); + len = strlen (buf); + if (len > 4) + { + char *s = buf + len - 4; + if (ascii_strcasematch (s, ".exe")) + *s = 0; + } + } + destbuf = (char *) crealloc_abort (destbuf, (len = strlen (buf)) + 1); + stpcpy (destbuf, buf); + return len; +} + +static _off64_t +format_process_winpid (void *data, char *&destbuf) +{ + _pinfo *p = (_pinfo *) data; + destbuf = (char *) crealloc_abort (destbuf, 20); + return __small_sprintf (destbuf, "%d\n", p->dwProcessId); +} + +static _off64_t +format_process_winexename (void *data, char *&destbuf) +{ + _pinfo *p = (_pinfo *) data; + int len = strlen (p->progname); + destbuf = (char *) crealloc_abort (destbuf, len + 2); + strcpy (destbuf, p->progname); + destbuf[len] = '\n'; + return len + 1; +} + +static _off64_t +format_process_maps (void *data, char *&destbuf) +{ + _pinfo *p = (_pinfo *) data; HANDLE proc = OpenProcess (PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, p->dwProcessId); @@ -521,7 +560,13 @@ format_process_maps (_pinfo *p, char *&destbuf, size_t maxsize) tmp_pathbuf tp; PWCHAR modname = tp.w_get (); char *posix_modname = tp.c_get (); + size_t maxsize = 0; + if (destbuf) + { + cfree (destbuf); + destbuf = NULL; + } if (!EnumProcessModules (proc, NULL, 0, &needed)) { __seterrno (); @@ -558,8 +603,10 @@ format_process_maps (_pinfo *p, char *&destbuf, size_t maxsize) st.st_dev = 0; st.st_ino = 0; } - if (len + strlen (posix_modname) + 62 > maxsize - 1) - destbuf = (char *) crealloc_abort (destbuf, maxsize += 2048); + size_t newlen = strlen (posix_modname) + 62; + if (len + newlen >= maxsize) + destbuf = (char *) crealloc_abort (destbuf, + maxsize += roundup2 (newlen, 2048)); if (workingset) for (unsigned i = 1; i <= wset_size; ++i) { @@ -594,8 +641,9 @@ out: } static _off64_t -format_process_stat (_pinfo *p, char *destbuf, size_t maxsize) +format_process_stat (void *data, char *&destbuf) { + _pinfo *p = (_pinfo *) data; char cmd[NAME_MAX + 1]; int state = 'R'; unsigned long fault_count = 0UL, @@ -704,6 +752,7 @@ format_process_stat (_pinfo *p, char *destbuf, size_t maxsize) vmrss = vmc.WorkingSetSize / page_size; vmmaxrss = ql.MaximumWorkingSetSize / page_size; + destbuf = (char *) crealloc_abort (destbuf, strlen (cmd) + 320); return __small_sprintf (destbuf, "%d (%s) %c " "%d %d %d %d %d " "%lu %lu %lu %lu %lu %lu %lu " @@ -722,8 +771,9 @@ format_process_stat (_pinfo *p, char *destbuf, size_t maxsize) } static _off64_t -format_process_status (_pinfo *p, char *destbuf, size_t maxsize) +format_process_status (void *data, char *&destbuf) { + _pinfo *p = (_pinfo *) data; char cmd[NAME_MAX + 1]; int state = 'R'; const char *state_str = "unknown"; @@ -781,6 +831,7 @@ format_process_status (_pinfo *p, char *destbuf, size_t maxsize) // The real uid value for *this* process is stored at cygheap->user.real_uid // but we can't get at the real uid value for any other process, so // just fake it as p->uid. Similar for p->gid. + destbuf = (char *) crealloc_abort (destbuf, strlen (cmd) + 320); return __small_sprintf (destbuf, "Name:\t%s\n" "State:\t%c (%s)\n" "Tgid:\t%d\n" @@ -812,13 +863,15 @@ format_process_status (_pinfo *p, char *destbuf, size_t maxsize) } static _off64_t -format_process_statm (_pinfo *p, char *destbuf, size_t maxsize) +format_process_statm (void *data, char *&destbuf) { + _pinfo *p = (_pinfo *) data; unsigned long vmsize = 0UL, vmrss = 0UL, vmtext = 0UL, vmdata = 0UL, vmlib = 0UL, vmshare = 0UL; if (!get_mem_values (p->dwProcessId, &vmsize, &vmrss, &vmtext, &vmdata, &vmlib, &vmshare)) return 0; + destbuf = (char *) crealloc_abort (destbuf, 96); return __small_sprintf (destbuf, "%ld %ld %ld %ld %ld %ld %ld", vmsize, vmrss, vmshare, vmtext, vmlib, vmdata, 0); } diff --git a/winsup/cygwin/fhandler_procnet.cc b/winsup/cygwin/fhandler_procnet.cc index 692a6dc51..e151555d4 100644 --- a/winsup/cygwin/fhandler_procnet.cc +++ b/winsup/cygwin/fhandler_procnet.cc @@ -221,7 +221,7 @@ fhandler_procnet::fill_filebuf () { case PROCNET_IFINET6: { - bufalloc = filesize = format_procnet_ifinet6 (filebuf); + filesize = format_procnet_ifinet6 (filebuf); break; } } diff --git a/winsup/cygwin/fhandler_registry.cc b/winsup/cygwin/fhandler_registry.cc index c3c226474..fa9d4c7a5 100644 --- a/winsup/cygwin/fhandler_registry.cc +++ b/winsup/cygwin/fhandler_registry.cc @@ -803,6 +803,8 @@ fhandler_registry::fill_filebuf () DWORD type, size; LONG error; HKEY handle = (HKEY) get_handle (); + size_t bufalloc; + if (handle != HKEY_PERFORMANCE_DATA) { error = RegQueryValueEx (handle, value_name, NULL, &type, NULL, &size); diff --git a/winsup/cygwin/fhandler_virtual.cc b/winsup/cygwin/fhandler_virtual.cc index 141fe7bd0..b11d596e0 100644 --- a/winsup/cygwin/fhandler_virtual.cc +++ b/winsup/cygwin/fhandler_virtual.cc @@ -20,8 +20,7 @@ details. */ #include <dirent.h> fhandler_virtual::fhandler_virtual (): - fhandler_base (), filebuf (NULL), bufalloc ((size_t) -1), - fileid (-1) + fhandler_base (), filebuf (NULL), fileid (-1) { } @@ -159,7 +158,7 @@ fhandler_virtual::dup (fhandler_base * child) { fhandler_virtual *fhproc_child = (fhandler_virtual *) child; fhproc_child->filebuf = (char *) cmalloc_abort (HEAP_BUF, filesize); - fhproc_child->bufalloc = fhproc_child->filesize = filesize; + fhproc_child->filesize = filesize; fhproc_child->position = position; memcpy (fhproc_child->filebuf, filebuf, filesize); fhproc_child->set_flags (get_flags ()); @@ -177,7 +176,6 @@ fhandler_virtual::close () cfree (filebuf); filebuf = NULL; } - bufalloc = (size_t) -1; } return 0; } diff --git a/winsup/cygwin/fhandler_virtual.h b/winsup/cygwin/fhandler_virtual.h new file mode 100644 index 000000000..de914eacd --- /dev/null +++ b/winsup/cygwin/fhandler_virtual.h @@ -0,0 +1,27 @@ +/* fhandler_virtual.h: Header for virtual fhandlers + + Copyright 2009 Red Hat, Inc. + +This file is part of Cygwin. + +This software is a copyrighted work licensed under the terms of the +Cygwin license. Please consult the file "CYGWIN_LICENSE" for +details. */ + +enum virtual_ftype_t { + virt_socket = -4, + virt_pipe = -3, + virt_symlink = -2, + virt_file = -1, + virt_none = 0, + virt_directory = 1, + virt_rootdir = 2 +}; + +struct virt_tab_t { + const char *name; + __dev32_t fhandler; + virtual_ftype_t type; + _off64_t (*format_func)(void *data, char *&); +}; + |