cvs commit: modperl-2.0/src/modules/perl modperl_error.c modperl_error.h

[stas]

stas        2004/05/03 23:03:52

  Added:       src/modules/perl modperl_error.c modperl_error.h
  Log:
  modperl_error.[ch] is a new home for the error handling code and
  error code extension defines
  
  Revision  Changes    Path
  1.1                  modperl-2.0/src/modules/perl/modperl_error.c
  
  Index: modperl_error.c
  ===================================================================
  /* Copyright 2001-2004 The Apache Software Foundation
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   *
   *     http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
  
  #include "mod_perl.h"
  
  static const char *MP_error_strings[] = {
      "exit was called", /* MODPERL_RC_EXIT */
  };
  
  #define MP_error_strings_size \
      sizeof(MP_error_strings) / sizeof(MP_error_strings[0])
  
  char *modperl_error_strerror(pTHX_ apr_status_t rc)
  {
      char *ptr;
      char buf[256];
          
      if (rc >= APR_OS_START_USERERR &&
          rc < APR_OS_START_USERERR + MP_error_strings_size) {
          /* custom mod_perl errors */
          ptr = (char*)MP_error_strings[(int)(rc - APR_OS_START_USERERR)];
      }
      else {
          /* apache apr errors */
          ptr = apr_strerror(rc, buf, sizeof(buf));
      }
      
          
      /* must copy the string and not return a pointer to the local
       * address */
      return Perl_form(aTHX_ "%s", ptr);
  }
  
  /* croak with $@ as a APR::Error object
   *   rc   - set to apr_status_t value
   *   file - set to the callers filename
   *   line - set to the callers line number
   *   func - set to the function name
   */
  void modperl_croak(pTHX_ apr_status_t rc, const char* func) 
  {
      HV *stash;
      HV *data;
  
      /* XXX: it'd be nice to arrange for it to load early */
      modperl_require_module(aTHX_ "APR::Error", TRUE);
      
      stash = gv_stashpvn("APR::Error", 10, FALSE);
      data = newHV();
      /* $@ = bless {}, "APR::Error"; */
      sv_setsv(ERRSV, sv_bless(newRV_noinc((SV*)data), stash));
  
      sv_setiv(*hv_fetch(data, "rc",   2, 1), rc);
      sv_setpv(*hv_fetch(data, "file", 4, 1), CopFILE(PL_curcop));
      sv_setiv(*hv_fetch(data, "line", 4, 1), CopLINE(PL_curcop));
      sv_setpv(*hv_fetch(data, "func", 4, 1), func);
  
      Perl_croak(aTHX_ Nullch);   
  }
  
  
  
  1.1                  modperl-2.0/src/modules/perl/modperl_error.h
  
  Index: modperl_error.h
  ===================================================================
  /* Copyright 2001-2004 The Apache Software Foundation
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   *
   *     http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
  
  #ifndef MODPERL_ERROR_H
  #define MODPERL_ERROR_H
  
  /* to check whether $@ is set by ModPerl::Util::exit */
  #define MODPERL_RC_EXIT APR_OS_START_USERERR + 0
  
  char *modperl_error_strerror(pTHX_ apr_status_t rc);
          
  void modperl_croak(pTHX_ apr_status_t rc, const char* func);
  
  #define MP_RUN_CROAK(rc_run, func) STMT_START                \
      {                                                        \
          apr_status_t rc = rc_run;                            \
          if (rc != APR_SUCCESS) {                             \
              modperl_croak(aTHX_ rc, func);                   \
          }                                                    \
      } STMT_END
  
  #endif /* MODPERL_ERROR_H */