Skip to content

Iterate peers as linked list instead of array #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Iterate peers as linked list instead of array #65

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions src/ngx_http_lua_upstream_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@ ngx_http_lua_upstream_get_primary_peers(lua_State * L)
ngx_str_t host;
ngx_uint_t i;
ngx_http_upstream_rr_peers_t *peers;
ngx_http_upstream_rr_peer_t *peer;
ngx_http_upstream_srv_conf_t *us;

if (lua_gettop(L) != 1) {
Expand All @@ -277,9 +278,11 @@ ngx_http_lua_upstream_get_primary_peers(lua_State * L)

lua_createtable(L, peers->number, 0);

for (i = 0; i < peers->number; i++) {
ngx_http_lua_get_peer(L, &peers->peer[i], i);
i = 0;
for (peer = peers->peer; peer != NULL; peer = peer->next) {
ngx_http_lua_get_peer(L, peer, i);
lua_rawseti(L, -2, i + 1);
i++;
}

return 1;
Expand All @@ -292,6 +295,7 @@ ngx_http_lua_upstream_get_backup_peers(lua_State * L)
ngx_str_t host;
ngx_uint_t i;
ngx_http_upstream_rr_peers_t *peers;
ngx_http_upstream_rr_peer_t *peer;
ngx_http_upstream_srv_conf_t *us;

if (lua_gettop(L) != 1) {
Expand Down Expand Up @@ -323,9 +327,11 @@ ngx_http_lua_upstream_get_backup_peers(lua_State * L)

lua_createtable(L, peers->number, 0);

for (i = 0; i < peers->number; i++) {
ngx_http_lua_get_peer(L, &peers->peer[i], i);
i = 0;
for (peer = peers->peer; peer != NULL; peer = peer->next) {
ngx_http_lua_get_peer(L, peer, i);
lua_rawseti(L, -2, i + 1);
i++;
}

return 1;
Expand Down Expand Up @@ -360,9 +366,10 @@ ngx_http_lua_upstream_set_peer_down(lua_State * L)
static ngx_http_upstream_rr_peer_t *
ngx_http_lua_upstream_lookup_peer(lua_State *L)
{
int id, backup;
int id, backup, i;
ngx_str_t host;
ngx_http_upstream_srv_conf_t *us;
ngx_http_upstream_rr_peer_t *peer;
ngx_http_upstream_rr_peers_t *peers;

host.data = (u_char *) luaL_checklstring(L, 1, &host.len);
Expand Down Expand Up @@ -400,7 +407,12 @@ ngx_http_lua_upstream_lookup_peer(lua_State *L)
return NULL;
}

return &peers->peer[id];
peer = peers->peer;
for (i = 0; i < id; i++) {
peer = peer->next;
}

return peer;
}


Expand Down