xenopsd: Don't iterate over StringMaps twice

Signed-off-by: Andrii Sultanov <[email protected]>

Author: Andrii Sultanov

ocaml/xenopsd/lib/xenops_server.ml

@@ -848,10 +848,11 @@ module Queues = struct
 
   let get tag qs =
     with_lock qs.m (fun () ->
-        if StringMap.mem tag qs.qs then
-          StringMap.find tag qs.qs
-        else
-          Queue.create ()
+        match StringMap.find_opt tag qs.qs with
+        | Some x ->
+            x
+        | None ->
+            Queue.create ()
     )
 
   let tags qs =
@@ -862,10 +863,11 @@ module Queues = struct
   let push_with_coalesce should_keep tag item qs =
     with_lock qs.m (fun () ->
         let q =
-          if StringMap.mem tag qs.qs then
-            StringMap.find tag qs.qs
-          else
-            Queue.create ()
+          match StringMap.find_opt tag qs.qs with
+          | Some x ->
+              x
+          | None ->
+              Queue.create ()
         in
         push_with_coalesce should_keep item q ;
         qs.qs <- StringMap.add tag q qs.qs ;

ocaml/xenopsd/lib/xenops_utils.ml

@@ -227,11 +227,13 @@ module MemFS = struct
       match (path, fs) with
       | [], Dir d ->
           d
-      | p :: ps, Dir d ->
-          if StringMap.mem p !d then
-            aux ps (StringMap.find p !d)
-          else
+      | p :: ps, Dir d -> (
+        match StringMap.find_opt p !d with
+        | Some x ->
+            aux ps x
+        | None ->
             raise Not_dir
+      )
       | _, Leaf _ ->
           raise Not_dir
     in
@@ -285,14 +287,13 @@ module MemFS = struct
           (fun p ->
             let dir = dir_locked (dirname p) in
             let deletable =
-              if StringMap.mem (filename p) !dir then
-                match StringMap.find (filename p) !dir with
-                | Dir child ->
-                    StringMap.is_empty !child
-                | Leaf _ ->
-                    true
-              else
-                false
+              match StringMap.find_opt (filename p) !dir with
+              | Some (Dir child) ->
+                  StringMap.is_empty !child
+              | Some (Leaf _) ->
+                  true
+              | None ->
+                  false
             in
             if deletable then dir := StringMap.remove (filename p) !dir
           )