pike.git/ src/ error.c

1999-04-15

1999-04-15 19:12:51 by Fredrik Hübinette (Hubbe) <hubbe@hubbe.net>

• db40ab31f42424613c97a9f4ce04b14dfca0eaea (33 lines) (+22/-11) ^{[ Show | Annotate ]}
  Branch: 7.9

error() now works when thread is swapped out (I hope)

Rev: src/error.c:1.33
Rev: src/interpret.h:1.30
Rev: src/threads.h:1.65

17:   #include "backend.h"   #include "operators.h"   #include "module_support.h" + #include "threads.h"    - RCSID("$Id: error.c,v 1.32 1999/04/02 15:18:05 hubbe Exp $"); + RCSID("$Id: error.c,v 1.33 1999/04/15 19:12:49 hubbe Exp $");      #undef ATTRIBUTE   #define ATTRIBUTE(X)
110:      struct svalue throw_value = { T_INT };   int throw_severity; -  +    static const char *in_error; -  +  + void low_error(char *buf) + { +  push_error(buf); +  free_svalue(& throw_value); +  throw_value = *--sp; +  throw_severity=THROW_ERROR; +  in_error=0; +  pike_throw(); /* Hope someone is catching, or we will be out of balls. */ + } +    /* FIXME: NOTE: This function uses a static buffer.    * Check sizes of arguments passed!    */   void va_error(const char *fmt, va_list args) ATTRIBUTE((noreturn))   {    char buf[4096]; -  +  SWAP_IN_THREAD_IF_REQUIRED();    if(in_error)    {    const char *tmp=in_error;
146:    if((long)strlen(buf) >= (long)sizeof(buf))    fatal("Buffer overflow in error()\n");    -  push_error(buf); -  free_svalue(& throw_value); -  throw_value = *--sp; -  throw_severity=THROW_ERROR; -  -  in_error=0; -  pike_throw(); /* Hope someone is catching, or we will be out of balls. */ +  low_error(buf);   }      void new_error(const char *name, const char *text, struct svalue *oldsp,
160:   {    int i;    +  ASSERT_THREAD_SWAPPED_IN(); +     if(in_error)    {    const char *tmp=in_error;
320:      #define INIT_ERROR(FEL)\    va_list foo; \ -  struct object *o=low_clone(PIKE_CONCAT(FEL,_error_program)); \ -  va_start(foo,desc); +  struct object *o; \ +  va_start(foo,desc); \ +  ASSERT_THREAD_SWAPPED_IN(); \ +  o=low_clone(PIKE_CONCAT(FEL,_error_program));      #define ERROR_DONE(FOO) \    PIKE_CONCAT(FOO,_error_va(o,func, \