walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Added priority queue

This commit is contained in:
Tatsuhiro Tsujikawa 2012-01-18 02:10:22 +09:00
parent 1f5bc832f8
commit 0eebf89f35
7 changed files with 312 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Makefile.am
View File

@ -31,9 +31,10 @@ DISTCLEANFILES = $(pkgconfig_DATA)
lib_LTLIBRARIES = libspdylay.la lib_LTLIBRARIES = libspdylay.la
OBJECTS = OBJECTS = spdylay_pq.c
HFILES =
libwslay_la_SOURCES = $(HFILES) $(OBJECTS) HFILES = spdylay_pq.h
libwslay_la_LDFLAGS = -no-undefined \
libspdylay_la_SOURCES = $(HFILES) $(OBJECTS)
libspdylay_la_LDFLAGS = -no-undefined \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)

34
lib/includes/spdylay/spdylay.h Normal file
View File

@ -0,0 +1,34 @@
/*
* Spdylay - SPDY Library
*
* Copyright (c) 2012 Tatsuhiro Tsujikawa
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#ifndef SPDYLAY_H
#define SPDYLAY_H
#include <stdlib.h>
enum spdylay_error {
SPDYLAY_ERR_NOMEM = -500
};
#endif /* SPDYLAY_H */

117
lib/spdylay_pq.c Normal file
View File

@ -0,0 +1,117 @@
/*
* Spdylay - SPDY Library
*
* Copyright (c) 2012 Tatsuhiro Tsujikawa
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "spdylay_pq.h"
int spdylay_pq_init(spdylay_pq *pq, spdylay_pq_compar compar)
{
pq->capacity = 4096;
pq->q = malloc(pq->capacity);
if(pq->q == NULL) {
return SPDYLAY_ERR_NOMEM;
}
pq->length = 0;
pq->compar = compar;
return 0;
}
void spdylay_pq_free(spdylay_pq *pq)
{
free(pq->q);
pq->q = NULL;
}
static void swap(spdylay_pq *pq, size_t i, size_t j)
{
void *t = pq->q[i];
pq->q[i] = pq->q[j];
pq->q[j] = t;
}
static void bubble_up(spdylay_pq *pq, size_t index)
{
if(index == 0) {
return;
} else {
size_t parent = (index-1)/2;
if(pq->compar(pq->q[parent], pq->q[index]) > 0) {
swap(pq, parent, index);
bubble_up(pq, parent);
}
}
}
int spdylay_pq_push(spdylay_pq *pq, void *item)
{
if(pq->capacity <= pq->length) {
void *nq = realloc(pq->q, pq->capacity*2);
if(nq == NULL) {
return SPDYLAY_ERR_NOMEM;
}
pq->capacity *= 2;
pq->q = nq;
}
pq->q[pq->length] = item;
++pq->length;
bubble_up(pq, pq->length-1);
return 0;
}
void* spdylay_pq_top(spdylay_pq *pq)
{
if(pq->length == 0) {
return NULL;
} else {
return pq->q[0];
}
}
static void bubble_down(spdylay_pq *pq, size_t index)
{
size_t lchild = index*2+1;
size_t minindex = index;
int i, j;
for(i = 0; i < 2; ++i) {
j = lchild+i;
if(j >= pq->length) {
break;
}
if(pq->compar(pq->q[minindex], pq->q[j]) > 0) {
minindex = j;
}
}
if(minindex != index) {
swap(pq, index, minindex);
bubble_down(pq, minindex);
}
}
void spdylay_pq_pop(spdylay_pq *pq)
{
if(pq->length > 0) {
pq->q[0] = pq->q[pq->length-1];
--pq->length;
bubble_down(pq, 0);
}
}

56
lib/spdylay_pq.h Normal file
View File

@ -0,0 +1,56 @@
/*
* Spdylay - SPDY Library
*
* Copyright (c) 2012 Tatsuhiro Tsujikawa
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#ifndef SPDYLAY_PQ_H
#define SPDYLAY_PQ_H
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
#include <spdylay/spdylay.h>
/* Implementation of priority queue */
typedef int (*spdylay_pq_compar)(const void *lhs, const void *rhs);
typedef struct {
void **q;
size_t length;
size_t capacity;
spdylay_pq_compar compar;
} spdylay_pq;
int spdylay_pq_init(spdylay_pq *pq, spdylay_pq_compar cmp);
void spdylay_pq_free(spdylay_pq *pq);
int spdylay_pq_push(spdylay_pq *pq, void *item);
void* spdylay_pq_top(spdylay_pq *pq);
void spdylay_pq_pop(spdylay_pq *pq);
#endif /* SPDYLAY_PQ_H */

12
tests/Makefile.am
View File

@ -23,5 +23,17 @@
if HAVE_CUNIT if HAVE_CUNIT
check_PROGRAMS = main
OBJECTS = main.c spdylay_pq_test.c
HFILES = spdylay_pq_test.h
main_SOURCES = $(HFILES) $(OBJECTS)
main_LDADD = ${top_builddir}/lib/libspdylay.la -lcunit
main_LDFLAGS = -static
AM_CFLAGS = -Wall -g -O2 -I${top_srcdir}/lib -I${top_srcdir}/lib/includes
TESTS = main
endif # HAVE_CUNIT endif # HAVE_CUNIT

58
tests/spdylay_pq_test.c Normal file
View File

@ -0,0 +1,58 @@
/*
* Spdylay - SPDY Library
*
* Copyright (c) 2012 Tatsuhiro Tsujikawa
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "spdylay_pq_test.h"
#include <CUnit/CUnit.h>
#include "spdylay_pq.h"
static int pq_compar(const void *lhs, const void *rhs)
{
return strcmp(lhs, rhs);
}
void test_spdylay_pq()
{
spdylay_pq pq;
spdylay_pq_init(&pq, pq_compar);
CU_ASSERT(0 == spdylay_pq_push(&pq, "foo"));
CU_ASSERT(strcmp("foo", spdylay_pq_top(&pq)) == 0);
CU_ASSERT(0 == spdylay_pq_push(&pq, "bar"));
CU_ASSERT(strcmp("bar", spdylay_pq_top(&pq)) == 0);
CU_ASSERT(0 == spdylay_pq_push(&pq, "baz"));
CU_ASSERT(strcmp("bar", spdylay_pq_top(&pq)) == 0);
CU_ASSERT(0 == spdylay_pq_push(&pq, "C"));
CU_ASSERT(strcmp("C", spdylay_pq_top(&pq)) == 0);
spdylay_pq_pop(&pq);
CU_ASSERT(strcmp("bar", spdylay_pq_top(&pq)) == 0);
spdylay_pq_pop(&pq);
CU_ASSERT(strcmp("baz", spdylay_pq_top(&pq)) == 0);
spdylay_pq_pop(&pq);
CU_ASSERT(strcmp("foo", spdylay_pq_top(&pq)) == 0);
spdylay_pq_pop(&pq);
CU_ASSERT(0 == spdylay_pq_top(&pq));
spdylay_pq_free(&pq);
}

30
tests/spdylay_pq_test.h Normal file
View File

@ -0,0 +1,30 @@
/*
* Spdylay - SPDY Library
*
* Copyright (c) 2012 Tatsuhiro Tsujikawa
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#ifndef SPDYLAY_PQ_TEST_H
#define SPDYLAY_PQ_TEST_H
void test_spdylay_pq();
#endif /* SPDYLAY_PQ_TEST_H */