* Makefile.in (DLL_IMPORTS): Add libntdll.a.

* autoload.cc: Remove all symbols from advapi32.dll, kernel32.dll and ntdll.dll available on all platforms since NT4. Throughout remove all usage of wincap.is_winnt. * dcrt0.cc (dll_crt0_0): Remove call to mmap_init. * fhandler.h (class fhandler_base): Remove has_changed flag. (fhandler_disk_file::touch_ctime): Remove declaration. (fhandler_disk_file::readdir_9x): Ditto. (fhandler_disk_file::touch_ctime): Remove. (fhandler_disk_file::readdir_9x): Remove. (fhandler_disk_file::closedir): Call NtClose instead of CloseHandle. * mmap.cc: Throughout call CreateMapping and MapView directly. (VirtualProt9x): Remove. (VirtualProtNT): Remove. (VirtualProtEx9x): Remove. (VirtualProtExNT): Remove. (VirtualProtect): Remove define. (VirtualProtectEx): Remove define. (CreateMapping9x): Remove. (CreateMappingNT): Rename to CreateMapping. (MapView9x): Remove. (MapViewNT): Rename to MapView. (struct mmap_func_t): Remove definition. (mmap_funcs_9x): Remove. (mmap_funcs_nt): Remove. (mmap_func): Remove. (mmap_init): Remove. * net.cc (getdomainname): Drop comment. Use NT4 registry key only. (get_95_ifconf): Remove. * pinfo.cc (winpids::enumNT): Rename to winpids::enum_processes. (winpids::enum9x): Remove. (winpids::set): Just call enum_processes directly. (winpids::enum_init): Ditto. * pinfo.h (class winpids): Drop enum_processes pointer. Rename enumNT to enum_processes. Drop enum9x declaration. Drop initialization of enum_processes throughout. * registry.cc (get_registry_hive_path): Just create NT key. (load_registry_hive): Only load NT specific file. * syscalls.cc (unlink_9x): Remove. (unlink): Just call unlink_nt. * wincap.cc: Remove is_winnt flag throughout. * wincap.h: Ditto. * winsup.h: Remove mmap_init declaration.
2007-02-22 10:54:47 +00:00
parent 8782b2a2af
commit 570858c30f
24 changed files with 485 additions and 1252 deletions
--- a/winsup/cygwin/fhandler_process.cc
+++ b/winsup/cygwin/fhandler_process.cc
@@ -1,6 +1,6 @@
 /* fhandler_process.cc: fhandler for /proc/<pid> virtual filesystem

-   Copyright 2002, 2003, 2004, 2005, 2006 Red Hat, Inc.
+   Copyright 2002, 2003, 2004, 2005, 2006, 2007 Red Hat, Inc.

 This file is part of Cygwin.

@@ -515,9 +515,6 @@ fhandler_process::fill_filebuf ()
 static _off64_t
 format_process_maps (_pinfo *p, char *&destbuf, size_t maxsize)
 {
-  if (!wincap.is_winnt ())
-    return 0;
-
  HANDLE proc = OpenProcess (PROCESS_QUERY_INFORMATION | PROCESS_VM_READ,
 			     FALSE,
 			     p->dwProcessId);
@@ -637,86 +634,84 @@ format_process_stat (_pinfo *p, char *destbuf, size_t maxsize)
    state = 'Z';
  else if (p->process_state & PID_STOPPED)
    state = 'T';
-  else if (wincap.is_winnt ())
+  else
    state = get_process_state (p->dwProcessId);
  start_time = (GetTickCount () / 1000 - time (NULL) + p->start_time) * HZ;
-  if (wincap.is_winnt ())
+
+  NTSTATUS ret;
+  HANDLE hProcess;
+  VM_COUNTERS vmc;
+  KERNEL_USER_TIMES put;
+  PROCESS_BASIC_INFORMATION pbi;
+  QUOTA_LIMITS ql;
+  SYSTEM_TIME_OF_DAY_INFORMATION stodi;
+  SYSTEM_PROCESSOR_TIMES spt;
+  hProcess = OpenProcess (PROCESS_VM_READ | PROCESS_QUERY_INFORMATION,
+			  FALSE, p->dwProcessId);
+  if (hProcess != NULL)
    {
-      NTSTATUS ret;
-      HANDLE hProcess;
-      VM_COUNTERS vmc;
-      KERNEL_USER_TIMES put;
-      PROCESS_BASIC_INFORMATION pbi;
-      QUOTA_LIMITS ql;
-      SYSTEM_TIME_OF_DAY_INFORMATION stodi;
-      SYSTEM_PROCESSOR_TIMES spt;
-      hProcess = OpenProcess (PROCESS_VM_READ | PROCESS_QUERY_INFORMATION,
-			      FALSE, p->dwProcessId);
-      if (hProcess != NULL)
-	{
-	  ret = NtQueryInformationProcess (hProcess,
-					   ProcessVmCounters,
-					   (PVOID) &vmc,
-					   sizeof vmc, NULL);
-	  if (ret == STATUS_SUCCESS)
-	    ret = NtQueryInformationProcess (hProcess,
-					     ProcessTimes,
-					     (PVOID) &put,
-					     sizeof put, NULL);
-	  if (ret == STATUS_SUCCESS)
-	    ret = NtQueryInformationProcess (hProcess,
-					     ProcessBasicInformation,
-					     (PVOID) &pbi,
-					     sizeof pbi, NULL);
-	  if (ret == STATUS_SUCCESS)
-	    ret = NtQueryInformationProcess (hProcess,
-					     ProcessQuotaLimits,
-					     (PVOID) &ql,
-					     sizeof ql, NULL);
-	  CloseHandle (hProcess);
-	}
-      else
-	{
-	  DWORD error = GetLastError ();
-	  __seterrno_from_win_error (error);
-	  debug_printf ("OpenProcess: ret %d", error);
-	  return 0;
-	}
+      ret = NtQueryInformationProcess (hProcess,
+				       ProcessVmCounters,
+				       (PVOID) &vmc,
+				       sizeof vmc, NULL);
      if (ret == STATUS_SUCCESS)
-	ret = NtQuerySystemInformation (SystemTimeOfDayInformation,
-					(PVOID) &stodi,
-					sizeof stodi, NULL);
+	ret = NtQueryInformationProcess (hProcess,
+					 ProcessTimes,
+					 (PVOID) &put,
+					 sizeof put, NULL);
      if (ret == STATUS_SUCCESS)
-	ret = NtQuerySystemInformation (SystemProcessorTimes,
-					(PVOID) &spt,
-					sizeof spt, NULL);
-      if (ret != STATUS_SUCCESS)
-	{
-	  __seterrno_from_nt_status (ret);
-	  debug_printf ("NtQueryInformationProcess: ret %d, Dos(ret) %E", ret);
-	  return 0;
-	}
-      fault_count = vmc.PageFaultCount;
-      utime = put.UserTime.QuadPart * HZ / 10000000ULL;
-      stime = put.KernelTime.QuadPart * HZ / 10000000ULL;
-#if 0
-       if (stodi.CurrentTime.QuadPart > put.CreateTime.QuadPart)
-	 start_time = (spt.KernelTime.QuadPart + spt.UserTime.QuadPart -
-		       stodi.CurrentTime.QuadPart + put.CreateTime.QuadPart) * HZ / 10000000ULL;
-       else
-	 /*
-	  * sometimes stodi.CurrentTime is a bit behind
-	  * Note: some older versions of procps are broken and can't cope
-	  * with process start times > time(NULL).
-	  */
-	 start_time = (spt.KernelTme.QuadPart + spt.UserTime.QuadPart) * HZ / 10000000ULL;
-#endif
-      priority = pbi.BasePriority;
-      unsigned page_size = getsystempagesize ();
-      vmsize = vmc.PagefileUsage;
-      vmrss = vmc.WorkingSetSize / page_size;
-      vmmaxrss = ql.MaximumWorkingSetSize / page_size;
+	ret = NtQueryInformationProcess (hProcess,
+					 ProcessBasicInformation,
+					 (PVOID) &pbi,
+					 sizeof pbi, NULL);
+      if (ret == STATUS_SUCCESS)
+	ret = NtQueryInformationProcess (hProcess,
+					 ProcessQuotaLimits,
+					 (PVOID) &ql,
+					 sizeof ql, NULL);
+      CloseHandle (hProcess);
    }
