Skip to contentSkip to conversation

qobject: json-streamer: Remove double test

PATCH In review Simran Singhal 2 participants 4 messages Apr 2, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 qobject: json-streamer: Remove double test

Remove the duplicate test "parser->bracket_count >= 0".

---
 qobject/json-streamer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
qobject/json-streamer.c +1 -1
index 47dd7ea576..ef48185283 100644
@@ -85,7 +85,7 @@ void json_message_process_token(JSONLexer *lexer, GString *input,
     g_queue_push_tail(&parser->tokens, token);
 
     if ((parser->brace_count > 0 || parser->bracket_count > 0)
-        && parser->bracket_count >= 0 && parser->bracket_count >= 0) {
+        && parser->bracket_count >= 0) {
         return;
     }
 
Signature · 1 line
2.17.1
#1 lore raw
Quoted 12 lines · Simran Singhal

Remove the duplicate test "parser->bracket_count >= 0".

---
  qobject/json-streamer.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
qobject/json-streamer.c +0 -0
index 47dd7ea576..ef48185283 100644

qobject/json-streamer.c void json_message_process_token(JSONLexer *lexer, GString *input, · line 86

Quoted 2 lines
qobject/json-streamer.c +0 -0
@@ -85,7 +85,7 @@ void json_message_process_token(JSONLexer *lexer, GString *input,
      g_queue_push_tail(&parser->tokens, token);
 

Adding some context:

Quoted 10 lines
qobject/json-streamer.c +1 -1
      if ((parser->brace_count > 0 || parser->bracket_count > 0)
-        && parser->bracket_count >= 0 && parser->bracket_count >= 0) {
+        && parser->bracket_count >= 0) {
          return;
      }
 
    json = json_parser_parse(parser->tokens, parser->ap, &err);
    parser->tokens = NULL;

out_emit:

This code was rewritten in commit 8d3265b3. Prior to that, it read:

    if (parser->brace_count < 0 ||
        parser->bracket_count < 0 ||
        (parser->brace_count == 0 &&
         parser->bracket_count == 0)) {
        json = json_parser_parse(parser->tokens, parser->ap, &err);
        parser->tokens = NULL;
        goto out_emit;
    }

    return;

out_emit:

Obviously, the goal of the rewrite was to convert:

if (cond) {
do stuff
} else {
return
}
more stuff

into the more legible

if (!cond) {
return
}
do stuff
more stuff

Let's re-read my original review:

https://lists.gnu.org/archive/html/qemu-devel/2018-08/msg03017.html

Quoted 7 lines

Applying deMorgan's rules:

!(brace < 0 || bracket < 0 || (brace == 0 && bracket == 0)) !(brace < 0) && !(bracket < 0) && !(brace == 0 && bracket == 0) brace >= 0 && bracket >= 0 && (!(brace == 0) || !(bracket == 0)) brace >= 0 && bracket >= 0 && (brace != 0 || bracket != 0)

Quoted 9 lines

But based on what we learned in the first two conjunctions, we can rewrite the third:

brace >= 0 && bracket >= 0 && (brace > 0 || bracket > 0)

and then commute the logic:

(brace > 0 || bracket > 0) && brace >= 0 && bracket >= 0

What I missed was the typo: we checked bracket >= 0 twice, instead of the intended brace >= 0 && bracket >= 0. This needs a v2.

Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org
#2 lore raw
Quoted 10 lines · Eric Blake
Quoted 9 lines · Simran Singhal

Remove the duplicate test "parser->bracket_count >= 0".

---
  qobject/json-streamer.c | 2 +-

  1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 4 lines
Quoted 2 lines

(brace > 0 || bracket > 0) && brace >= 0 && bracket >= 0

What I missed was the typo: we checked bracket >= 0 twice, instead of the intended brace >= 0 && bracket >= 0.  This needs a v2.

Effect of the bug:

Note that we can diagnose when we have unbalanced ] with no matching [ while inside {}:

$ qemu-kvm --nodefaults --nographic --qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 2, "major": 4}, "package": "v5.0.0-rc1-1-gf6ce4a439a08"}, "capabilities": ["oob"]}}
{]
{"error": {"class": "GenericError", "desc": "JSON parse error, expecting value"}}

but that we fail to diagnose unbalanced } with no matching { while inside []:

[}

Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org
#3 lore raw
In reply to Eric Blake
Quoted 80 lines · Eric Blake

qobject/json-streamer.c void json_message_process_token(JSONLexer *lexer,

Quoted 12 lines · Simran Singhal

Remove the duplicate test "parser->bracket_count >= 0".

---
  qobject/json-streamer.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
qobject/json-streamer.c +0 -0
index 47dd7ea576..ef48185283 100644
@@ -85,7 +85,7 @@ void json_message_process_token(JSONLexer *lexer,

GString *input,

qobject/json-streamer.c void json_message_process_token(JSONLexer *lexer, GString *input, · line 86

Quoted 2 lines
qobject/json-streamer.c +0 -0
      g_queue_push_tail(&parser->tokens, token);
 

Adding some context:

Quoted 10 lines
qobject/json-streamer.c +1 -1
      if ((parser->brace_count > 0 || parser->bracket_count > 0)
-        && parser->bracket_count >= 0 && parser->bracket_count >= 0) {
+        && parser->bracket_count >= 0) {
          return;
      }
 
    json = json_parser_parse(parser->tokens, parser->ap, &err);
    parser->tokens = NULL;

out_emit:

This code was rewritten in commit 8d3265b3. Prior to that, it read:

     if (parser->brace_count < 0 ||
         parser->bracket_count < 0 ||
         (parser->brace_count == 0 &&
          parser->bracket_count == 0)) {
         json = json_parser_parse(parser->tokens, parser->ap, &err);
         parser->tokens = NULL;
         goto out_emit;
     }

     return;

out_emit:

Obviously, the goal of the rewrite was to convert:

if (cond) {
do stuff
} else {
return
}
more stuff

into the more legible

if (!cond) {
return
}
do stuff
more stuff

Let's re-read my original review:

https://lists.gnu.org/archive/html/qemu-devel/2018-08/msg03017.html

Quoted 8 lines

Applying deMorgan's rules:

!(brace < 0 || bracket < 0 || (brace == 0 && bracket == 0)) !(brace < 0) && !(bracket < 0) && !(brace == 0 && bracket == 0) brace >= 0 && bracket >= 0 && (!(brace == 0) || !(bracket == 0)) brace >= 0 && bracket >= 0 && (brace != 0 || bracket != 0)

But based on what we learned in the first two conjunctions, we can

rewrite the third:

Quoted 4 lines

brace >= 0 && bracket >= 0 && (brace > 0 || bracket > 0)

Quoted 8 lines
Quoted 4 lines

and then commute the logic:

(brace > 0 || bracket > 0) && brace >= 0 && bracket >= 0

What I missed was the typo: we checked bracket >= 0 twice, instead of the intended brace >= 0 && bracket >= 0. This needs a v2.

Hello Eric,

Thanks for the explanation.
I'll send v2 with the required changes.

--
Simran

Quoted 7 lines

--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org