diff options
author | cvs2svn <> | 2013-04-23 13:44:37 +0400 |
---|---|---|
committer | cvs2svn <> | 2013-04-23 13:44:37 +0400 |
commit | 2770974985ede1d980e75edece05422b9d0e4ffd (patch) | |
tree | 0ee5b1fda0f77a3a245dab9968b9e34cc0440e7d /winsup/cygwin/fhandler_process.cc | |
parent | c82eac05c783fa1cb82eac9216dab1ed8aa482ae (diff) |
This commit was manufactured by cvs2svn to create tag 'cygwin-64bit-cygwin-64bit-postmerge
postmerge'.
Sprout from cygwin-64bit-premerge-branch 2013-04-22 17:11:23 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch 'cygwin-64bit-'
Cherrypick from master 2013-04-23 09:44:36 UTC Corinna Vinschen <corinna@vinschen.de> ' * Merge in cygwin-64bit-branch.':
newlib/ChangeLog
newlib/libc/ctype/ctype_.c
newlib/libc/include/machine/setjmp.h
newlib/libc/include/reent.h
newlib/libc/include/sys/features.h
newlib/libc/include/sys/stat.h
winsup/cygserver/ChangeLog
winsup/cygserver/ChangeLog.64bit
winsup/cygserver/Makefile.in
winsup/cygserver/bsd_helper.cc
winsup/cygserver/bsd_helper.h
winsup/cygserver/bsd_log.cc
winsup/cygserver/bsd_log.h
winsup/cygserver/bsd_mutex.cc
winsup/cygserver/client.cc
winsup/cygserver/cygserver.cc
winsup/cygserver/msg.cc
winsup/cygserver/process.h
winsup/cygserver/sem.cc
winsup/cygserver/shm.cc
winsup/cygserver/sysv_shm.cc
winsup/cygserver/threaded_queue.h
winsup/cygwin/ChangeLog
winsup/cygwin/ChangeLog.64bit
winsup/cygwin/Makefile.in
winsup/cygwin/aclocal.m4
winsup/cygwin/advapi32.cc
winsup/cygwin/autoload.cc
winsup/cygwin/automode.c
winsup/cygwin/binmode.c
winsup/cygwin/child_info.h
winsup/cygwin/configure
winsup/cygwin/configure.ac
winsup/cygwin/cpuid.h
winsup/cygwin/cygerrno.h
winsup/cygwin/cygheap.cc
winsup/cygwin/cygheap.h
winsup/cygwin/cygmagic
winsup/cygwin/cygmalloc.h
winsup/cygwin/cygserver.h
winsup/cygwin/cygserver_ipc.h
winsup/cygwin/cygthread.cc
winsup/cygwin/cygtls.cc
winsup/cygwin/cygtls.h
winsup/cygwin/cygwin.din
winsup/cygwin/cygwin.sc.in
winsup/cygwin/cygwin64.din
winsup/cygwin/dcrt0.cc
winsup/cygwin/debug.h
winsup/cygwin/devices.cc
winsup/cygwin/devices.h
winsup/cygwin/devices.in
winsup/cygwin/dir.cc
winsup/cygwin/dlfcn.cc
winsup/cygwin/dll_init.cc
winsup/cygwin/dll_init.h
winsup/cygwin/dtable.cc
winsup/cygwin/environ.cc
winsup/cygwin/environ.h
winsup/cygwin/errno.cc
winsup/cygwin/exception.h
winsup/cygwin/exceptions.cc
winsup/cygwin/external.cc
winsup/cygwin/fcntl.cc
winsup/cygwin/fenv.cc
winsup/cygwin/fhandler.cc
winsup/cygwin/fhandler.h
winsup/cygwin/fhandler_clipboard.cc
winsup/cygwin/fhandler_console.cc
winsup/cygwin/fhandler_dev.cc
winsup/cygwin/fhandler_disk_file.cc
winsup/cygwin/fhandler_dsp.cc
winsup/cygwin/fhandler_fifo.cc
winsup/cygwin/fhandler_floppy.cc
winsup/cygwin/fhandler_mailslot.cc
winsup/cygwin/fhandler_mem.cc
winsup/cygwin/fhandler_netdrive.cc
winsup/cygwin/fhandler_proc.cc
winsup/cygwin/fhandler_process.cc
winsup/cygwin/fhandler_procnet.cc
winsup/cygwin/fhandler_procsys.cc
winsup/cygwin/fhandler_procsysvipc.cc
winsup/cygwin/fhandler_random.cc
winsup/cygwin/fhandler_raw.cc
winsup/cygwin/fhandler_registry.cc
winsup/cygwin/fhandler_serial.cc
winsup/cygwin/fhandler_socket.cc
winsup/cygwin/fhandler_tape.cc
winsup/cygwin/fhandler_termios.cc
winsup/cygwin/fhandler_tty.cc
winsup/cygwin/fhandler_virtual.cc
winsup/cygwin/fhandler_virtual.h
winsup/cygwin/fhandler_zero.cc
winsup/cygwin/flock.cc
winsup/cygwin/fork.cc
winsup/cygwin/gendef
winsup/cygwin/gentls_offsets
winsup/cygwin/glob.cc
winsup/cygwin/globals.cc
winsup/cygwin/grp.cc
winsup/cygwin/heap.cc
winsup/cygwin/hookapi.cc
winsup/cygwin/include/a.out.h
winsup/cygwin/include/asm/byteorder.h
winsup/cygwin/include/bits/wordsize.h
winsup/cygwin/include/cygwin/acl.h
winsup/cygwin/include/cygwin/config.h
winsup/cygwin/include/cygwin/cygwin_dll.h
winsup/cygwin/include/cygwin/grp.h
winsup/cygwin/include/cygwin/ipc.h
winsup/cygwin/include/cygwin/msg.h
winsup/cygwin/include/cygwin/sem.h
winsup/cygwin/include/cygwin/shm.h
winsup/cygwin/include/cygwin/signal.h
winsup/cygwin/include/cygwin/socket.h
winsup/cygwin/include/cygwin/stat.h
winsup/cygwin/include/cygwin/sysproto.h
winsup/cygwin/include/cygwin/time.h
winsup/cygwin/include/cygwin/types.h
winsup/cygwin/include/cygwin/version.h
winsup/cygwin/include/fts.h
winsup/cygwin/include/ftw.h
winsup/cygwin/include/glob.h
winsup/cygwin/include/inttypes.h
winsup/cygwin/include/io.h
winsup/cygwin/include/limits.h
winsup/cygwin/include/mntent.h
winsup/cygwin/include/stdint.h
winsup/cygwin/include/sys/cygwin.h
winsup/cygwin/include/sys/dirent.h
winsup/cygwin/include/sys/resource.h
winsup/cygwin/include/sys/strace.h
winsup/cygwin/init.cc
winsup/cygwin/ioctl.cc
winsup/cygwin/ipc.cc
winsup/cygwin/kernel32.cc
winsup/cygwin/lc_msg.h
winsup/cygwin/lib/_cygwin_crt0_common.cc
winsup/cygwin/lib/crt0.h
winsup/cygwin/lib/cygwin_attach_dll.c
winsup/cygwin/lib/premain0.c
winsup/cygwin/lib/premain1.c
winsup/cygwin/lib/premain2.c
winsup/cygwin/lib/premain3.c
winsup/cygwin/libc/bsdlib.cc
winsup/cygwin/libc/fts.c
winsup/cygwin/libc/ftw.c
winsup/cygwin/libc/inet_network.c
winsup/cygwin/libc/minires-os-if.c
winsup/cygwin/libc/minires.c
winsup/cygwin/libc/nftw.c
winsup/cygwin/libc/rcmd.cc
winsup/cygwin/libc/rexec.cc
winsup/cygwin/libstdcxx_wrapper.cc
winsup/cygwin/localtime.cc
winsup/cygwin/malloc_wrapper.cc
winsup/cygwin/miscfuncs.cc
winsup/cygwin/mkimport
winsup/cygwin/mktemp.cc
winsup/cygwin/mmap.cc
winsup/cygwin/mount.cc
winsup/cygwin/msg.cc
winsup/cygwin/mtinfo.h
winsup/cygwin/net.cc
winsup/cygwin/netdb.cc
winsup/cygwin/nfs.h
winsup/cygwin/nlsfuncs.cc
winsup/cygwin/ntdll.h
winsup/cygwin/passwd.cc
winsup/cygwin/path.cc
winsup/cygwin/path.h
winsup/cygwin/perprocess.h
winsup/cygwin/pinfo.cc
winsup/cygwin/pinfo.h
winsup/cygwin/pipe.cc
winsup/cygwin/poll.cc
winsup/cygwin/posix_ipc.cc
winsup/cygwin/profil.c
winsup/cygwin/profil.h
winsup/cygwin/pseudo-reloc.cc
winsup/cygwin/pwdgrp.h
winsup/cygwin/regex/engine.c
winsup/cygwin/regex/regcomp.c
winsup/cygwin/registry.cc
winsup/cygwin/regparm.h
winsup/cygwin/resource.cc
winsup/cygwin/sched.cc
winsup/cygwin/sec_acl.cc
winsup/cygwin/sec_auth.cc
winsup/cygwin/sec_helper.cc
winsup/cygwin/security.cc
winsup/cygwin/security.h
winsup/cygwin/select.cc
winsup/cygwin/select.h
winsup/cygwin/sem.cc
winsup/cygwin/shared.cc
winsup/cygwin/shm.cc
winsup/cygwin/signal.cc
winsup/cygwin/sigproc.cc
winsup/cygwin/sigproc.h
winsup/cygwin/smallprint.cc
winsup/cygwin/spawn.cc
winsup/cygwin/speclib
winsup/cygwin/strace.cc
winsup/cygwin/strsig.cc
winsup/cygwin/sync.cc
winsup/cygwin/sync.h
winsup/cygwin/syscalls.cc
winsup/cygwin/sysconf.cc
winsup/cygwin/syslog.cc
winsup/cygwin/termios.cc
winsup/cygwin/textmode.c
winsup/cygwin/textreadmode.c
winsup/cygwin/thread.cc
winsup/cygwin/thread.h
winsup/cygwin/timer.cc
winsup/cygwin/times.cc
winsup/cygwin/tlsoffsets.h
winsup/cygwin/tlsoffsets64.h
winsup/cygwin/tty.cc
winsup/cygwin/tty.h
winsup/cygwin/uinfo.cc
winsup/cygwin/wait.cc
winsup/cygwin/winbase.h
winsup/cygwin/wincap.cc
winsup/cygwin/wincap.h
winsup/cygwin/winlean.h
winsup/cygwin/winsup.h
winsup/cygwin/wow64.cc
winsup/cygwin/wow64.h
winsup/doc/ChangeLog
winsup/doc/faq-what.xml
winsup/lsaauth/ChangeLog
winsup/lsaauth/ChangeLog.64bit
winsup/lsaauth/Makefile.in
winsup/lsaauth/configure
winsup/lsaauth/configure.ac
winsup/utils/ChangeLog
winsup/utils/ChangeLog.64bit
winsup/utils/aclocal.m4
winsup/utils/configure
winsup/utils/cygcheck.cc
winsup/utils/dumper.cc
winsup/utils/dumper.h
winsup/utils/kill.cc
winsup/utils/ldd.cc
winsup/utils/locale.cc
winsup/utils/mkgroup.c
winsup/utils/mkpasswd.c
winsup/utils/module_info.cc
winsup/utils/mount.cc
winsup/utils/parse_pe.cc
winsup/utils/passwd.c
winsup/utils/path.cc
winsup/utils/ps.cc
winsup/utils/regtool.cc
winsup/utils/ssp.c
winsup/utils/strace.cc
winsup/utils/tzset.c
Delete:
COPYING3
COPYING3.LIB
config.rpath
configure.ac
ltgcc.m4
newlib/libc/machine/aarch64/Makefile.am
newlib/libc/machine/aarch64/Makefile.in
newlib/libc/machine/aarch64/aclocal.m4
newlib/libc/machine/aarch64/configure
newlib/libc/machine/aarch64/configure.in
newlib/libc/machine/aarch64/memcmp-stub.c
newlib/libc/machine/aarch64/memcmp.S
newlib/libc/machine/aarch64/memcpy-stub.c
newlib/libc/machine/aarch64/memcpy.S
newlib/libc/machine/aarch64/memmove-stub.c
newlib/libc/machine/aarch64/memmove.S
newlib/libc/machine/aarch64/memset-stub.c
newlib/libc/machine/aarch64/memset.S
newlib/libc/machine/aarch64/setjmp.S
newlib/libc/machine/aarch64/strcmp-stub.c
newlib/libc/machine/aarch64/strcmp.S
newlib/libc/machine/aarch64/strlen-stub.c
newlib/libc/machine/aarch64/strlen.S
newlib/libc/machine/aarch64/strncmp-stub.c
newlib/libc/machine/aarch64/strncmp.S
newlib/libc/machine/aarch64/strnlen-stub.c
newlib/libc/machine/aarch64/strnlen.S
newlib/libc/machine/epiphany/Makefile.am
newlib/libc/machine/epiphany/Makefile.in
newlib/libc/machine/epiphany/aclocal.m4
newlib/libc/machine/epiphany/configure
newlib/libc/machine/epiphany/configure.in
newlib/libc/machine/epiphany/machine/stdlib.h
newlib/libc/machine/epiphany/setjmp.S
newlib/libc/sys/epiphany/Makefile.am
newlib/libc/sys/epiphany/Makefile.in
newlib/libc/sys/epiphany/aclocal.m4
newlib/libc/sys/epiphany/configure
newlib/libc/sys/epiphany/configure.in
newlib/libc/sys/epiphany/e_printf.c
newlib/libm/machine/aarch64/Makefile.am
newlib/libm/machine/aarch64/Makefile.in
newlib/libm/machine/aarch64/aclocal.m4
newlib/libm/machine/aarch64/configure
newlib/libm/machine/aarch64/configure.in
newlib/libm/machine/aarch64/s_ceil.c
newlib/libm/machine/aarch64/s_floor.c
newlib/libm/machine/aarch64/s_fma.c
newlib/libm/machine/aarch64/s_fmax.c
newlib/libm/machine/aarch64/s_fmin.c
newlib/libm/machine/aarch64/s_llrint.c
newlib/libm/machine/aarch64/s_llround.c
newlib/libm/machine/aarch64/s_lrint.c
newlib/libm/machine/aarch64/s_lround.c
newlib/libm/machine/aarch64/s_nearbyint.c
newlib/libm/machine/aarch64/s_rint.c
newlib/libm/machine/aarch64/s_round.c
newlib/libm/machine/aarch64/s_trunc.c
newlib/libm/machine/aarch64/sf_ceil.c
newlib/libm/machine/aarch64/sf_floor.c
newlib/libm/machine/aarch64/sf_fma.c
newlib/libm/machine/aarch64/sf_fmax.c
newlib/libm/machine/aarch64/sf_fmin.c
newlib/libm/machine/aarch64/sf_llrint.c
newlib/libm/machine/aarch64/sf_llround.c
newlib/libm/machine/aarch64/sf_lrint.c
newlib/libm/machine/aarch64/sf_lround.c
newlib/libm/machine/aarch64/sf_nearbyint.c
newlib/libm/machine/aarch64/sf_rint.c
newlib/libm/machine/aarch64/sf_round.c
newlib/libm/machine/aarch64/sf_trunc.c
winsup/cygwin/cygwin.sc
Diffstat (limited to 'winsup/cygwin/fhandler_process.cc')
-rw-r--r-- | winsup/cygwin/fhandler_process.cc | 195 |
1 files changed, 102 insertions, 93 deletions
diff --git a/winsup/cygwin/fhandler_process.cc b/winsup/cygwin/fhandler_process.cc index 9faeb7d98..044757d74 100644 --- a/winsup/cygwin/fhandler_process.cc +++ b/winsup/cygwin/fhandler_process.cc @@ -34,25 +34,25 @@ details. */ #define _COMPILING_NEWLIB #include <dirent.h> -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 _off64_t format_process_mounts (void *, char *&); -static _off64_t format_process_mountinfo (void *, char *&); +static off_t format_process_maps (void *, char *&); +static off_t format_process_stat (void *, char *&); +static off_t format_process_status (void *, char *&); +static off_t format_process_statm (void *, char *&); +static off_t format_process_winexename (void *, char *&); +static off_t format_process_winpid (void *, char *&); +static off_t format_process_exename (void *, char *&); +static off_t format_process_root (void *, char *&); +static off_t format_process_cwd (void *, char *&); +static off_t format_process_cmdline (void *, char *&); +static off_t format_process_ppid (void *, char *&); +static off_t format_process_uid (void *, char *&); +static off_t format_process_pgid (void *, char *&); +static off_t format_process_sid (void *, char *&); +static off_t format_process_gid (void *, char *&); +static off_t format_process_ctty (void *, char *&); +static off_t format_process_fd (void *, char *&); +static off_t format_process_mounts (void *, char *&); +static off_t format_process_mountinfo (void *, char *&); static const virt_tab_t process_tab[] = { @@ -137,7 +137,7 @@ fhandler_process::fhandler_process (): } int __reg2 -fhandler_process::fstat (struct __stat64 *buf) +fhandler_process::fstat (struct stat *buf) { const char *path = get_name (); int file_type = exists (); @@ -222,7 +222,7 @@ fhandler_process::readdir (DIR *dir, dirent *de) int res = ENMFILE; if (process_tab[fileid].fhandler == FH_PROCESSFD) { - if (dir->__d_position >= 2 + filesize / sizeof (int)) + if ((size_t) dir->__d_position >= 2 + filesize / sizeof (int)) goto out; } else if (dir->__d_position >= PROCESS_LINK_COUNT) @@ -314,7 +314,7 @@ success: set_flags ((flags & ~O_TEXT) | O_BINARY); set_open_status (); out: - syscall_printf ("%d = fhandler_proc::open(%p, %d)", res, flags, mode); + syscall_printf ("%d = fhandler_proc::open(%y, 0%o)", res, flags, mode); return res; } @@ -356,7 +356,7 @@ fhandler_process::fill_filebuf () return false; } -static _off64_t +static off_t format_process_fd (void *data, char *&destbuf) { _pinfo *p = ((process_fd_t *) data)->p; @@ -390,7 +390,7 @@ format_process_fd (void *data, char *&destbuf) return fs; } -static _off64_t +static off_t format_process_ppid (void *data, char *&destbuf) { _pinfo *p = (_pinfo *) data; @@ -398,7 +398,7 @@ format_process_ppid (void *data, char *&destbuf) return __small_sprintf (destbuf, "%d\n", p->ppid); } -static _off64_t +static off_t format_process_uid (void *data, char *&destbuf) { _pinfo *p = (_pinfo *) data; @@ -406,7 +406,7 @@ format_process_uid (void *data, char *&destbuf) return __small_sprintf (destbuf, "%d\n", p->uid); } -static _off64_t +static off_t format_process_pgid (void *data, char *&destbuf) { _pinfo *p = (_pinfo *) data; @@ -414,7 +414,7 @@ format_process_pgid (void *data, char *&destbuf) return __small_sprintf (destbuf, "%d\n", p->pgid); } -static _off64_t +static off_t format_process_sid (void *data, char *&destbuf) { _pinfo *p = (_pinfo *) data; @@ -422,7 +422,7 @@ format_process_sid (void *data, char *&destbuf) return __small_sprintf (destbuf, "%d\n", p->sid); } -static _off64_t +static off_t format_process_gid (void *data, char *&destbuf) { _pinfo *p = (_pinfo *) data; @@ -430,7 +430,7 @@ format_process_gid (void *data, char *&destbuf) return __small_sprintf (destbuf, "%d\n", p->gid); } -static _off64_t +static off_t format_process_ctty (void *data, char *&destbuf) { device d; @@ -440,7 +440,7 @@ format_process_ctty (void *data, char *&destbuf) return __small_sprintf (destbuf, "%s\n", d.name); } -static _off64_t +static off_t format_process_root (void *data, char *&destbuf) { _pinfo *p = (_pinfo *) data; @@ -460,7 +460,7 @@ format_process_root (void *data, char *&destbuf) return fs; } -static _off64_t +static off_t format_process_cwd (void *data, char *&destbuf) { _pinfo *p = (_pinfo *) data; @@ -480,7 +480,7 @@ format_process_cwd (void *data, char *&destbuf) return fs; } -static _off64_t +static off_t format_process_cmdline (void *data, char *&destbuf) { _pinfo *p = (_pinfo *) data; @@ -500,7 +500,7 @@ format_process_cmdline (void *data, char *&destbuf) return fs; } -static _off64_t +static off_t format_process_exename (void *data, char *&destbuf) { _pinfo *p = (_pinfo *) data; @@ -526,7 +526,7 @@ format_process_exename (void *data, char *&destbuf) return len; } -static _off64_t +static off_t format_process_winpid (void *data, char *&destbuf) { _pinfo *p = (_pinfo *) data; @@ -534,7 +534,7 @@ format_process_winpid (void *data, char *&destbuf) return __small_sprintf (destbuf, "%d\n", p->dwProcessId); } -static _off64_t +static off_t format_process_winexename (void *data, char *&destbuf) { _pinfo *p = (_pinfo *) data; @@ -647,15 +647,15 @@ struct thread_info { NTSTATUS status; PVOID buf = NULL; - size_t size = 50 * (sizeof (SYSTEM_PROCESSES) - + 16 * sizeof (SYSTEM_THREADS)); - PSYSTEM_PROCESSES proc; + ULONG size = 50 * (sizeof (SYSTEM_PROCESS_INFORMATION) + + 16 * sizeof (SYSTEM_THREADS)); + PSYSTEM_PROCESS_INFORMATION proc; PSYSTEM_THREADS thread; do { buf = realloc (buf, size); - status = NtQuerySystemInformation (SystemProcessesAndThreadsInformation, + status = NtQuerySystemInformation (SystemProcessInformation, buf, size, NULL); size <<= 1; } @@ -664,30 +664,30 @@ struct thread_info { if (buf) free (buf); - debug_printf ("NtQuerySystemInformation, %p", status); + debug_printf ("NtQuerySystemInformation, %y", status); return; } - proc = (PSYSTEM_PROCESSES) buf; + proc = (PSYSTEM_PROCESS_INFORMATION) buf; while (true) { - if (proc->ProcessId == pid) + if ((DWORD) (uintptr_t) proc->UniqueProcessId == pid) break; - if (!proc->NextEntryDelta) + if (!proc->NextEntryOffset) { free (buf); return; } - proc = (PSYSTEM_PROCESSES) ((PBYTE) proc + proc->NextEntryDelta); + proc = (PSYSTEM_PROCESS_INFORMATION) ((PBYTE) proc + proc->NextEntryOffset); } thread = proc->Threads; - for (ULONG i = 0; i < proc->ThreadCount; ++i) + for (ULONG i = 0; i < proc->NumberOfThreads; ++i) { THREAD_BASIC_INFORMATION tbi; TEB teb; HANDLE thread_h; if (!(thread_h = OpenThread (THREAD_QUERY_INFORMATION, FALSE, - (ULONG) thread[i].ClientId.UniqueThread))) + (ULONG) (ULONG_PTR) thread[i].ClientId.UniqueThread))) continue; status = NtQueryInformationThread (thread_h, ThreadBasicInformation, &tbi, sizeof tbi, NULL); @@ -697,7 +697,7 @@ struct thread_info region *r = (region *) malloc (sizeof (region)); if (r) { - *r = (region) { regions, (ULONG) thread[i].ClientId.UniqueThread, + *r = (region) { regions, (ULONG) (ULONG_PTR) thread[i].ClientId.UniqueThread, (char *) tbi.TebBaseAddress, (char *) tbi.TebBaseAddress + wincap.page_size (), true }; @@ -709,7 +709,7 @@ struct thread_info r = (region *) malloc (sizeof (region)); if (r) { - *r = (region) { regions, (ULONG) thread[i].ClientId.UniqueThread, + *r = (region) { regions, (ULONG) (ULONG_PTR) thread[i].ClientId.UniqueThread, (char *) (teb.DeallocationStack ?: teb.Tib.StackLimit), (char *) teb.Tib.StackBase, @@ -751,7 +751,7 @@ struct thread_info } }; -static _off64_t +static off_t format_process_maps (void *data, char *&destbuf) { _pinfo *p = (_pinfo *) data; @@ -780,12 +780,12 @@ format_process_maps (void *data, char *&destbuf) ReadProcessMemory (proc, &cygheap->user_heap, &user_heap, sizeof user_heap, NULL); - _off64_t len = 0; + off_t len = 0; union access { char flags[8]; - _off64_t word; + off_t word; } a; struct region { @@ -799,7 +799,7 @@ format_process_maps (void *data, char *&destbuf) dos_drive_mappings drive_maps; heap_info heaps (p->dwProcessId); thread_info threads (p->dwProcessId, proc); - struct __stat64 st; + struct stat st; long last_pass = 0; tmp_pathbuf tp; @@ -815,7 +815,12 @@ format_process_maps (void *data, char *&destbuf) /* Iterate over each VM region in the address space, coalescing memory regions with the same permissions. Once we run out, do one - last_pass to trigger output of the last accumulated region. */ + last_pass to trigger output of the last accumulated region. + + FIXME: 32 bit processes can't get address information beyond the + 32 bit address space from 64 bit processes. We have to run + this functionality in the target process, if the target + process is 64 bit and our own process is 32 bit. */ for (char *i = 0; VirtualQueryEx (proc, i, &mb, sizeof(mb)) || (1 == ++last_pass); i = cur.rend) @@ -867,9 +872,9 @@ format_process_maps (void *data, char *&destbuf) { size_t newlen = strlen (posix_modname) + 62; if (len + newlen >= maxsize) - destbuf = (char *) crealloc_abort (destbuf, - maxsize += roundup2 (newlen, - 2048)); + destbuf = (char *) + crealloc_abort (destbuf, + maxsize += roundup2 (newlen, 2048UL)); int written = __small_sprintf (destbuf + len, "%08lx-%08lx %s %08lx %04x:%04x %U ", cur.rbase, cur.rend, cur.a.flags, @@ -889,7 +894,7 @@ format_process_maps (void *data, char *&destbuf) { /* If the return length pointer is missing, NtQueryVirtualMemory returns with STATUS_ACCESS_VIOLATION on Windows 2000. */ - ULONG ret_len = 0; + SIZE_T ret_len = 0; st.st_dev = 0; st.st_ino = 0; @@ -932,7 +937,7 @@ format_process_maps (void *data, char *&destbuf) return len; } -static _off64_t +static off_t format_process_stat (void *data, char *&destbuf) { _pinfo *p = (_pinfo *) data; @@ -975,8 +980,8 @@ format_process_stat (void *data, char *&destbuf) KERNEL_USER_TIMES put; PROCESS_BASIC_INFORMATION pbi; QUOTA_LIMITS ql; - SYSTEM_TIME_OF_DAY_INFORMATION stodi; - SYSTEM_PROCESSOR_TIMES spt; + SYSTEM_TIMEOFDAY_INFORMATION stodi; + SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION spt; hProcess = OpenProcess (PROCESS_VM_READ | PROCESS_QUERY_INFORMATION, FALSE, p->dwProcessId); if (hProcess != NULL) @@ -998,19 +1003,19 @@ format_process_stat (void *data, char *&destbuf) { DWORD error = GetLastError (); __seterrno_from_win_error (error); - debug_printf ("OpenProcess: ret %d", error); + debug_printf ("OpenProcess: ret %u", error); return 0; } if (NT_SUCCESS (status)) status = NtQuerySystemInformation (SystemTimeOfDayInformation, (PVOID) &stodi, sizeof stodi, NULL); if (NT_SUCCESS (status)) - status = NtQuerySystemInformation (SystemProcessorTimes, (PVOID) &spt, - sizeof spt, NULL); + status = NtQuerySystemInformation (SystemProcessorPerformanceInformation, + (PVOID) &spt, sizeof spt, NULL); if (!NT_SUCCESS (status)) { __seterrno_from_nt_status (status); - debug_printf ("NtQueryInformationProcess: status %p, %E", status); + debug_printf ("NtQueryInformationProcess: status %y, %E", status); return 0; } fault_count = vmc.PageFaultCount; @@ -1028,7 +1033,13 @@ format_process_stat (void *data, char *&destbuf) */ start_time = (spt.KernelTme.QuadPart + spt.UserTime.QuadPart) * HZ / 10000000ULL; #endif - priority = pbi.BasePriority; + /* The BasePriority returned to a 32 bit process under WOW64 is + apparently broken, for 32 and 64 bit target processes. 64 bit + processes get the correct base priority, even for 32 bit processes. */ + if (wincap.is_wow64 ()) + priority = 8; /* Default value. */ + else + priority = pbi.BasePriority; unsigned page_size = wincap.page_size (); vmsize = vmc.PagefileUsage; vmrss = vmc.WorkingSetSize / page_size; @@ -1037,22 +1048,20 @@ format_process_stat (void *data, char *&destbuf) 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 " - "%ld %ld %ld %ld %ld %ld " + "%u %lu %lu %u %u %lu %lu " + "%ld %ld %d %d %d %d " "%lu %lu " - "%ld " - "%lu", - p->pid, cmd, - state, - p->ppid, p->pgid, p->sid, p->ctty, - -1, 0, fault_count, fault_count, 0, 0, utime, stime, + "%ld %lu", + p->pid, cmd, state, + p->ppid, p->pgid, p->sid, p->ctty, -1, + 0, fault_count, fault_count, 0, 0, utime, stime, utime, stime, priority, 0, 0, 0, start_time, vmsize, vmrss, vmmaxrss ); } -static _off64_t +static off_t format_process_status (void *data, char *&destbuf) { _pinfo *p = (_pinfo *) data; @@ -1139,7 +1148,7 @@ format_process_status (void *data, char *&destbuf) ); } -static _off64_t +static off_t format_process_statm (void *data, char *&destbuf) { _pinfo *p = (_pinfo *) data; @@ -1158,13 +1167,13 @@ extern "C" { struct mntent *getmntent (FILE *); }; -static _off64_t +static off_t format_process_mountstuff (void *data, char *&destbuf, bool mountinfo) { _pinfo *p = (_pinfo *) data; user_info *u_shared = NULL; HANDLE u_hdl = NULL; - _off64_t len = 0; + off_t len = 0; struct mntent *mnt; if (p->uid != myself->uid) @@ -1203,7 +1212,7 @@ format_process_mountstuff (void *data, char *&destbuf, bool mountinfo) each cygdrive entry if it's a remote drive. If so, ignore it. */ if (iteration >= mtab->nmounts && u_hdl) { - WCHAR drive[3] = { mnt->mnt_fsname[0], L':', L'\0' }; + WCHAR drive[3] = { (WCHAR) mnt->mnt_fsname[0], L':', L'\0' }; disk_type dt = get_disk_type (drive); if (dt == DT_SHARE_SMB || dt == DT_SHARE_NFS) @@ -1246,13 +1255,13 @@ format_process_mountstuff (void *data, char *&destbuf, bool mountinfo) return len; } -static _off64_t +static off_t format_process_mounts (void *data, char *&destbuf) { return format_process_mountstuff (data, destbuf, false); } -static _off64_t +static off_t format_process_mountinfo (void *data, char *&destbuf) { return format_process_mountstuff (data, destbuf, true); @@ -1264,28 +1273,28 @@ get_process_state (DWORD dwProcessId) /* This isn't really heavy magic - just go through the processes' threads one by one and return a value accordingly. Errors are silently ignored. */ NTSTATUS status; - PSYSTEM_PROCESSES p, sp; + PSYSTEM_PROCESS_INFORMATION p, sp; ULONG n = 0x4000; int state =' '; - p = (PSYSTEM_PROCESSES) malloc (n); + p = (PSYSTEM_PROCESS_INFORMATION) malloc (n); if (!p) return state; while (true) { - status = NtQuerySystemInformation (SystemProcessesAndThreadsInformation, + status = NtQuerySystemInformation (SystemProcessInformation, (PVOID) p, n, NULL); if (status != STATUS_INFO_LENGTH_MISMATCH) break; n <<= 1; - PSYSTEM_PROCESSES new_p = (PSYSTEM_PROCESSES) realloc (p, n); + PSYSTEM_PROCESS_INFORMATION new_p = (PSYSTEM_PROCESS_INFORMATION) realloc (p, n); if (!new_p) goto out; p = new_p; } if (!NT_SUCCESS (status)) { - debug_printf ("NtQuerySystemInformation: status %p, %lu", + debug_printf ("NtQuerySystemInformation: status %y, %u", status, RtlNtStatusToDosError (status)); goto out; } @@ -1293,12 +1302,12 @@ get_process_state (DWORD dwProcessId) sp = p; for (;;) { - if (sp->ProcessId == dwProcessId) + if ((DWORD) (uintptr_t) sp->UniqueProcessId == dwProcessId) { SYSTEM_THREADS *st; st = &sp->Threads[0]; state = 'S'; - for (unsigned i = 0; i < sp->ThreadCount; i++) + for (unsigned i = 0; i < sp->NumberOfThreads; i++) { /* FIXME: at some point we should consider generating 'O' */ if (st->State == StateRunning || @@ -1311,9 +1320,9 @@ get_process_state (DWORD dwProcessId) } break; } - if (!sp->NextEntryDelta) + if (!sp->NextEntryOffset) break; - sp = (PSYSTEM_PROCESSES) ((char *) sp + sp->NextEntryDelta); + sp = (PSYSTEM_PROCESS_INFORMATION) ((char *) sp + sp->NextEntryOffset); } out: free (p); @@ -1330,7 +1339,7 @@ get_mem_values (DWORD dwProcessId, unsigned long *vmsize, unsigned long *vmrss, HANDLE hProcess; VM_COUNTERS vmc; PMEMORY_WORKING_SET_LIST p; - ULONG n = 0x4000, length; + SIZE_T n = 0x4000, length; p = (PMEMORY_WORKING_SET_LIST) malloc (n); if (!p) @@ -1346,7 +1355,7 @@ get_mem_values (DWORD dwProcessId, unsigned long *vmsize, unsigned long *vmrss, { status = NtQueryVirtualMemory (hProcess, 0, MemoryWorkingSetList, (PVOID) p, n, - (length = ULONG_MAX, &length)); + (length = (SIZE_T) -1, &length)); if (status != STATUS_INFO_LENGTH_MISMATCH) break; n <<= 1; @@ -1358,7 +1367,7 @@ get_mem_values (DWORD dwProcessId, unsigned long *vmsize, unsigned long *vmrss, } if (!NT_SUCCESS (status)) { - debug_printf ("NtQueryVirtualMemory: status %p", status); + debug_printf ("NtQueryVirtualMemory: status %y", status); if (status == STATUS_PROCESS_IS_TERMINATING) { *vmsize = *vmrss = *vmtext = *vmdata = *vmlib = *vmshare = 0; @@ -1386,7 +1395,7 @@ get_mem_values (DWORD dwProcessId, unsigned long *vmsize, unsigned long *vmrss, sizeof vmc, NULL); if (!NT_SUCCESS (status)) { - debug_printf ("NtQueryInformationProcess: status %p", status); + debug_printf ("NtQueryInformationProcess: status %y", status); __seterrno_from_nt_status (status); goto out; } |