+  else
+    {
+      DWORD error = GetLastError ();
+      __seterrno_from_win_error (error);
+      debug_printf ("OpenProcess: ret %d", error);
+      return 0;
+    }
+  if (ret == STATUS_SUCCESS)
+    ret = NtQuerySystemInformation (SystemTimeOfDayInformation,
+				    (PVOID) &stodi,
+				    sizeof stodi, NULL);
+  if (ret == STATUS_SUCCESS)
+    ret = NtQuerySystemInformation (SystemProcessorTimes,
+				    (PVOID) &spt,
+				    sizeof spt, NULL);
+  if (ret != STATUS_SUCCESS)
+    {
+      __seterrno_from_nt_status (ret);
+      debug_printf ("NtQueryInformationProcess: ret %d, Dos(ret) %E", ret);
+      return 0;
+    }
+  fault_count = vmc.PageFaultCount;
+  utime = put.UserTime.QuadPart * HZ / 10000000ULL;
+  stime = put.KernelTime.QuadPart * HZ / 10000000ULL;
+#if 0
+   if (stodi.CurrentTime.QuadPart > put.CreateTime.QuadPart)
+     start_time = (spt.KernelTime.QuadPart + spt.UserTime.QuadPart -
+		   stodi.CurrentTime.QuadPart + put.CreateTime.QuadPart) * HZ / 10000000ULL;
+   else
+     /*
+      * sometimes stodi.CurrentTime is a bit behind
+      * Note: some older versions of procps are broken and can't cope
+      * with process start times > time(NULL).
+      */
+     start_time = (spt.KernelTme.QuadPart + spt.UserTime.QuadPart) * HZ / 10000000ULL;
+#endif
+  priority = pbi.BasePriority;
+  unsigned page_size = getsystempagesize ();
+  vmsize = vmc.PagefileUsage;
+  vmrss = vmc.WorkingSetSize / page_size;
+  vmmaxrss = ql.MaximumWorkingSetSize / page_size;

  return __small_sprintf (destbuf, "%d (%s) %c "
 				   "%d %d %d %d %d "
@@ -767,7 +762,7 @@ format_process_status (_pinfo *p, char *destbuf, size_t maxsize)
    state = 'Z';
  else if (p->process_state & PID_STOPPED)
    state = 'T';
-  else if (wincap.is_winnt ())
+  else
    state = get_process_state (p->dwProcessId);
  switch (state)
    {
@@ -788,14 +783,12 @@ format_process_status (_pinfo *p, char *destbuf, size_t maxsize)
      state_str = "stopped";
      break;
    }
-  if (wincap.is_winnt ())
-    {
-      if (!get_mem_values (p->dwProcessId, &vmsize, &vmrss, &vmtext, &vmdata, &vmlib, &vmshare))
-	return 0;
-      unsigned page_size = getsystempagesize ();
-      vmsize *= page_size; vmrss *= page_size; vmdata *= page_size;
-      vmtext *= page_size; vmlib *= page_size;
-    }
+  if (!get_mem_values (p->dwProcessId, &vmsize, &vmrss, &vmtext, &vmdata,
+		       &vmlib, &vmshare))
+    return 0;
+  unsigned page_size = getsystempagesize ();
+  vmsize *= page_size; vmrss *= page_size; vmdata *= page_size;
+  vmtext *= page_size; vmlib *= page_size;
  // 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.
@@ -823,7 +816,8 @@ format_process_status (_pinfo *p, char *destbuf, size_t maxsize)
 			  p->ppid,
 			  p->uid, p->uid, p->uid, p->uid,
 			  p->gid, p->gid, p->gid, p->gid,
-			  vmsize >> 10, 0, vmrss >> 10, vmdata >> 10, 0, vmtext >> 10, vmlib >> 10,
+			  vmsize >> 10, 0, vmrss >> 10, vmdata >> 10, 0,
+			  vmtext >> 10, vmlib >> 10,
 			  0, 0, p->getsigmask ()
 			  );
 }
@@ -833,15 +827,11 @@ format_process_statm (_pinfo *p, char *destbuf, size_t maxsize)
 {
  unsigned long vmsize = 0UL, vmrss = 0UL, vmtext = 0UL, vmdata = 0UL,
 		vmlib = 0UL, vmshare = 0UL;
-  if (wincap.is_winnt ())
-    {
-      if (!get_mem_values (p->dwProcessId, &vmsize, &vmrss, &vmtext, &vmdata,
-			   &vmlib, &vmshare))
-	return 0;
-    }
+  if (!get_mem_values (p->dwProcessId, &vmsize, &vmrss, &vmtext, &vmdata,
+		       &vmlib, &vmshare))
+    return 0;
  return __small_sprintf (destbuf, "%ld %ld %ld %ld %ld %ld %ld",
-			  vmsize, vmrss, vmshare, vmtext, vmlib, vmdata, 0
-			  );
+			  vmsize, vmrss, vmshare, vmtext, vmlib, vmdata, 0);
 }

 static int