unordered_map is faster

Author: goblinhack

src/level_monst.cpp

@@ -62,7 +62,7 @@ Tpp Level::get_random_monst(point p, monst_environ_t monst_environ, monst_class_
       //
       TRACE_NO_INDENT();
       auto tp = tp_get_with_rarity_filter(tp_monst[ biome ][ monst_environ ][ monst_class ]);
-      if (! tp) {
+      if (unlikely(! tp)) {
         continue;
       }
 

src/my_thing_template.hpp

@@ -12,9 +12,10 @@
 #include "my_tile.hpp"
 #include <map>
 #include <set>
+#include <unordered_map>
 
 using Tpidmap   = std::vector< class Tp * >;
-using Tpnamemap = std::map< std::string, class Tp * >;
+using Tpnamemap = std::unordered_map< std::string, class Tp * >;
 using Allies    = std::set< class Tp * >;
 
 enum {

src/thing_init.cpp

@@ -36,7 +36,7 @@ Thingp Level::thing_new(const std::string &name, const point at, Thingp owner)
   TRACE_NO_INDENT();
 
   auto tp = tp_find(name);
-  if (! tp) {
+  if (unlikely(! tp)) {
     auto tp_cands = tp_find_wildcard(this, at, name);
     if (! tp_cands.size()) {
       DIE("Could not find thing '%s'", name.c_str());
@@ -51,24 +51,22 @@ Thingp Level::thing_new(const std::string &name, const point at, Thingp owner)
     tp = pcg_one_of(tp_cands);
   }
 
-  if (! tp) {
+  if (unlikely(! tp)) {
     DIE("Could not create thing '%s'", name.c_str());
     return nullptr;
   }
 
   //
   // Ensure things like chasms don't pile up on the same tile.
   //
-  if (tp->is_one_per_tile()) {
-    TRACE_NO_INDENT();
+  if (unlikely(tp->is_one_per_tile())) {
     FOR_ALL_THINGS_AT_DEPTH(this, o, at.x, at.y, tp->z_depth)
     {
       if (o->tp() == tp) {
         dbg("Do not create %s as already exist at %s", name.c_str(), at.to_string().c_str());
         return nullptr;
       }
     }
-    TRACE_NO_INDENT();
     FOR_ALL_THINGS_END()
   }
 

src/thing_spawn.cpp

@@ -715,7 +715,7 @@ bool Thing::spawn_things_around_me(const std::string &what, int radius)
       }
 
       auto tp = pcg_one_of(tp_cands);
-      if (! tp) {
+      if (unlikely(! tp)) {
         return false;
       }
 

src/thing_template.cpp

@@ -441,7 +441,7 @@ Tpp tp_load(int id, std::string const &name, const std::string &text_long_name,
 Tilep tp_first_tile(Tpp tp)
 {
   TRACE_NO_INDENT();
-  if (! tp) {
+  if (unlikely(! tp)) {
     return nullptr;
   }
 

src/thing_template_random.cpp

@@ -647,7 +647,7 @@ static Tpp tp_get_with_no_rarity_filter(Tpidmap &m)
   while (tries-- > 0) {
     auto index = pcg_rand() % m.size();
     auto tp    = get(m, index);
-    if (! tp) {
+    if (unlikely(! tp)) {
       break;
     }