Changeset 633 in kBuild

Timestamp:

Nov 26, 2006 2:05:05 PM (18 years ago)

Author:

bird

Message:

More hacking.

Location:

trunk/src/ash/win

Files:

• mscfakes.h (modified) (6 diffs)
• strings.h (modified) (1 diff)
• sys/cdefs.h (modified) (1 diff)
• sys/resource.h (modified) (1 diff)

trunk/src/ash/win/mscfakes.h

@@ -28 +28 @@
 
 #define setmode setmode_msc
+#include <sys/cdefs.h>
 #include <io.h>
 #include <direct.h>
@@ -39 +40 @@
 #define __attribute__(a)
 #endif 
-
-typedef int pid_t;
 
 #define S_ISDIR(m)  (((m) & _S_IFMT) == _S_IFDIR)
@@ -86 +85 @@
 typedef int mode_t;
 typedef unsigned short nlink_t;
-typedef unsigned short uid_t;
-typedef unsigned short gid_t;
 typedef long ssize_t;
 typedef unsigned long u_long;
@@ -153 +150 @@
     unsigned long __bitmap[1]; 
 } sigset_t;
+typedef void __sighandler_t(int);
+typedef void __siginfohandler_t(int, struct __siginfo *, void *);
+typedef __sighandler_t *sig_t; /** BSD 4.4 type. */
+struct sigaction
+{
+    union
+    {
+        __siginfohandler_t *__sa_sigaction;
+        __sighandler_t     *__sa_handler;
+    }  __sigaction_u;
+    sigset_t    sa_mask;
+    int         sa_flags;
+};
+#define sa_handler      __sigaction_u.__sa_handler
+#define sa_sigaction    __sigaction_u.__sa_sigaction
+
 int     sigprocmask(int, const sigset_t *, sigset_t *);
 #define SIG_BLOCK           1
@@ -158 +171 @@
 #define SIG_SETMASK         3
 
-#define SIGTTIN 0
-#define SIGTSTP 0
-#define SIGTTOU 0
-#define SIGCONT 0
-#define SIGPIPE 0
-#define SIGQUIT 0
-#define SIGHUP 0
+#define SIGTTIN 29
+#define SIGTSTP 28
+#define SIGTTOU 27
+#define SIGCONT 26
+#define SIGPIPE 25
+#define SIGQUIT 24
+#define SIGHUP 23
 #ifndef NSIG
 #define NSIG 32
@@ -180 +193 @@
 //int   sigsuspend(const sigset_t *);
 //int   sigwait(const sigset_t *, int *);
+int     siginterrupt(int, int);
 
 #endif /* _MSC_VER */

trunk/src/ash/win/strings.h

@@ -2 +2 @@
 #define strcasecmp stricmp
 #define strncasecmp strnicmp
+#define index(str, ch) strchr((str), (ch))

trunk/src/ash/win/sys/cdefs.h

@@ -3 +3 @@
 
 #define __attribute__(a)
+typedef int pid_t;
+typedef unsigned short uid_t;
+typedef unsigned short gid_t;
 
 #endif

trunk/src/ash/win/sys/resource.h

@@ -1 @@
-/* */
+/*
+ * Copyright (c) 1982, 1986, 1993
+ *      The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *      @(#)resource.h  8.4 (Berkeley) 1/9/95
+ * $FreeBSD: src/sys/sys/resource.h,v 1.23 2004/06/13 22:07:58 das Exp $
+ */
+
+/** @file
+ * FreeBSD 5.3
+ * @changed bird: get/setpriority takes id_t not int according to SuS.
+ * @changed bird: include sys/types.h to get id_t.
+ */
+
+#ifndef _SYS_RESOURCE_H_
+#define _SYS_RESOURCE_H_
+
+#include <sys/cdefs.h>
+#include "mscfakes.h"
+
+
+/*
+ * Process priority specifications to get/setpriority.
+ */
+#define PRIO_MIN        -20
+#define PRIO_MAX        20
+
+#define PRIO_PROCESS    0
+#define PRIO_PGRP       1
+#define PRIO_USER       2
+
+/*
+ * Resource utilization information.
+ */
+
+#define RUSAGE_SELF     0
+#define RUSAGE_CHILDREN -1
+
+struct rusage {
+        struct timeval ru_utime;        /* user time used */
+        struct timeval ru_stime;        /* system time used */
+        long    ru_maxrss;              /* max resident set size */
+#define ru_first        ru_ixrss
+        long    ru_ixrss;               /* integral shared memory size */
+        long    ru_idrss;               /* integral unshared data " */
+        long    ru_isrss;               /* integral unshared stack " */
+        long    ru_minflt;              /* page reclaims */
+        long    ru_majflt;              /* page faults */
+        long    ru_nswap;               /* swaps */
+        long    ru_inblock;             /* block input operations */
+        long    ru_oublock;             /* block output operations */
+        long    ru_msgsnd;              /* messages sent */
+        long    ru_msgrcv;              /* messages received */
+        long    ru_nsignals;            /* signals received */
+        long    ru_nvcsw;               /* voluntary context switches */
+        long    ru_nivcsw;              /* involuntary " */
+#define ru_last         ru_nivcsw
+};
+
+/*
+ * Resource limits
+ */
+#define RLIMIT_CPU      0               /* cpu time in milliseconds */
+#define RLIMIT_FSIZE    1               /* maximum file size */
+#define RLIMIT_DATA     2               /* data size */
+#define RLIMIT_STACK    3               /* stack size */
+#define RLIMIT_CORE     4               /* core file size */
+#define RLIMIT_RSS      5               /* resident set size */
+#define RLIMIT_MEMLOCK  6               /* locked-in-memory address space */
+#define RLIMIT_NPROC    7               /* number of processes */
+#define RLIMIT_NOFILE   8               /* number of open files */
+#define RLIMIT_SBSIZE   9               /* maximum size of all socket buffers */
+#define RLIMIT_VMEM     10              /* virtual process size (inclusive of mmap) */
+#define RLIMIT_AS       RLIMIT_VMEM     /* standard name for RLIMIT_VMEM */
+#define RLIMIT_OBJREST  11              /* bird: size left in the top heap object. kLIBC specific. */
+
+#define RLIM_NLIMITS    12              /* number of resource limits */ /* bird: was 11 */
+
+#define RLIM_INFINITY   (((rlim_t)1 << 63) - 1)
+/* XXX Missing: RLIM_SAVED_MAX, RLIM_SAVED_CUR */
+
+
+/*
+ * Resource limit string identifiers
+ */
+
+#ifdef _RLIMIT_IDENT
+static char *rlimit_ident[] = {
+        "cpu",
+        "fsize",
+        "data",
+        "stack",
+        "core",
+        "rss",
+        "memlock",
+        "nproc",
+        "nofile",
+        "sbsize",
+        "vmem",
+};
+#endif
+
+typedef __int64 rlim_t;
+
+struct rlimit {
+        rlim_t  rlim_cur;               /* current (soft) limit */
+        rlim_t  rlim_max;               /* maximum value for rlim_cur */
+};
+
+
+/* XXX 2nd arg to [gs]etpriority() should be an id_t */
+//int   getpriority(int, /*int*/ id_t);         /* bird: SuS uses id_t */
+//int   getrlimit(int, struct rlimit *);
+int     getrusage(int, struct rusage *);
+//int   setpriority(int, /*int*/ id_t, int);    /* bird: SuS uses id_t */
+int     setrlimit(int, const struct rlimit *);
+
+#endif  /* !_SYS_RESOURCE_H_ */
+