Menu
▾
▴
[naviserver-commits] naviserver/include ns.h,1.33,1.34
|
From: Stephen D. <sd...@us...> - 2005-07-12 07:32:39
|
Update of /cvsroot/naviserver/naviserver/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20670/include Modified Files: ns.h Log Message: 2005-07-11 Stephen Deasey <sd...@us...> * include/ns.h: * nsd/nsd.h: * nsd/nsmain.c: * nsd/queue.c: * nsd/tclcmds.c: * nsd/proc.c: * nsd/tclinit.c: Add generalised interp tracing mechanism which replaces Ns_TclInitInterps, Ns_TclRegisterDeferred etc. Restructured code for clarity. * nsd/tclset.c: * nsd/tclshare.c: * nsd/tclthread.c: * nsd/adprequest.c: s/NsGetInterp/NsGetInterpData/g * nsd/Makefile: * nsd/connio.c: * nsd/tclatclose.c: Moved at-close traces into tclinit.c. * nsd/tclmisc.c: Move Ns_TclPrintfResult into misc. * nsdb/db.h: * nsdb/nsdb.h: * nslog/nslog.c: * nsperm/nsperm.c: Remove usage of deprecated functions. Index: ns.h =================================================================== RCS file: /cvsroot/naviserver/naviserver/include/ns.h,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** ns.h 12 Jul 2005 03:16:05 -0000 1.33 --- ns.h 12 Jul 2005 07:31:38 -0000 1.34 *************** *** 111,114 **** --- 111,125 ---- #define NS_DRIVER_VERSION_1 1 + /* + * The following are valid Tcl interp traces. + */ + + #define NS_TCL_TRACE_CREATE 0x01 + #define NS_TCL_TRACE_DELETE 0x02 + #define NS_TCL_TRACE_ALLOCATE 0x04 + #define NS_TCL_TRACE_DEALLOCATE 0x08 + #define NS_TCL_TRACE_GETCONN 0x10 + #define NS_TCL_TRACE_FREECONN 0x20 + #if defined(__alpha) typedef long ns_int64; *************** *** 845,849 **** */ ! NS_EXTERN int Ns_TclThread(Tcl_Interp *interp, char *script, Ns_Thread *thrPtr); NS_EXTERN int Ns_TclDetachedThread(Tcl_Interp *interp, char *script); --- 856,861 ---- */ ! NS_EXTERN int Ns_TclThread(Tcl_Interp *interp, char *script, Ns_Thread *thrPtr) ! NS_GNUC_NONNULL(1) NS_GNUC_NONNULL(2); NS_EXTERN int Ns_TclDetachedThread(Tcl_Interp *interp, char *script); *************** *** 1223,1254 **** */ ! NS_EXTERN int Ns_TclInit(Tcl_Interp *interp); ! NS_EXTERN void Ns_TclPrintfResult(Tcl_Interp *interp, char *fmt, ...) NS_GNUC_PRINTF(2, 3); ! NS_EXTERN int Nsd_Init(Tcl_Interp *interp); ! NS_EXTERN int Ns_TclInitInterps(char *server, Ns_TclInterpInitProc *proc, void *arg); ! NS_EXTERN int Ns_TclInitModule(char *server, char *module); ! NS_EXTERN void Ns_TclRegisterDeferred(Tcl_Interp *interp, Ns_TclDeferProc *proc, void *arg); ! NS_EXTERN void Ns_TclMarkForDelete(Tcl_Interp *interp); ! NS_EXTERN Tcl_Interp *Ns_TclCreateInterp(void); ! NS_EXTERN void Ns_TclDestroyInterp(Tcl_Interp *interp); ! NS_EXTERN Tcl_Interp *Ns_TclAllocateInterp(CONST char *server); ! NS_EXTERN void Ns_TclDeAllocateInterp(Tcl_Interp *interp); ! NS_EXTERN char *Ns_TclLibrary(char *server); ! NS_EXTERN char *Ns_TclInterpServer(Tcl_Interp *interp); ! NS_EXTERN Ns_Conn *Ns_TclGetConn(Tcl_Interp *interp); ! NS_EXTERN int Ns_TclRegisterAtCreate(Ns_TclTraceProc *proc, void *arg); ! NS_EXTERN int Ns_TclRegisterAtCleanup(Ns_TclTraceProc *proc, void *arg); ! NS_EXTERN int Ns_TclRegisterAtDelete(Ns_TclTraceProc *proc, void *arg); /* ! * tclop.c: */ NS_EXTERN int Ns_TclRequest(Ns_Conn *conn, char *proc); - NS_EXTERN int Ns_TclEval(Ns_DString *pds, char *server, char *script); - NS_EXTERN char *Ns_TclLogError(Tcl_Interp *interp); - NS_EXTERN char *Ns_TclLogErrorRequest(Tcl_Interp *interp, Ns_Conn *conn); - NS_EXTERN Tcl_Interp *Ns_GetConnInterp(Ns_Conn *conn); - NS_EXTERN void Ns_FreeConnInterp(Ns_Conn *conn); /* --- 1235,1334 ---- */ ! NS_EXTERN int ! Nsd_Init(Tcl_Interp *interp); ! ! NS_EXTERN Tcl_Interp * ! Ns_TclCreateInterp(void); ! ! NS_EXTERN int ! Ns_TclInit(Tcl_Interp *interp) ! NS_GNUC_NONNULL(1); ! ! NS_EXTERN int ! Ns_TclEval(Ns_DString *dsPtr, CONST char *server, CONST char *script) ! NS_GNUC_NONNULL(3); ! ! NS_EXTERN Tcl_Interp * ! Ns_TclAllocateInterp(CONST char *server); ! ! NS_EXTERN void ! Ns_TclDeAllocateInterp(Tcl_Interp *interp) ! NS_GNUC_NONNULL(1); ! ! NS_EXTERN Tcl_Interp * ! Ns_GetConnInterp(Ns_Conn *conn) ! NS_GNUC_NONNULL(1); ! ! NS_EXTERN Ns_Conn * ! Ns_TclGetConn(Tcl_Interp *interp) ! NS_GNUC_NONNULL(1); ! ! NS_EXTERN void ! Ns_TclDestroyInterp(Tcl_Interp *interp) ! NS_GNUC_NONNULL(1); ! ! NS_EXTERN void ! Ns_TclMarkForDelete(Tcl_Interp *interp) ! NS_GNUC_NONNULL(1); ! ! NS_EXTERN int ! Ns_TclRegisterTrace(CONST char *server, Ns_TclTraceProc *proc, void *arg, int when) ! NS_GNUC_NONNULL(1) NS_GNUC_NONNULL(2); ! ! NS_EXTERN char * ! Ns_TclLibrary(CONST char *server); ! ! NS_EXTERN char * ! Ns_TclInterpServer(Tcl_Interp *interp) ! NS_GNUC_NONNULL(1); ! ! NS_EXTERN char * ! Ns_TclLogError(Tcl_Interp *interp) ! NS_GNUC_NONNULL(1); ! ! NS_EXTERN char * ! Ns_TclLogErrorRequest(Tcl_Interp *interp, Ns_Conn *conn) ! NS_GNUC_NONNULL(1) NS_GNUC_NONNULL(2); ! ! NS_EXTERN int ! Ns_TclInitModule(CONST char *server, CONST char *module) ! NS_GNUC_NONNULL(1) NS_GNUC_NONNULL(2); ! ! NS_EXTERN void ! Ns_FreeConnInterp(Ns_Conn *conn) ! NS_GNUC_DEPRECATED; ! ! NS_EXTERN int ! Ns_TclRegisterAtCreate(Ns_TclTraceProc *proc, void *arg) ! NS_GNUC_NONNULL(1) NS_GNUC_DEPRECATED; ! ! NS_EXTERN int ! Ns_TclRegisterAtCleanup(Ns_TclTraceProc *proc, void *arg) ! NS_GNUC_NONNULL(1) NS_GNUC_DEPRECATED; ! ! NS_EXTERN int ! Ns_TclRegisterAtDelete(Ns_TclTraceProc *proc, void *arg) ! NS_GNUC_NONNULL(1) NS_GNUC_DEPRECATED; ! ! NS_EXTERN int ! Ns_TclInitInterps(CONST char *server, Ns_TclInterpInitProc *proc, void *arg) ! NS_GNUC_NONNULL(1) NS_GNUC_NONNULL(2) NS_GNUC_DEPRECATED; ! ! NS_EXTERN void ! Ns_TclRegisterDeferred(Tcl_Interp *interp, Ns_TclDeferProc *proc, void *arg) ! NS_GNUC_NONNULL(1) NS_GNUC_NONNULL(2) NS_GNUC_DEPRECATED; /* ! * tclmisc.c ! */ ! ! NS_EXTERN void Ns_TclPrintfResult(Tcl_Interp *interp, char *fmt, ...) ! NS_GNUC_PRINTF(2, 3); ! ! /* ! * tclrequest.c: */ NS_EXTERN int Ns_TclRequest(Ns_Conn *conn, char *proc); /* *************** *** 1256,1263 **** */ ! NS_EXTERN int Ns_TclEnterSet(Tcl_Interp *interp, Ns_Set *set, int flags); ! NS_EXTERN Ns_Set *Ns_TclGetSet(Tcl_Interp *interp, char *setId); ! NS_EXTERN int Ns_TclGetSet2(Tcl_Interp *interp, char *setId, Ns_Set **setPtrPtr); ! NS_EXTERN int Ns_TclFreeSet(Tcl_Interp *interp, char *setId); /* --- 1336,1347 ---- */ ! NS_EXTERN int Ns_TclEnterSet(Tcl_Interp *interp, Ns_Set *set, int flags) ! NS_GNUC_NONNULL(1) NS_GNUC_NONNULL(2); ! NS_EXTERN Ns_Set *Ns_TclGetSet(Tcl_Interp *interp, char *setId) ! NS_GNUC_NONNULL(1) NS_GNUC_NONNULL(2); ! NS_EXTERN int Ns_TclGetSet2(Tcl_Interp *interp, char *setId, Ns_Set **setPtrPtr) ! NS_GNUC_NONNULL(1) NS_GNUC_NONNULL(2) NS_GNUC_NONNULL(3); ! NS_EXTERN int Ns_TclFreeSet(Tcl_Interp *interp, char *setId) ! NS_GNUC_NONNULL(1) NS_GNUC_NONNULL(2); /* |
