Patchwork remove unused function arg in qemu_iohandler_poll() and qemu_iohandler_fill()

login
register
mail settings
Submitter Jun Koi
Date Nov. 1, 2011, 5:11 a.m.
Message ID <CA+g7VZ2g0CdpYWY+wUuOk3Oi-C_penszMaJvF1VJCt0+tzRn0Q@mail.gmail.com>
Download mbox | patch
Permalink /patch/123024/
State New
Headers show

Comments

Jun Koi - Nov. 1, 2011, 5:11 a.m.
This patch removes unused function argument xfds from
qemu_iohandler_poll() and qemu_iohandler_fill()

Signed-off-by: Jun Koi <junkoi2004@gmail.com>


 void qemu_bh_schedule_idle(QEMUBH *bh);
 int qemu_bh_poll(void);
(END)
Anthony Liguori - Nov. 1, 2011, 3:05 p.m.
On 11/01/2011 12:11 AM, Jun Koi wrote:
> This patch removes unused function argument xfds from
> qemu_iohandler_poll() and qemu_iohandler_fill()
>
> Signed-off-by: Jun Koi<junkoi2004@gmail.com>
>
>
> diff --git a/iohandler.c b/iohandler.c
> index 5640d49..9963790 100644
> --- a/iohandler.c
> +++ b/iohandler.c
> @@ -89,7 +89,7 @@ int qemu_set_fd_handler(int fd,
>       return qemu_set_fd_handler2(fd, NULL, fd_read, fd_write, opaque);
>   }
>
> -void qemu_iohandler_fill(int *pnfds, fd_set *readfds, fd_set
> *writefds, fd_set *xfds)

Your mailer is munging the patch.  Please use git-send-email to avoid this.

Regards,

Anthony Liguori

