Date: Tue, 28 Apr 2020 11:52:53 -0700 From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r360445 - head/cddl/contrib/opensolaris/tools/ctf/cvt Message-ID: <a43ed9ed-6f8b-ff9a-a578-e3c76329514f@FreeBSD.org> In-Reply-To: <202004281609.03SG9S3n013323@repo.freebsd.org> References: <202004281609.03SG9S3n013323@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --OMaE395LHfPqSyIQOD11KOTheku1TM6Oo Content-Type: multipart/mixed; boundary="niQeSCGkoXtvW3djFDeK7EIa8mM8RHYlP"; protected-headers="v1" From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <a43ed9ed-6f8b-ff9a-a578-e3c76329514f@FreeBSD.org> Subject: Re: svn commit: r360445 - head/cddl/contrib/opensolaris/tools/ctf/cvt References: <202004281609.03SG9S3n013323@repo.freebsd.org> In-Reply-To: <202004281609.03SG9S3n013323@repo.freebsd.org> --niQeSCGkoXtvW3djFDeK7EIa8mM8RHYlP Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable I did not mean to commit this yet. Likely broke non-x86. Reverting now. On 4/28/2020 9:09 AM, Bryan Drewery wrote: > Author: bdrewery > Date: Tue Apr 28 16:09:28 2020 > New Revision: 360445 > URL: https://svnweb.freebsd.org/changeset/base/360445 >=20 > Log: > ctfmerge: Assert that there is enough room for types. > =20 > Sponsord by: Dell EMC > Differential Revision: https://reviews.freebsd.org/D24537 >=20 > Modified: > head/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c > head/cddl/contrib/opensolaris/tools/ctf/cvt/util.c >=20 > Modified: head/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c Tue Apr 28 16:0= 9:25 2020 (r360444) > +++ head/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c Tue Apr 28 16:0= 9:28 2020 (r360445) > @@ -452,6 +452,10 @@ map_td_tree_post(tdesc_t *ctdp, tdesc_t **ctdpp __= unus > if (ed.ed_tgt->t_type =3D=3D FORWARD && ctdp->t_type !=3D FORWARD) {= > int id =3D mcd->md_tgt->td_nextid++; > =20 > +#ifdef __FreeBSD__ > + if (CTF_TYPE_ISCHILD(id)) > + terminate("No room for additional types\n"); > +#endif > debug(3, "Creating new defn type %d <%x>\n", id, id); > add_mapping(mcd->md_ta, ctdp->t_id, id); > alist_add(mcd->md_fdida, (void *)(ulong_t)ed.ed_tgt, > @@ -473,6 +477,10 @@ map_td_tree_post(tdesc_t *ctdp, tdesc_t **ctdpp __= unus > } else { > int id =3D mcd->md_tgt->td_nextid++; > =20 > +#ifdef __FreeBSD__ > + if (CTF_TYPE_ISCHILD(id)) > + terminate("No room for additional types\n"); > +#endif > debug(3, "Creating new type %d <%x>\n", id, id); > add_mapping(mcd->md_ta, ctdp->t_id, id); > hash_add(mcd->md_tdtba, ctdp); >=20 > Modified: head/cddl/contrib/opensolaris/tools/ctf/cvt/util.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/cddl/contrib/opensolaris/tools/ctf/cvt/util.c Tue Apr 28 16:09= :25 2020 (r360444) > +++ head/cddl/contrib/opensolaris/tools/ctf/cvt/util.c Tue Apr 28 16:09= :28 2020 (r360445) > @@ -148,17 +148,7 @@ terminate(const char *format, ...) > =20 > if (getenv("CTF_ABORT_ON_TERMINATE") !=3D NULL) > abort(); > -#if defined(__FreeBSD__) > -/* > - * For the time being just output the termination message, but don't > - * return an exit status that would cause the build to fail. We need > - * to get as much stuff built as possible before going back and > - * figuring out what is wrong with certain files. > - */ > - exit(0); > -#else > exit(1); > -#endif > } > =20 > /*PRINTFLIKE1*/ >=20 --=20 Regards, Bryan Drewery --niQeSCGkoXtvW3djFDeK7EIa8mM8RHYlP-- --OMaE395LHfPqSyIQOD11KOTheku1TM6Oo Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE+Rc8ssOq6npcih8JNddxu25Gl88FAl6oe4VfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEY5 MTczQ0IyQzNBQUVBN0E1QzhBMUYwOTM1RDc3MUJCNkU0Njk3Q0YACgkQNddxu25G l8/s5wf9HFUP4e6xZZlGo/Ev6tkzn0rvy4hvgmIK/r3On9j8A1br7o6aSov9xCkL fG9PgYDbyoVOgpKvWyRXMLoQFmtepYg7k8E6FjQKk51fs21IhR1ky7/pVHp1ac6j WXoCN4npjSY2zK4C5U7iRTEpyDxRLOh/RAf2UR7gC2BaWkC7fZwS9OCP0MrwfRpY OnhS8lBlJ7+UFMauIPv29EebObmwmaybVeNeoyG3pxGfGVZA9X8Swtsa+DKaxd0/ iWPHLVcsuh8dTPNSMQyA1o4pMzh8acEdrGdG/Xru09nD1nfC52xkCwq4K7I6UyMW agfghLiTsKbuSeuZdxQeorTKZkD3Sg== =sC6G -----END PGP SIGNATURE----- --OMaE395LHfPqSyIQOD11KOTheku1TM6Oo--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?a43ed9ed-6f8b-ff9a-a578-e3c76329514f>