httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From f...@locus.apache.org
Subject cvs commit: apache-2.0/src/ap ap_buckets_simple.c
Date Sat, 19 Aug 2000 06:05:50 GMT
fanf        00/08/18 23:05:50

  Added:       src/ap   ap_buckets_simple.c
  Log:
  Add generic support for reference-counting the resources used by
  buckets, and alter the HEAP and MMAP buckets to use it. Change
  the way buckets are initialised to support changing the type of
  buckets in place, and use it when setting aside TRANSIENT buckets.
  Change the implementation of TRANSIENT buckets so that it can be
  mostly shared with IMMORTAL buckets, which are now implemented.
  
  Reviewed by:    rbb
  
  Revision  Changes    Path
  1.1                  apache-2.0/src/ap/ap_buckets_simple.c
  
  Index: ap_buckets_simple.c
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000 The Apache Software Foundation.  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. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Apache" and "Apache Software Foundation" must
   *    not be used to endorse or promote products derived from this
   *    software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache",
   *    nor may "Apache" appear in their name, without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 APACHE SOFTWARE FOUNDATION OR
   * ITS 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.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  #include "apr_private.h"
  #include "httpd.h"
  #include "ap_buckets.h"
  #include <stdlib.h>
  
  /*
   * We can't simplify this function by using an ap_bucket_make function
   * because we aren't sure of the exact type of this bucket.
   */
  static apr_status_t simple_split(ap_bucket *a, apr_off_t point)
  {
      ap_bucket *b;
      ap_bucket_simple *ad, *bd;
  
      if (point <= 0 || point >= a->length) {
  	return APR_EINVAL;
      }
  
      b = malloc(sizeof(*b)); 
      if (b == NULL) {
  	return APR_ENOMEM;
      }
      bd = malloc(sizeof(*bd));
      if (bd == NULL) {
  	free(b);
  	return APR_ENOMEM;
      }
      *b = *a;
      ad = a->data;
      b->data = bd;
      *bd = *ad;
  
      a->length = point;
      ad->end = ad->start + point;
      b->length -= point;
      bd->start += point;
  
      if (a->next) {
  	a->next->prev = b;
      }
      b->next = a->next;
      b->prev = a;
      a->next = b;
  
      return APR_SUCCESS;
  }
  
  static apr_status_t simple_read(ap_bucket *b, const char **str, 
  				apr_ssize_t *len, int block)
  {
      ap_bucket_simple *bd = b->data;
      *str = bd->start;
      *len = bd->end - bd->start;
      return APR_SUCCESS;
  }
  
  static void simple_destroy(ap_bucket *b)
  {
      free(b->data);
  }
  
  API_EXPORT(ap_bucket *) ap_bucket_make_immortal(ap_bucket *b,
  		const char *buf, apr_size_t length)
  {
      ap_bucket_simple *bd;
  
      bd = malloc(sizeof(*bd));
      if (bd == NULL) {
  	return NULL;
      }
  
      bd->start   = buf;
      bd->end     = buf+length;
  
      b->type     = AP_BUCKET_IMMORTAL;
      b->length   = length;
      b->setaside = NULL;
      b->destroy  = simple_destroy;
      b->split    = simple_split;
      b->read     = simple_read;
      b->data     = bd;
  
      return b;
  }
  
  API_EXPORT(ap_bucket *) ap_bucket_create_immortal(
  		const char *buf, apr_size_t length)
  {
      ap_bucket_do_create(ap_bucket_make_immortal(b, buf, length));
  }
  
  /*
   * XXX: This function could do with some tweaking to reduce memory
   * usage in various cases, e.g. share buffers in the heap between all
   * the buckets that are set aside, or even spool set-aside data to
   * disk if it gets too voluminous (but if it does then that's probably
   * a bug elsewhere). There should probably be a ap_brigade_setaside()
   * function that co-ordinates the action of all the bucket setaside
   * functions to improve memory efficiency.
   */
  static apr_status_t transient_setaside(ap_bucket *b)
  {
      ap_bucket_simple *bd;
      const char *start, *end;
      apr_ssize_t w;
      
      bd = b->data;
      start = bd->start;
      end = bd->end;
      /* XXX: handle small heap buckets */
      b = ap_bucket_make_heap(b, start, end-start, 1, &w);
      if (b == NULL || w != end-start) {
  	return APR_ENOMEM;
      }
      free(bd);
      return APR_SUCCESS;
  }
  
  API_EXPORT(ap_bucket *) ap_bucket_make_transient(ap_bucket *b,
  		const char *buf, apr_size_t length)
  {
      b = ap_bucket_make_immortal(b, buf, length);
      if (b == NULL) {
  	return NULL;
      }
      b->type = AP_BUCKET_TRANSIENT;
      b->setaside = transient_setaside;
      return b;
  }
  
  API_EXPORT(ap_bucket *) ap_bucket_create_transient(
  		const char *buf, apr_size_t length)
  {
      ap_bucket_do_create(ap_bucket_make_transient(b, buf, length));
  }
  
  
  

Mime
View raw message