On 12/14/20 5:30 AM, Rainer Orth wrote:
with the revised godump.c patch and this one for mk*sysinfo.sh, I still
get failures on all of Solaris 11.3/x86, 11.4/x86, and 11.4/SPARC
(didn't try 11.3/SPARC):
* Solaris 11.3/x86 and 11.4/x86:
runtime_sysinfo.go:5995:6: error: redefinition of '_upad128_t'
gen-sysinfo has
// type _upad128_t struct { _q INVALID-float-80; Godump_0_pad [4]byte; }
type _upad128_t struct {}
and mk*sysinfo.sh adds
type _upad128_t struct { _l [4]uint32; }
* Solaris 11.4/SPARC and x86:
runtime_sysinfo.go:1178:55: error: use of undefined type '_in6_addr_t'
runtime_sysinfo.go uses _in6_addr_t in _flow_arp_desc_s,
_flow_l3_desc_s, _mac_ipaddr_s, _mac_resource_props_s, and
_mactun_info_s, but there's no definition and you've removed the
section of mk*sysinfo.sh to replace it by [16]byte.
The issue is here, I believe:
+ -e 's/\([^a-zA-Z0-9_]\)_in6_addr\([^a-zA-Z0-9_]\)/\1[16]byte\2/g' \
+ -e 's/\([^a-zA-Z0-9_]\)_in6_addr$/\1[16]byte/g' \
Neither line matches _in6_addr_t. Removing '_' from the second char
set on the first line fixes this, but I'm unsure what exactly this is
going to match on different systems.
Rainer
Sigh. Thanks. Perhaps the attached will work.
(I'm still waiting on my own compilation to complete. Compilation on
gcc211 is glacial. I wonder if I'm doing something wrong.)
The idea is to just rewrite both _in_addr and _in_addr_t. Perhaps
someone smarter than me can figure out how to write a simpler set
of basic REs.
Also godump now emits a dummy `type _u?pad128_t struct {}` entry,
so we just suppress that and conditionally add it back.
If anyone has suggestions for making this less fragile, I'm all ears.
Nikhil
diff --git a/libgo/mkrsysinfo.sh b/libgo/mkrsysinfo.sh
index c28f0e5..7aebe3a 100755
--- a/libgo/mkrsysinfo.sh
+++ b/libgo/mkrsysinfo.sh
@@ -24,11 +24,20 @@ grep -v '^// ' gen-sysinfo.go | \
grep -v '^type _timespec ' | \
grep -v '^type _epoll_' | \
grep -v '^type _*locale[_ ]' | \
- grep -v 'in6_addr' | \
+ grep -v '^type _in6_addr' | \
grep -v 'sockaddr_in6' | \
+ grep -v '^type _upad128_t' | \
+ grep -v '^type _pad128_t' | \
sed -e 's/\([^a-zA-Z0-9_]\)_timeval\([^a-zA-Z0-9_]\)/\1timeval\2/g' \
+ -e 's/\([^a-zA-Z0-9_]\)_timeval$/\1timeval/g' \
-e 's/\([^a-zA-Z0-9_]\)_timespec_t\([^a-zA-Z0-9_]\)/\1timespec\2/g' \
+ -e 's/\([^a-zA-Z0-9_]\)_timespec_t$/\1timespec_t/g' \
-e 's/\([^a-zA-Z0-9_]\)_timespec\([^a-zA-Z0-9_]\)/\1timespec\2/g' \
+ -e 's/\([^a-zA-Z0-9_]\)_timespec$/\1timespec/g' \
+ -e 's/\([^a-zA-Z0-9_]\)_in6_addr\([^a-zA-Z0-9_]\)/\1[16]byte\2/g' \
+ -e 's/\([^a-zA-Z0-9_]\)_in6_addr$/\1[16]byte/g' \
+ -e 's/\([^a-zA-Z0-9_]\)_in6_addr_t\([^a-zA-Z0-9_]\)/\1[16]byte\2/g' \
+ -e 's/\([^a-zA-Z0-9_]\)_in6_addr_t$/\1[16]byte/g' \
>> ${OUT}
# The C long type, needed because that is the type that ptrace returns.
@@ -44,16 +53,6 @@ else
exit 1
fi
-# On AIX, the _arpcom struct, is filtered by the above grep sequence, as it as
-# a field of type _in6_addr, but other types depend on _arpcom, so we need to
-# put it back.
-grep '^type _arpcom ' gen-sysinfo.go | \
- sed -e 's/_in6_addr/[16]byte/' >> ${OUT}
-
-# Same on Solaris for _mld_hdr_t.
-grep '^type _mld_hdr_t ' gen-sysinfo.go | \
- sed -e 's/_in6_addr/[16]byte/' >> ${OUT}
-
# The time structures need special handling: we need to name the
# types, so that we can cast integers to the right types when
# assigning to the structures.
@@ -169,36 +168,15 @@ grep '^type _sem_t ' gen-sysinfo.go | \
# double is commented by -fdump-go-spec.
if grep "^// type _pad128_t" gen-sysinfo.go > /dev/null 2>&1; then
echo "type _pad128_t struct { _l [4]int32; }" >> ${OUT}
+else
+ grep "^type _pad128_t" gen-sysinfo.go >> ${OUT} || true
fi
if grep "^// type _upad128_t" gen-sysinfo.go > /dev/null 2>&1; then
echo "type _upad128_t struct { _l [4]uint32; }" >> ${OUT}
+else
+ grep "^type _upad128_t" gen-sysinfo.go >> ${OUT} || true
fi
-# The Solaris 11 Update 1 _zone_net_addr_t struct.
-grep '^type _zone_net_addr_t ' gen-sysinfo.go | \
- sed -e 's/_in6_addr/[16]byte/' \
- >> ${OUT}
-
-# The Solaris 11.4 _flow_arp_desc_t struct.
-grep '^type _flow_arp_desc_t ' gen-sysinfo.go | \
- sed -e 's/_in6_addr_t/[16]byte/g' \
- >> ${OUT}
-
-# The Solaris 11.4 _flow_l3_desc_t struct.
-grep '^type _flow_l3_desc_t ' gen-sysinfo.go | \
- sed -e 's/_in6_addr_t/[16]byte/g' \
- >> ${OUT}
-
-# The Solaris 11.3 _mac_ipaddr_t struct.
-grep '^type _mac_ipaddr_t ' gen-sysinfo.go | \
- sed -e 's/_in6_addr_t/[16]byte/g' \
- >> ${OUT}
-
-# The Solaris 11.3 _mactun_info_t struct.
-grep '^type _mactun_info_t ' gen-sysinfo.go | \
- sed -e 's/_in6_addr_t/[16]byte/g' \
- >> ${OUT}
-
# The Solaris port_event_t struct.
grep '^type _port_event_t ' gen-sysinfo.go | \
sed -e s'/_port_event_t/portevent/' \
diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
index b32a026..b2268ac 100755
--- a/libgo/mksysinfo.sh
+++ b/libgo/mksysinfo.sh
@@ -36,24 +36,24 @@ grep -v '^// ' gen-sysinfo.go | \
grep -v '^type _timestruc_t ' | \
grep -v '^type _epoll_' | \
grep -v '^type _*locale[_ ]' | \
- grep -v 'in6_addr' | \
+ grep -v '^type _in6_addr' | \
+ grep -v '^type _upad128_t' | \
+ grep -v '^type _pad128_t' | \
grep -v 'sockaddr_in6' | \
sed -e 's/\([^a-zA-Z0-9_]\)_timeval\([^a-zA-Z0-9_]\)/\1Timeval\2/g' \
+ -e 's/\([^a-zA-Z0-9_]\)_timeval$/\1Timeval/g' \
-e 's/\([^a-zA-Z0-9_]\)_timespec_t\([^a-zA-Z0-9_]\)/\1Timespec\2/g' \
+ -e 's/\([^a-zA-Z0-9_]\)_timespec_t$/\1Timespec/g' \
-e 's/\([^a-zA-Z0-9_]\)_timespec\([^a-zA-Z0-9_]\)/\1Timespec\2/g' \
+ -e 's/\([^a-zA-Z0-9_]\)_timespec$/\1Timespec/g' \
-e 's/\([^a-zA-Z0-9_]\)_timestruc_t\([^a-zA-Z0-9_]\)/\1Timestruc\2/g' \
+ -e 's/\([^a-zA-Z0-9_]\)_timestruc_t$/\1Timestruc/g' \
+ -e 's/\([^a-zA-Z0-9_]\)_in6_addr\([^a-zA-Z0-9_]\)/\1[16]byte\2/g' \
+ -e 's/\([^a-zA-Z0-9_]\)_in6_addr$/\1[16]byte/g' \
+ -e 's/\([^a-zA-Z0-9_]\)_in6_addr_t\([^a-zA-Z0-9_]\)/\1[16]byte\2/g' \
+ -e 's/\([^a-zA-Z0-9_]\)_in6_addr_t$/\1[16]byte/g' \
>> ${OUT}
-# On AIX, the _arpcom struct, is filtered by the above grep sequence, as it as
-# a field of type _in6_addr, but other types depend on _arpcom, so we need to
-# put it back.
-grep '^type _arpcom ' gen-sysinfo.go | \
- sed -e 's/_in6_addr/[16]byte/' >> ${OUT}
-
-# Same on Solaris for _mld_hdr_t.
-grep '^type _mld_hdr_t ' gen-sysinfo.go | \
- sed -e 's/_in6_addr/[16]byte/' >> ${OUT}
-
# The errno constants. These get type Errno.
egrep '#define E[A-Z0-9_]+ [0-9E]' errno.i | \
sed -e 's/^#define \(E[A-Z0-9_]*\) .*$/const \1 = Errno(_\1)/' >> ${OUT}
@@ -445,9 +445,13 @@ fi
# double is commented by -fdump-go-spec.
if grep "^// type _pad128_t" gen-sysinfo.go > /dev/null 2>&1; then
echo "type _pad128_t struct { _l [4]int32; }" >> ${OUT}
+else
+ grep "^type _pad128_t" gen-sysinfo.go >> ${OUT} || true
fi
if grep "^// type _upad128_t" gen-sysinfo.go > /dev/null 2>&1; then
echo "type _upad128_t struct { _l [4]uint32; }" >> ${OUT}
+else
+ grep "^type _upad128_t" gen-sysinfo.go >> ${OUT} || true
fi
# The time_t type.
@@ -483,7 +487,9 @@ echo $timespec | \
-e 's/tv_nsec *[a-zA-Z0-9_]*/Nsec Timespec_nsec_t/' >> ${OUT}
timestruc=`grep '^type _timestruc_t ' gen-sysinfo.go || true`
-if test "$timestruc" != ""; then
+if test "$timestruc" = "type _timestruc_t _timespec"; then
+ echo "type Timestruc Timespec" >> ${OUT}
+elif test "$timestruc" != ""; then
timestruc_sec=`echo $timestruc | sed -n -e 's/^.*tv_sec \([^ ]*\);.*$/\1/p'`
timestruc_nsec=`echo $timestruc | sed -n -e 's/^.*tv_nsec \([^
]*\);.*$/\1/p'`
echo "type Timestruc_sec_t = $timestruc_sec" >> ${OUT}
@@ -1523,31 +1529,6 @@ if ! grep 'const SizeofICMPv6Filter ' ${OUT} >/dev/null
2>&1; then
echo 'const SizeofICMPv6Filter = 32' >> ${OUT}
fi
-# The Solaris 11 Update 1 _zone_net_addr_t struct.
-grep '^type _zone_net_addr_t ' gen-sysinfo.go | \
- sed -e 's/_in6_addr/[16]byte/' \
- >> ${OUT}
-
-# The Solaris 11.4 _flow_arp_desc_t struct.
-grep '^type _flow_arp_desc_t ' gen-sysinfo.go | \
- sed -e 's/_in6_addr_t/[16]byte/g' \
- >> ${OUT}
-
-# The Solaris 11.4 _flow_l3_desc_t struct.
-grep '^type _flow_l3_desc_t ' gen-sysinfo.go | \
- sed -e 's/_in6_addr_t/[16]byte/g' \
- >> ${OUT}
-
-# The Solaris 11.3 _mac_ipaddr_t struct.
-grep '^type _mac_ipaddr_t ' gen-sysinfo.go | \
- sed -e 's/_in6_addr_t/[16]byte/g' \
- >> ${OUT}
-
-# The Solaris 11.3 _mactun_info_t struct.
-grep '^type _mactun_info_t ' gen-sysinfo.go | \
- sed -e 's/_in6_addr_t/[16]byte/g' \
- >> ${OUT}
-
# Type 'uint128' is needed in a couple of type definitions on arm64,such
# as _user_fpsimd_struct, _elf_fpregset_t, etc.
if ! grep '^type uint128' ${OUT} > /dev/null 2>&1; then
diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c
index a060ea8..8ce061e 100644
--- a/libgo/sysinfo.c
+++ b/libgo/sysinfo.c
@@ -11,6 +11,7 @@
#include <stddef.h>
#include <stdlib.h>
+#include <stdio.h>
#include <sys/types.h>
#include <dirent.h>
#include <errno.h>
