X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Finit.c;h=b1716250226c7a131bc51180bb425449b2514874;hb=8ff0fd08d6e1cc97cdb7e94b7cd97dc28c29e674;hp=9ce20b9e05500b14a8f49d43f6c0af1da63e1a40;hpb=89abfdf52a35cd78e921bc7b6f44c346ddde9bd4;p=bluesky.git

diff --git a/bluesky/init.c b/bluesky/init.c
index 9ce20b9..b171625 100644
--- a/bluesky/init.c
+++ b/bluesky/init.c
@@ -3,7 +3,29 @@
  * Copyright (C) 2009  The Regents of the University of California
  * Written by Michael Vrable <mvrable@cs.ucsd.edu>
  *
- * TODO: Licensing
+ * 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 University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
  */
 
 #include <stdint.h>
@@ -34,10 +56,12 @@ int bluesky_max_threads = 16;
  */
 int bluesky_watermark_low_dirty    = (64 << 20) / BLUESKY_BLOCK_SIZE;
 int bluesky_watermark_medium_dirty = (96 << 20) / BLUESKY_BLOCK_SIZE;
+int bluesky_watermark_med2_dirty   = (160 << 20) / BLUESKY_BLOCK_SIZE;
 int bluesky_watermark_high_dirty   = (192 << 20) / BLUESKY_BLOCK_SIZE;
 
 int bluesky_watermark_low_total    = (64 << 20) / BLUESKY_BLOCK_SIZE;
 int bluesky_watermark_medium_total = (128 << 20) / BLUESKY_BLOCK_SIZE;
+int bluesky_watermark_med2_total   = (224 << 20) / BLUESKY_BLOCK_SIZE;
 int bluesky_watermark_high_total   = (256 << 20) / BLUESKY_BLOCK_SIZE;
 
 /* Environment variables that can be used to initialize settings. */
@@ -53,6 +77,8 @@ static struct {
     {"BLUESKY_CACHE_SIZE", &bluesky_options.cache_size},
     {"BLUESKY_OPT_FULL_SEGMENTS", &bluesky_options.full_segment_fetches},
     {"BLUESKY_OPT_NO_AGGREGATION", &bluesky_options.disable_aggregation},
+    {"BLUESKY_OPT_NO_CRYPTO", &bluesky_options.disable_crypto},
+    {"BLUESKY_OPT_NO_GROUP_READS", &bluesky_options.disable_read_aggregation},
     {NULL, NULL}
 };