> +void qemu_iohandler_fill(int *pnfds, fd_set *readfds, fd_set *writefds)
>   {
>       IOHandlerRecord *ioh;
>
> @@ -111,7 +111,7 @@ void qemu_iohandler_fill(int *pnfds, fd_set
> *readfds, fd_set *writefds, fd_set *
>       }
>   }
>
> -void qemu_iohandler_poll(fd_set *readfds, fd_set *writefds, fd_set
> *xfds, int ret)
> +void qemu_iohandler_poll(fd_set *readfds, fd_set *writefds, int ret)
>   {
>       if (ret>  0) {
>           IOHandlerRecord *pioh, *ioh;
> diff --git a/main-loop.c b/main-loop.c
> index 60e9748..7cbb0b0 100644
> --- a/main-loop.c
> +++ b/main-loop.c
> @@ -446,7 +446,7 @@ int main_loop_wait(int nonblocking)
>   #ifdef CONFIG_SLIRP
>       slirp_select_fill(&nfds,&rfds,&wfds,&xfds);
>   #endif
> -    qemu_iohandler_fill(&nfds,&rfds,&wfds,&xfds);
> +    qemu_iohandler_fill(&nfds,&rfds,&wfds);
>       glib_select_fill(&nfds,&rfds,&wfds,&xfds,&tv);
>
>       if (timeout>  0) {
> @@ -460,7 +460,7 @@ int main_loop_wait(int nonblocking)
>       }
>
>       glib_select_poll(&rfds,&wfds,&xfds, (ret<  0));
> -    qemu_iohandler_poll(&rfds,&wfds,&xfds, ret);
> +    qemu_iohandler_poll(&rfds,&wfds, ret);
>   #ifdef CONFIG_SLIRP
>       slirp_select_poll(&rfds,&wfds,&xfds, (ret<  0));
>   #endif
> diff --git a/main-loop.h b/main-loop.h
> index 8a716b1..f753c6a 100644
> --- a/main-loop.h
> +++ b/main-loop.h
> @@ -341,8 +341,8 @@ void qemu_mutex_unlock_iothread(void);
>
>   /* internal interfaces */
>
> -void qemu_iohandler_fill(int *pnfds, fd_set *readfds, fd_set
> *writefds, fd_set *xfds);
> -void qemu_iohandler_poll(fd_set *readfds, fd_set *writefds, fd_set
> *xfds, int rc);
> +void qemu_iohandler_fill(int *pnfds, fd_set *readfds, fd_set *writefds);
> +void qemu_iohandler_poll(fd_set *readfds, fd_set *writefds, int rc);
>
>   void qemu_bh_schedule_idle(QEMUBH *bh);
>   int qemu_bh_poll(void);
> (END)
>
>
Paolo Bonzini - Nov. 2, 2011, 7:40 a.m.
On 11/01/2011 06:11 AM, Jun Koi wrote:
> This patch removes unused function argument xfds from
> qemu_iohandler_poll() and qemu_iohandler_fill()

I don't think the patch us particularly useful; the arguments are 
designed to match select.  The fact that iohandlers do not support xfds 
(unlike e.g. glib and slirp poll/fill) is not important to the _client_ 
of this code.

Thanks,

Paolo
Jun Koi - Nov. 2, 2011, 8:05 a.m.
On Wed, Nov 2, 2011 at 3:40 PM, Paolo Bonzini <pbonzini@redhat.com> wrote:
> On 11/01/2011 06:11 AM, Jun Koi wrote:
>>
>> This patch removes unused function argument xfds from
>> qemu_iohandler_poll() and qemu_iohandler_fill()
>
> I don't think the patch us particularly useful; the arguments are designed
> to match select.  The fact that iohandlers do not support xfds (unlike e.g.
> glib and slirp poll/fill) is not important to the _client_ of this code.
>

do you mean the code looks "more beautiful" if we just leave xfds
there? is that a good reason?

this causes a little bit on performance, because we have to push an
unused argument into the stack every time we call those funcs.
while the impact is minimal, do we really need to suffer that for the
beauty of code?

thanks,
J

Patch

diff --git a/iohandler.c b/iohandler.c
index 5640d49..9963790 100644
--- a/iohandler.c
+++ b/iohandler.c
@@ -89,7 +89,7 @@  int qemu_set_fd_handler(int fd,
     return qemu_set_fd_handler2(fd, NULL, fd_read, fd_write, opaque);
 }

-void qemu_iohandler_fill(int *pnfds, fd_set *readfds, fd_set
*writefds, fd_set *xfds)
+void qemu_iohandler_fill(int *pnfds, fd_set *readfds, fd_set *writefds)
 {
     IOHandlerRecord *ioh;

@@ -111,7 +111,7 @@  void qemu_iohandler_fill(int *pnfds, fd_set
*readfds, fd_set *writefds, fd_set *
     }
 }

-void qemu_iohandler_poll(fd_set *readfds, fd_set *writefds, fd_set
*xfds, int ret)
+void qemu_iohandler_poll(fd_set *readfds, fd_set *writefds, int ret)
 {
     if (ret > 0) {
         IOHandlerRecord *pioh, *ioh;
diff --git a/main-loop.c b/main-loop.c
index 60e9748..7cbb0b0 100644
--- a/main-loop.c
+++ b/main-loop.c
@@ -446,7 +446,7 @@  int main_loop_wait(int nonblocking)
 #ifdef CONFIG_SLIRP
     slirp_select_fill(&nfds, &rfds, &wfds, &xfds);
 #endif
-    qemu_iohandler_fill(&nfds, &rfds, &wfds, &xfds);
+    qemu_iohandler_fill(&nfds, &rfds, &wfds);
     glib_select_fill(&nfds, &rfds, &wfds, &xfds, &tv);

     if (timeout > 0) {
@@ -460,7 +460,7 @@  int main_loop_wait(int nonblocking)
     }

     glib_select_poll(&rfds, &wfds, &xfds, (ret < 0));
-    qemu_iohandler_poll(&rfds, &wfds, &xfds, ret);
+    qemu_iohandler_poll(&rfds, &wfds, ret);
 #ifdef CONFIG_SLIRP
     slirp_select_poll(&rfds, &wfds, &xfds, (ret < 0));
 #endif
diff --git a/main-loop.h b/main-loop.h
index 8a716b1..f753c6a 100644
--- a/main-loop.h
+++ b/main-loop.h
@@ -341,8 +341,8 @@  void qemu_mutex_unlock_iothread(void);

 /* internal interfaces */

-void qemu_iohandler_fill(int *pnfds, fd_set *readfds, fd_set
*writefds, fd_set *xfds);
-void qemu_iohandler_poll(fd_set *readfds, fd_set *writefds, fd_set
*xfds, int rc);
+void qemu_iohandler_fill(int *pnfds, fd_set *readfds, fd_set *writefds);
+void qemu_iohandler_poll(fd_set *readfds, fd_set *writefds, int rc);