Ran reindex on test and ported changes

 - Ran reindex t/163-atomic-shdict.t
 - Ported changes from lua-nginx-module
 - Changed from HTTP to STREAM log

Author: Miniwoffer

src/ngx_stream_lua_shdict.c

@@ -319,6 +319,37 @@ ngx_stream_lua_shdict_expire(ngx_stream_lua_shdict_ctx_t *ctx, ngx_uint_t n)
 }
 
 
+static inline ngx_rbtree_node_t *
+ngx_stream_lua_shdict_force_alloc(ngx_stream_lua_shdict_ctx_t *ctx, size_t size,
+    int *forcible)
+{
+    int                  i;
+    ngx_rbtree_node_t   *node;
+
+    node = ngx_slab_alloc_locked(ctx->shpool, size);
+    *forcible = 0;
+
+    if (node) {
+        return node;
+    }
+
+    for (i = 0; i < 30; i++) {
+        if (ngx_stream_lua_shdict_expire(ctx, 0) == 0) {
+            break;
+        }
+
+        *forcible = 1;
+
+        node = ngx_slab_alloc_locked(ctx->shpool, size);
+        if (node) {
+            return node;
+        }
+    }
+
+    return NULL;
+}
+
+
 void
 ngx_stream_lua_inject_shdict_api(ngx_stream_lua_main_conf_t *lmcf, lua_State *L)
 {
@@ -1235,7 +1266,7 @@ ngx_stream_lua_ffi_shdict_cas(ngx_shm_zone_t *zone, u_char *key,
     double num_value, int user_flags, int set_user_flags,
     long exptime, int match_flags, int *match, char **errmsg, int *forcible)
 {
-    int                          i, n, match_value;
+    int                          n, match_value;
     u_char                       c, oc, *p;
     uint32_t                     hash;
     ngx_int_t                    rc;
@@ -1324,13 +1355,21 @@ ngx_stream_lua_ffi_shdict_cas(ngx_shm_zone_t *zone, u_char *key,
     dd("lookup returns %d", (int) rc);
 
 
-    if ((match_flags || match_value) &&
-        ((rc == NGX_DECLINED || rc == NGX_DONE) ||
-         (match_flags && old_user_flags != (int) sd->user_flags) ||
-         (match_value && (old_value_type != sd->value_type ||
-                old_str_value_len != sd->value_len ||
-                ngx_memcmp(old_str_value_buf, sd->data + key_len,
-                           (size_t) old_str_value_len)))))
+    if (match_flags
+        && (rc != NGX_OK || old_user_flags != (int) sd->user_flags))
+    {
+        ngx_shmtx_unlock(&ctx->shpool->mutex);
+        *match = 1;
+        return NGX_DECLINED;
+    }
+
+    if (match_value
+        && (rc != NGX_OK
+            || old_value_type != sd->value_type
+            || old_str_value_len != sd->value_len
+            || ngx_memcmp(old_str_value_buf, sd->data + key_len,
+                          (size_t) old_str_value_len)
+        ))
     {
         ngx_shmtx_unlock(&ctx->shpool->mutex);
         *match = 1;
@@ -1341,7 +1380,9 @@ ngx_stream_lua_ffi_shdict_cas(ngx_shm_zone_t *zone, u_char *key,
         if (value_type == LUA_TNIL && !set_user_flags) {
             goto remove;
         }
+
         if (set_user_flags && value_type == LUA_TNIL) {
+            /* Only set flag, leave value unchanged */
             ngx_queue_remove(&sd->queue);
             ngx_queue_insert_head(&ctx->sh->lru_queue, &sd->queue);
 
@@ -1366,14 +1407,13 @@ ngx_stream_lua_ffi_shdict_cas(ngx_shm_zone_t *zone, u_char *key,
             && sd->value_type != SHDICT_TLIST)
         {
 
-            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
+            ngx_log_debug0(NGX_LOG_DEBUG_STREAM, ctx->log, 0,
                            "lua shared dict set: found old entry and value "
                            "size matched, reusing it");
 
             ngx_queue_remove(&sd->queue);
             ngx_queue_insert_head(&ctx->sh->lru_queue, &sd->queue);
 
-
             if (exptime > 0) {
                 tp = ngx_timeofday();
                 sd->expires = (uint64_t) tp->sec * 1000 + tp->msec
@@ -1383,7 +1423,7 @@ ngx_stream_lua_ffi_shdict_cas(ngx_shm_zone_t *zone, u_char *key,
                 sd->expires = 0;
             }
 
-            if(set_user_flags) {
+            if (set_user_flags) {
                 sd->user_flags = user_flags;
             }
 
@@ -1398,12 +1438,13 @@ ngx_stream_lua_ffi_shdict_cas(ngx_shm_zone_t *zone, u_char *key,
             return NGX_OK;
         }
 
-        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
+        ngx_log_debug0(NGX_LOG_DEBUG_STREAM, ctx->log, 0,
                        "lua shared dict set: found old entry but value size "
                        "NOT matched, removing it first");
-        if(!set_user_flags) {
+        if (!set_user_flags) {
             user_flags = sd->user_flags;
         }
+
 remove:
 
         if (sd->value_type == SHDICT_TLIST) {
@@ -1429,7 +1470,6 @@ ngx_stream_lua_ffi_shdict_cas(ngx_shm_zone_t *zone, u_char *key,
         ngx_rbtree_delete(&ctx->sh->rbtree, node);
 
         ngx_slab_free_locked(ctx->shpool, node);
-
     }
 
     /* rc == NGX_DECLINED or value size unmatch */
@@ -1439,43 +1479,29 @@ ngx_stream_lua_ffi_shdict_cas(ngx_shm_zone_t *zone, u_char *key,
         return NGX_OK;
     }
 
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
+    ngx_log_debug0(NGX_LOG_DEBUG_STREAM, ctx->log, 0,
                    "lua shared dict cas: creating a new entry");
 
     n = offsetof(ngx_rbtree_node_t, color)
         + offsetof(ngx_stream_lua_shdict_node_t, data)
         + key_len
         + str_value_len;
 
-    node = ngx_slab_alloc_locked(ctx->shpool, n);
-
-    if (node == NULL) {
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
-                       "lua shared dict cas: overriding non-expired items "
+    node = ngx_stream_lua_shdict_force_alloc(ctx, n, forcible);
+    if (*forcible == 1) {
+        ngx_log_debug2(NGX_LOG_DEBUG_STREAM, ctx->log, 0,
+                       "lua shared dict cas: overwrote non-expired items "
                        "due to memory shortage for entry \"%*s\"", key_len,
                        key);
+    }
 
-        for (i = 0; i < 30; i++) {
-            if (ngx_stream_lua_shdict_expire(ctx, 0) == 0) {
-                break;
-            }
-
-            *forcible = 1;
-
-            node = ngx_slab_alloc_locked(ctx->shpool, n);
-            if (node != NULL) {
-                goto allocated;
-            }
-        }
-
+    if (!node) {
         ngx_shmtx_unlock(&ctx->shpool->mutex);
 
         *errmsg = "no memory";
         return NGX_ERROR;
     }
 
-allocated:
-
     sd = (ngx_stream_lua_shdict_node_t *) &node->color;
 
     node->key = hash;
@@ -1512,7 +1538,7 @@ ngx_stream_lua_ffi_shdict_cog(ngx_shm_zone_t *zone,
     u_char *old_str_value_buf, size_t old_str_value_len,
     double old_num_value, int old_user_flags, int *value_type,
     u_char **str_value_buf, size_t *str_value_len, double *num_value,
-    int *user_flags, int match_flags, int *match, char **errmsg)
+    int *user_flags, int match_flags, int *unmatch, char **errmsg)
 {
     u_char                       oc;
     ngx_str_t                    name;
@@ -1524,7 +1550,7 @@ ngx_stream_lua_ffi_shdict_cog(ngx_shm_zone_t *zone,
     int                          match_value;
 
     *errmsg = NULL;
-    *match = 0;
+    *unmatch = 0;
 
     ctx = zone->data;
     name = ctx->name;
@@ -1561,7 +1587,7 @@ ngx_stream_lua_ffi_shdict_cog(ngx_shm_zone_t *zone,
     }
 
 #if (NGX_DEBUG)
-    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
+    ngx_log_debug3(NGX_LOG_DEBUG_STREAM, ctx->log, 0,
                    "fetching key \"%*s\" in shared dict \"%V\"", key_len,
                    key, &name);
 #endif /* NGX_DEBUG */
@@ -1582,18 +1608,19 @@ ngx_stream_lua_ffi_shdict_cog(ngx_shm_zone_t *zone,
         return NGX_OK;
     }
 
-
-    /* rc == NGX_OK || (rc == NGX_DONE) */
-    if ((match_value || match_flags) &&
-        (!match_flags || old_user_flags == (int) sd->user_flags) &&
-        (!match_value || (old_value_type == sd->value_type &&
-            old_str_value_len == sd->value_len &&
-            !ngx_memcmp(old_str_value_buf, sd->data + key_len,
-                        (size_t) old_str_value_len))))
-    {
-        ngx_shmtx_unlock(&ctx->shpool->mutex);
-        *match = 1;
-        return NGX_DECLINED;
+    if (match_value || match_flags) {
+        if (!match_flags || old_user_flags == (int) sd->user_flags)
+        {
+            if (!match_value || (old_value_type == sd->value_type &&
+                old_str_value_len == sd->value_len &&
+                !ngx_memcmp(old_str_value_buf, sd->data + key_len,
+                            (size_t) old_str_value_len)))
+            {
+                ngx_shmtx_unlock(&ctx->shpool->mutex);
+                *unmatch = 1;
+                return NGX_DECLINED;
+            }
+        }
     }
 
     *value_type = sd->value_type;
@@ -1687,7 +1714,7 @@ ngx_stream_lua_ffi_shdict_store(ngx_shm_zone_t *zone, int op, u_char *key,
     size_t str_value_len, double num_value, long exptime, int user_flags,
     char **errmsg, int *forcible)
 {
-    int                          i, n;
+    int                          n;
     u_char                       c, *p;
     uint32_t                     hash;
     ngx_int_t                    rc;
@@ -1879,43 +1906,26 @@ ngx_stream_lua_ffi_shdict_store(ngx_shm_zone_t *zone, int op, u_char *key,
         + key_len
         + str_value_len;
 
-    node = ngx_slab_alloc_locked(ctx->shpool, n);
-
-    if (node == NULL) {
-
-        if (op & NGX_STREAM_LUA_SHDICT_SAFE_STORE) {
-            ngx_shmtx_unlock(&ctx->shpool->mutex);
+    if (op & NGX_STREAM_LUA_SHDICT_SAFE_STORE) {
+        node = ngx_slab_alloc_locked(ctx->shpool, n);
 
-            *errmsg = "no memory";
-            return NGX_ERROR;
-        }
-
-        ngx_log_debug2(NGX_LOG_DEBUG_STREAM, ctx->log, 0,
-                       "lua shared dict set: overriding non-expired items "
-                       "due to memory shortage for entry \"%*s\"", key_len,
-                       key);
-
-        for (i = 0; i < 30; i++) {
-            if (ngx_stream_lua_shdict_expire(ctx, 0) == 0) {
-                break;
-            }
-
-            *forcible = 1;
-
-            node = ngx_slab_alloc_locked(ctx->shpool, n);
-            if (node != NULL) {
-                goto allocated;
-            }
+    } else {
+        node = ngx_stream_lua_shdict_force_alloc(ctx, n, forcible);
+        if (*forcible) {
+            ngx_log_debug2(NGX_LOG_DEBUG_STREAM, ctx->log, 0,
+                           "lua shared dict store: overwrote non-expired items "
+                           "due to memory shortage for entry \"%*s\"", key_len,
+                           key);
         }
+    }
 
+    if (!node) {
         ngx_shmtx_unlock(&ctx->shpool->mutex);
 
         *errmsg = "no memory";
         return NGX_ERROR;
     }
 
-allocated:
-
     sd = (ngx_stream_lua_shdict_node_t *) &node->color;
 
     node->key = hash;