Skip to content

Commit

Permalink
Merge pull request gwAdvNet2015#67 from SMonaghan/master
Browse files Browse the repository at this point in the history
Added author headers in server
  • Loading branch information
amygara committed Apr 29, 2015
2 parents 123b317 + 82ab934 commit 59263e3
Show file tree
Hide file tree
Showing 8 changed files with 94 additions and 5 deletions.
11 changes: 11 additions & 0 deletions server/Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
#/************************************************
#* GW KV
#* https://github.com/gwAdvNet2015/gw-kv-store
#*
#* Copyright 2015 Phil Lopreiato
#*
#* This program is licensed under the MIT license.
#*
#* Makefile - Compiles the hashtable wrapper
#*************************************************/

#Use the gcc compiler
CC = gcc
CFLAGS = -pthread
Expand Down
17 changes: 12 additions & 5 deletions server/gwkv_ht_wrapper.c
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
/************************************************
* GW KV
* https://github.com/gwAdvNet2015/gw-kv-store
*
* Copyright 2015 Phil Lopreiato
*
* This program is licensed under the MIT license.
*
* gwkv_ht_wrapper.c - Implements wrappers for
* the hash table using murmur hash
*************************************************/

#include <assert.h>
#include <stdlib.h>
#include <string.h>
Expand Down Expand Up @@ -74,11 +86,6 @@ gwkv_server_set(struct gwkv_server* server,
expected_size++;
}

/* TODO if we want to support auto-rebalancing the hastable, do so here
if(ht_check_rebalance(server->hashtable)){
ht_rebalance(&server->hashtable);
}
*/
pthread_mutex_unlock(&server->lock);

/* Now, sanity check to ensure the node was actually entered */
Expand Down
13 changes: 13 additions & 0 deletions server/gwkv_ht_wrapper.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
/************************************************
* GW KV
* https://github.com/gwAdvNet2015/gw-kv-store
*
* Copyright 2015 Phil Lopreiato, Stephen Monaghan,
* Jongmin Bae
*
* This program is licensed under the MIT license.
*
* gwkv_ht_wrapper.h - Declares the functions
* for the gwkv_ht_wrapper.c file
*************************************************/

#ifndef GWKV_HT_WRAPPER
#define GWKV_HT_WRAPPER

Expand Down
11 changes: 11 additions & 0 deletions server/handle_operation.c
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
/************************************************
* GW KV
* https://github.com/gwAdvNet2015/gw-kv-store
*
* Copyright 2015 Phil Lopreiato
*
* This program is licensed under the MIT license.
*
* handle_operation.c - Determines GET vs SET
* operations
*************************************************/

#include "../lib/marshal/marshal.h"
#include "handle_operation.h"
Expand Down
12 changes: 12 additions & 0 deletions server/handle_operation.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
/************************************************
* GW KV
* https://github.com/gwAdvNet2015/gw-kv-store
*
* Copyright 2015 Phil Lopreiato
*
* This program is licensed under the MIT license.
*
* handle_operation.h - Declares the functions
* for handle_operation.c
*************************************************/

#ifndef __HANDLE_OP_H__
#define __HANDLE_OP_H__

Expand Down
11 changes: 11 additions & 0 deletions server/server-kv-run.c
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
/************************************************
* GW KV
* https://github.com/gwAdvNet2015/gw-kv-store
*
* Copyright 2015 Tim Wood, Phil Lopreiato
*
* This program is licensed under the MIT license.
*
* server_kv_run.c - Starts the server
*************************************************/

#include <stdlib.h>
#include <stdio.h>
#include <sys/types.h>
Expand Down
12 changes: 12 additions & 0 deletions server/server-kv.c
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
/************************************************
* GW KV
* https://github.com/gwAdvNet2015/gw-kv-store
*
* Copyright 2015 Tim Wood, Phil Lopreiato
*
* This program is licensed under the MIT license.
*
* server_kv.c - Starts the server and handles
* requests.
*************************************************/

#include <stdlib.h>
#include <stdio.h>
#include <sys/types.h>
Expand Down
12 changes: 12 additions & 0 deletions server/server-kv.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
/************************************************
* GW KV
* https://github.com/gwAdvNet2015/gw-kv-store
*
* Copyright 2015 Tim Wood, Phil Lopreiato
*
* This program is licensed under the MIT license.
*
* server_kv.h - Declares the functions for
* server_kv.c and declares the hash table
*************************************************/

#define MAX_CONCURRENCY 1000

struct pool_list {
Expand Down

0 comments on commit 59263e3

Please sign in to comment.