Permalink
Browse files

Merge branch 'async-nif'

  • Loading branch information...
Hunter Morris
Hunter Morris committed Mar 12, 2012
2 parents 300195f + 32814ac commit f98feb6804c83dcb649c4826f204587097d40739
Showing with 509 additions and 32 deletions.
  1. +32 −0 LICENSE
  2. +3 −3 README.rst
  3. +141 −0 c_src/async_queue.c
  4. +83 −0 c_src/async_queue.h
  5. +177 −19 c_src/bcrypt_nif.c
  6. +40 −0 c_src/bcrypt_nif.h
  7. +1 −1 rebar.config
  8. +2 −2 src/bcrypt.app.src
  9. +15 −3 src/bcrypt_nif.erl
  10. +15 −4 src/bcrypt_nif_worker.erl
View
32 LICENSE
@@ -82,3 +82,35 @@ subject to the following license:
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
The asynchronous queue code (c_src/async_queue.c and
c_src/async_queue.h) is from the esnappy project, copyright 2011
Konstantin V. Sorokin. It is subject to the following license:
Copyright (c) 2011 Konstantin V. Sorokin
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. Neither the name of the copyright holder nor the names of contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTOR(S) ``AS IS'' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTOR(S) BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
View
@@ -48,10 +48,10 @@ application's environment:
``mechanism``
Specifies whether to use the NIF implementation (``'nif'``) or a
pool of port programs (``'port'``). Defaults to ``'port'``.
pool of port programs (``'port'``). Defaults to ``'nif'``.
`WARNING: the NIF implementation will block Erlang VM scheduler
threads and is not suitable for many applications.`
`Note: the NIF implementation no longer blocks the Erlang VM
scheduler threads`
``pool_size``
Specifies the size of the port program pool. Defaults to ``4``.
View
@@ -0,0 +1,141 @@
/*
From https://github.com/thekvs/esnappy:
Copyright (c) 2011 Konstantin V. Sorokin
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. Neither the name of the copyright holder nor the names of contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTOR(S) ``AS IS'' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTOR(S) BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
*/
// vim: shiftwidth=4 expandtab
#include "async_queue.h"
async_queue_t*
async_queue_create()
{
async_queue_t *aq;
aq = ALLOC(sizeof(*aq));
if (!aq) {
errx(1, "enif_alloc() failed");
}
aq->q = ALLOC(sizeof(*(aq->q)));
if (!(aq->q)) {
errx(1, "enif_alloc() failed");
}
TAILQ_INIT(aq->q);
aq->waiting_threads = aq->len = 0;
aq->mutex = enif_mutex_create("erlang_snappy_mutex");
if (!aq->mutex) {
errx(1, "enif_mutex_create() failed");
}
aq->cond = enif_cond_create("erlang_snappy_condvar");
if (!aq->cond) {
errx(1, "enif_cond_create() failed");
}
return aq;
}
int
async_queue_length(async_queue_t *aq)
{
int length;
MUTEX_LOCK(aq->mutex);
length = aq->len - aq->waiting_threads;
MUTEX_UNLOCK(aq->mutex);
return length;
}
void *
async_queue_pop(async_queue_t *aq)
{
struct async_queue_entry *en;
void *d;
MUTEX_LOCK(aq->mutex);
d = NULL;
aq->waiting_threads++;
while (TAILQ_EMPTY(aq->q)) {
enif_cond_wait(aq->cond, aq->mutex);
}
aq->waiting_threads--;
en = TAILQ_FIRST(aq->q);
TAILQ_REMOVE(aq->q, en, entries);
d = en->data;
aq->len--;
enif_free(en);
MUTEX_UNLOCK(aq->mutex);
return d;
}
void
async_queue_push(async_queue_t *aq, void *data)
{
struct async_queue_entry *en;
MUTEX_LOCK(aq->mutex);
en = ALLOC(sizeof(*en));
en->data = data;
TAILQ_INSERT_TAIL(aq->q, en, entries);
aq->len++;
COND_SIGNAL(aq->cond);
MUTEX_UNLOCK(aq->mutex);
}
void
async_queue_destroy(async_queue_t *aq)
{
struct async_queue_entry *en;
while (!TAILQ_EMPTY(aq->q)) {
en = TAILQ_FIRST(aq->q);
TAILQ_REMOVE(aq->q, en, entries);
enif_free(en);
}
COND_DESTROY(aq->cond);
MUTEX_DESTROY(aq->mutex);
enif_free(aq->q);
enif_free(aq);
}
View
@@ -0,0 +1,83 @@
/*
From https://github.com/thekvs/esnappy:
Copyright (c) 2011 Konstantin V. Sorokin
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. Neither the name of the copyright holder nor the names of contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTOR(S) ``AS IS'' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTOR(S) BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
*/
// vim: shiftwidth=4 expandtab
#ifndef __ASYNC_QUEUE_H_INCLUDED__
#define __ASYNC_QUEUE_H_INCLUDED__
#include <sys/queue.h>
#include <sys/types.h>
#include <sys/time.h>
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <err.h>
#include <erl_nif.h>
#ifdef __cplusplus
extern "C" {
#endif
TAILQ_HEAD(queue, async_queue_entry);
struct async_queue_entry {
TAILQ_ENTRY(async_queue_entry) entries;
void *data;
};
typedef struct __async_queue {
struct queue *q;
ErlNifMutex *mutex;
ErlNifCond *cond;
int waiting_threads;
int len;
} async_queue_t;
async_queue_t* async_queue_create();
int async_queue_length(async_queue_t *aq);
void* async_queue_pop(async_queue_t *aq);
void async_queue_push(async_queue_t *aq, void *data);
void async_queue_destroy(async_queue_t *aq);
#define ALLOC(size) enif_alloc(size)
#define MUTEX_LOCK(mutex) enif_mutex_lock(mutex)
#define MUTEX_UNLOCK(mutex) enif_mutex_unlock(mutex)
#define MUTEX_DESTROY(mutex) enif_mutex_destroy(mutex)
#define COND_SIGNAL(condvar) enif_cond_signal(condvar)
#define COND_DESTROY(condvar) enif_cond_destroy(condvar)
#ifdef __cplusplus
} // extern "C"
#endif
#endif
Oops, something went wrong.

0 comments on commit f98feb6

Please sign in to comment.