[PATCH 01/13] gdb/record: Add testcases for a few syscalls.

Pedro Alves palves@redhat.com
Fri Oct 30 15:41:00 GMT 2015


Excellent.

Fix the nits below, and you're good to go.  Please push
with these fixed.

On 10/29/2015 08:39 PM, Marcin Kościelnicki wrote:

>  	PR python/18073
> diff --git a/gdb/testsuite/gdb.reverse/fstatat-reverse.c b/gdb/testsuite/gdb.reverse/fstatat-reverse.c
> new file mode 100644
> index 0000000..759d466
> --- /dev/null
> +++ b/gdb/testsuite/gdb.reverse/fstatat-reverse.c
> @@ -0,0 +1,43 @@
> +/* This testcase is part of GDB, the GNU debugger.
> +
> +   Copyright 2008-2015 Free Software Foundation, Inc.
> +
> +   This program is free software; you can redistribute it and/or modify
> +   it under the terms of the GNU General Public License as published by
> +   the Free Software Foundation; either version 3 of the License, or
> +   (at your option) any later version.
> +
> +   This program is distributed in the hope that it will be useful,
> +   but WITHOUT ANY WARRANTY; without even the implied warranty of
> +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +   GNU General Public License for more details.
> +
> +   You should have received a copy of the GNU General Public License
> +   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
> +
> +#define _GNU_SOURCE
> +#include <unistd.h>
> +#include <fcntl.h>
> +#include <sys/stat.h>
> +
> +void
> +marker1 (void)
> +{
> +}
> +
> +void
> +marker2 (void)
> +{
> +}
> +
> +struct stat buf;
> +
> +int
> +main ()

(void) here (and elsewhere as needed), as discussed.

> diff --git a/gdb/testsuite/gdb.reverse/pipe-reverse.c b/gdb/testsuite/gdb.reverse/pipe-reverse.c
> new file mode 100644
> index 0000000..ec8438c
> --- /dev/null
> +++ b/gdb/testsuite/gdb.reverse/pipe-reverse.c
> @@ -0,0 +1,39 @@

> +#define _GNU_SOURCE
> +#include <unistd.h>
> +
> +void
> +marker1 (void)
> +{
> +}
> +
> +void
> +marker2 (void)
> +{
> +}
> +
> +int fds[2] = { -1, -1 };
> +
> +int
> +main () {

Like break before {.

> +  marker1 ();
> +  pipe (fds);
> +  marker2 ();
> +  return 0;
> +}


> --- /dev/null
> +++ b/gdb/testsuite/gdb.reverse/recvmsg-reverse.c
> @@ -0,0 +1,94 @@

> +#define _GNU_SOURCE
> +#include <sys/socket.h>
> +#include <sys/types.h>
> +#include <sys/un.h>
> +#include <unistd.h>
> +
> +void
> +marker1 (void)
> +{
> +}
> +
> +void
> +marker2 (void)
> +{
> +}
> +
> +char wdata[] = "abcdef";
> +
> +struct iovec wv[1] = {
> +  { wdata, 6 },
> +};
> +
> +char wc[CMSG_SPACE(sizeof (struct ucred)) + CMSG_SPACE(sizeof (int))];

Space before parens.

> +
> +struct msghdr wmsg = {
> +  0, 0,
> +  wv, 1,
> +  wc, sizeof wc,
> +  0,
> +};
> +
> +char rdata[5] = "xxxx";
> +
> +struct iovec rv[2] = {
> +  {&rdata[2], 2},
> +  {&rdata[0], 2},
> +};
> +
> +char rc[CMSG_SPACE(sizeof (struct ucred)) + 7];
> +
> +struct msghdr rmsg = {
> +  0, 0,
> +  rv, 2,
> +  rc, sizeof rc,
> +  0,
> +};
> +
> +int fds[2];
> +
> +int
> +main ()
> +{
> +  int itrue = 1;
> +  /* prepare cmsg to send */
> +  struct cmsghdr *cm1 = CMSG_FIRSTHDR(&wmsg);
> +  cm1->cmsg_len = CMSG_LEN(sizeof (struct ucred));

Space before parens, twice.

> +  cm1->cmsg_level = AF_UNIX;
> +  cm1->cmsg_type = SCM_CREDENTIALS;
> +  struct ucred *uc = (void *)CMSG_DATA(cm1);

Space after cast.  Space before parens.

> +  uc->pid = getpid ();
> +  uc->uid = getuid ();
> +  uc->gid = getgid ();
> +  struct cmsghdr *cm2 = CMSG_NXTHDR(&wmsg, cm1);
> +  cm2->cmsg_len = CMSG_LEN(sizeof (int));

Space before parens, twice.

> +  cm2->cmsg_level = AF_UNIX;
> +  cm2->cmsg_type = SCM_RIGHTS;
> +  int *pfd = (void *)CMSG_DATA(cm2);

Space after cast.  Space before parens.

> +  *pfd = 2;
> +  /* do the syscalls */
> +  marker1();

Space before parens.

> +  socketpair (AF_UNIX, SOCK_DGRAM, 0, fds);
> +  setsockopt (fds[0], SOL_SOCKET, SO_PASSCRED, &itrue, sizeof itrue);
> +  sendmsg (fds[1], &wmsg, 0);
> +  recvmsg (fds[0], &rmsg, 0);
> +  marker2();

Space before parens.

> new file mode 100644
> index 0000000..a681335
> --- /dev/null
> +++ b/gdb/testsuite/gdb.reverse/waitpid-reverse.c
> @@ -0,0 +1,45 @@


> +#include <unistd.h>
> +#include <stdlib.h>
> +#include <sys/wait.h>
> +
> +void
> +marker1 (void)
> +{
> +}
> +
> +void
> +marker2 (void)
> +{
> +}
> +
> +int status = -1;
> +
> +int
> +main ()
> +{
> +  marker1 ();
> +  if (!fork ()) {
> +    _exit (123);
> +  } else {
> +    waitpid (-1, &status, 0);
> +  }

Formatting {} go on their own lines.  But since this these single-line
statements, drop the unnecessary {}s:

  if (!fork ())
    _exit (123);
  else
    waitpid (-1, &status, 0);

> +  marker2 ();
> +  return 0;
> +}

Thanks,
Pedro Alves



More information about the Gdb-patches mailing list