X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fallocators.h;h=6e4455f0667464bad548564d5b07f3c249043fac;hb=c0345f6e54f5799fdcadd86be1d774b0f4343632;hp=30ed382156d1a2bc01301ecd2174f70a349e7b0f;hpb=addf09c6f6cf93f980f3de9cf649258c965b2934;p=m6w6%2Flibmemcached

diff --git a/libmemcached/allocators.h b/libmemcached/allocators.h
index 30ed3821..6e4455f0 100644
--- a/libmemcached/allocators.h
+++ b/libmemcached/allocators.h
@@ -1,16 +1,49 @@
-/* LibMemcached
- * Copyright (C) 2010 Brian Aker
- * All rights reserved.
+/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ * 
+ *  Libmemcached library
  *
- * Use and distribution licensed under the BSD license.  See
- * the COPYING file in the parent directory for full text.
+ *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *  Copyright (C) 2010 Brian Aker All rights reserved.
  *
- * Summary: work with user defined memory allocators
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *      * Redistributions of source code must retain the above copyright
+ *  notice, this list of conditions and the following disclaimer.
+ *
+ *      * 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.
+ *
+ *      * The names of its contributors may not be used to endorse or
+ *  promote products derived from this software without specific prior
+ *  written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "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 COPYRIGHT
+ *  OWNER OR CONTRIBUTORS 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.
  *
  */
 
-#ifndef __MEMCACHED_ALLOCATORS_H__
-#define __MEMCACHED_ALLOCATORS_H__
+#pragma once
+
+struct memcached_allocator_t {
+  memcached_calloc_fn calloc;
+  memcached_free_fn free;
+  memcached_malloc_fn malloc;
+  memcached_realloc_fn realloc;
+  void *context;
+};
 
 #ifdef __cplusplus
 extern "C" {
@@ -21,7 +54,8 @@ memcached_return_t memcached_set_memory_allocators(memcached_st *ptr,
                                                    memcached_malloc_fn mem_malloc,
                                                    memcached_free_fn mem_free,
                                                    memcached_realloc_fn mem_realloc,
-                                                   memcached_calloc_fn mem_calloc);
+                                                   memcached_calloc_fn mem_calloc,
+                                                   void *context);
 
 LIBMEMCACHED_API
 void memcached_get_memory_allocators(const memcached_st *ptr,
@@ -30,21 +64,24 @@ void memcached_get_memory_allocators(const memcached_st *ptr,
                                      memcached_realloc_fn *mem_realloc,
                                      memcached_calloc_fn *mem_calloc);
 
+LIBMEMCACHED_API
+void *memcached_get_memory_allocators_context(const memcached_st *ptr);
+
 LIBMEMCACHED_LOCAL
-void libmemcached_free(const memcached_st *ptr, void *mem);
+void _libmemcached_free(const memcached_st *ptr, void *mem, void *context);
 
 LIBMEMCACHED_LOCAL
-void *libmemcached_malloc(const memcached_st *ptr, const size_t size);
+void *_libmemcached_malloc(const memcached_st *ptr, const size_t size, void *context);
 
 LIBMEMCACHED_LOCAL
-void *libmemcached_realloc(const memcached_st *ptr, void *mem, const size_t size);
+void *_libmemcached_realloc(const memcached_st *ptr, void *mem, const size_t size, void *context);
 
 LIBMEMCACHED_LOCAL
-void *libmemcached_calloc(const memcached_st *ptr, size_t nelem, size_t size);
+void *_libmemcached_calloc(const memcached_st *ptr, size_t nelem, size_t size, void *context);
 
+LIBMEMCACHED_LOCAL
+struct memcached_allocator_t memcached_allocators_return_default(void);
 
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* __MEMCACHED_ALLOCATORS_H__ */