diff options
Diffstat (limited to 'src/backend/port/sparc_solaris')
| -rw-r--r-- | src/backend/port/sparc_solaris/port-protos.h | 28 | ||||
| -rw-r--r-- | src/backend/port/sparc_solaris/port.c | 81 | ||||
| -rw-r--r-- | src/backend/port/sparc_solaris/rusagestub.h | 25 |
3 files changed, 70 insertions, 64 deletions
diff --git a/src/backend/port/sparc_solaris/port-protos.h b/src/backend/port/sparc_solaris/port-protos.h index c2cbf5803b5..95239173462 100644 --- a/src/backend/port/sparc_solaris/port-protos.h +++ b/src/backend/port/sparc_solaris/port-protos.h @@ -1,52 +1,52 @@ /*------------------------------------------------------------------------- * * port-protos.h-- - * port-specific prototypes for SunOS 4 + * port-specific prototypes for SunOS 4 * * * Copyright (c) 1994, Regents of the University of California * - * $Id: port-protos.h,v 1.4 1997/04/15 18:18:33 scrappy Exp $ + * $Id: port-protos.h,v 1.5 1997/09/07 04:46:50 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef PORT_PROTOS_H #define PORT_PROTOS_H -#include <netinet/in.h> /* For struct in_addr */ +#include <netinet/in.h> /* For struct in_addr */ #include <arpa/inet.h> #include <dlfcn.h> -#include "fmgr.h" /* for func_ptr */ +#include "fmgr.h" /* for func_ptr */ #include "utils/dynamic_loader.h" /* dynloader.c */ /* * Dynamic Loader on SunOS 4. * - * this dynamic loader uses the system dynamic loading interface for shared + * this dynamic loader uses the system dynamic loading interface for shared * libraries (ie. dlopen/dlsym/dlclose). The user must specify a shared * library as the file to be dynamically loaded. * */ #define pg_dlopen(f) dlopen(f,1) -#define pg_dlsym dlsym -#define pg_dlclose dlclose -#define pg_dlerror dlerror +#define pg_dlsym dlsym +#define pg_dlclose dlclose +#define pg_dlerror dlerror /* port.c */ -extern long random(void); -extern void srandom(int seed); +extern long random(void); +extern void srandom(int seed); /* inet_aton.c in backend/port directory */ -extern int inet_aton(const char *cp, struct in_addr *addr); +extern int inet_aton(const char *cp, struct in_addr * addr); /* In system library, but can't find prototype in system library .h files */ -extern int gethostname(char *name, int namelen); +extern int gethostname(char *name, int namelen); /* In system library, but can't find prototype in system library .h files */ #include <sys/resource.h> -extern int getrusage(int who, struct rusage *rusage); +extern int getrusage(int who, struct rusage * rusage); -#endif /* PORT_PROTOS_H */ +#endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/sparc_solaris/port.c b/src/backend/port/sparc_solaris/port.c index 8710ec95451..7f19a1ae237 100644 --- a/src/backend/port/sparc_solaris/port.c +++ b/src/backend/port/sparc_solaris/port.c @@ -1,17 +1,17 @@ /*------------------------------------------------------------------------- * * port.c-- - * SunOS5-specific routines + * SunOS5-specific routines * * Copyright (c) 1994, Regents of the University of California * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/sparc_solaris/Attic/port.c,v 1.4 1997/04/15 18:18:45 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/sparc_solaris/Attic/port.c,v 1.5 1997/09/07 04:46:53 momjian Exp $ * *------------------------------------------------------------------------- */ -#include <math.h> /* for pow() prototype */ +#include <math.h> /* for pow() prototype */ #include <stdlib.h> #include <errno.h> @@ -20,55 +20,60 @@ #include "port-protos.h" #ifndef HAVE_GETRUSAGE #include "rusagestub.h" -#endif /* HAVE_GETRUSAGE */ +#endif /* HAVE_GETRUSAGE */ long random() { - return(lrand48()); + return (lrand48()); } void srandom(int seed) { - srand48((long int) seed); + srand48((long int) seed); } #ifndef HAVE_GETRUSAGE int -getrusage(int who, struct rusage *rusage) +getrusage(int who, struct rusage * rusage) { - struct tms tms; - register int tick_rate = CLK_TCK; /* ticks per second */ - clock_t u, s; + struct tms tms; + register int tick_rate = CLK_TCK; /* ticks per second */ + clock_t u, + s; - if (rusage == (struct rusage *) NULL) { - errno = EFAULT; - return(-1); - } - if (times(&tms) < 0) { - /* errno set by times */ - return(-1); - } - switch (who) { - case RUSAGE_SELF: - u = tms.tms_utime; - s = tms.tms_stime; - break; - case RUSAGE_CHILDREN: - u = tms.tms_cutime; - s = tms.tms_cstime; - break; - default: - errno = EINVAL; - return(-1); - } + if (rusage == (struct rusage *) NULL) + { + errno = EFAULT; + return (-1); + } + if (times(&tms) < 0) + { + /* errno set by times */ + return (-1); + } + switch (who) + { + case RUSAGE_SELF: + u = tms.tms_utime; + s = tms.tms_stime; + break; + case RUSAGE_CHILDREN: + u = tms.tms_cutime; + s = tms.tms_cstime; + break; + default: + errno = EINVAL; + return (-1); + } #define TICK_TO_SEC(T, RATE) ((T)/(RATE)) -#define TICK_TO_USEC(T,RATE) (((T)%(RATE)*1000000)/RATE) - rusage->ru_utime.tv_sec = TICK_TO_SEC(u, tick_rate); - rusage->ru_utime.tv_usec = TICK_TO_USEC(u, tick_rate); - rusage->ru_stime.tv_sec = TICK_TO_SEC(s, tick_rate); - rusage->ru_stime.tv_usec = TICK_TO_USEC(u, tick_rate); - return(0); +#define TICK_TO_USEC(T,RATE) (((T)%(RATE)*1000000)/RATE) + rusage->ru_utime.tv_sec = TICK_TO_SEC(u, tick_rate); + rusage->ru_utime.tv_usec = TICK_TO_USEC(u, tick_rate); + rusage->ru_stime.tv_sec = TICK_TO_SEC(s, tick_rate); + rusage->ru_stime.tv_usec = TICK_TO_USEC(u, tick_rate); + return (0); } -#endif /* HAVE_GETRUSAGE */ + +#endif /* HAVE_GETRUSAGE */ diff --git a/src/backend/port/sparc_solaris/rusagestub.h b/src/backend/port/sparc_solaris/rusagestub.h index 5e413bd0d9a..87957a45eac 100644 --- a/src/backend/port/sparc_solaris/rusagestub.h +++ b/src/backend/port/sparc_solaris/rusagestub.h @@ -1,30 +1,31 @@ /*------------------------------------------------------------------------- * * rusagestub.h-- - * Stubs for getrusage(3). + * Stubs for getrusage(3). * * * Copyright (c) 1994, Regents of the University of California * - * $Id: rusagestub.h,v 1.1.1.1 1996/07/09 06:21:45 scrappy Exp $ + * $Id: rusagestub.h,v 1.2 1997/09/07 04:46:56 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef RUSAGESTUB_H #define RUSAGESTUB_H -#include <sys/time.h> /* for struct timeval */ -#include <sys/times.h> /* for struct tms */ -#include <limits.h> /* for CLK_TCK */ +#include <sys/time.h> /* for struct timeval */ +#include <sys/times.h> /* for struct tms */ +#include <limits.h> /* for CLK_TCK */ -#define RUSAGE_SELF 0 -#define RUSAGE_CHILDREN -1 +#define RUSAGE_SELF 0 +#define RUSAGE_CHILDREN -1 -struct rusage { - struct timeval ru_utime; /* user time used */ - struct timeval ru_stime; /* system time used */ +struct rusage +{ + struct timeval ru_utime; /* user time used */ + struct timeval ru_stime; /* system time used */ }; -extern int getrusage(int who, struct rusage *rusage); +extern int getrusage(int who, struct rusage * rusage); -#endif /* RUSAGESTUB_H */ +#endif /* RUSAGESTUB_H */ |