[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/geas configure.in src/collectiondata.c src...
|
From: |
Reinhard Mueller |
|
Subject: |
gnue/geas configure.in src/collectiondata.c src... |
|
Date: |
Wed, 14 Nov 2001 16:17:15 -0500 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Changes by: Reinhard Mueller <address@hidden> 01/11/14 16:17:14
Modified files:
geas : configure.in
geas/src : collectiondata.c geas-server.c geas-server.h
geas-skeleton.c objectlist.c
geas/src/objectcache: objectcache.c
geas/src/objectstore: postgresql.c
Log message:
Removed profiling code.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/configure.in.diff?tr1=1.52&tr2=1.53&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/src/collectiondata.c.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/src/geas-server.c.diff?tr1=1.110&tr2=1.111&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/src/geas-server.h.diff?tr1=1.52&tr2=1.53&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/src/geas-skeleton.c.diff?tr1=1.68&tr2=1.69&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/src/objectlist.c.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/src/objectcache/objectcache.c.diff?tr1=1.59&tr2=1.60&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/src/objectstore/postgresql.c.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
Patches:
Index: gnue/geas/configure.in
diff -u gnue/geas/configure.in:1.52 gnue/geas/configure.in:1.53
--- gnue/geas/configure.in:1.52 Thu Nov 1 12:47:33 2001
+++ gnue/geas/configure.in Wed Nov 14 16:17:13 2001
@@ -25,10 +25,7 @@
dnl Checks for header files.
AC_HEADER_STDC
AC_HEADER_DIRENT
-dnl TODO: we will not need sys/time.h and therefore AC_HEADER_TIME anymore
-dnl as soon as the profiling code in geas-server.c is removed
-AC_HEADER_TIME
-AC_CHECK_HEADERS(limits.h sys/time.h unistd.h getopt.h)
+AC_CHECK_HEADERS(limits.h unistd.h getopt.h)
dnl TODO: need to react somehow on the above tests
AC_CHECK_HEADERS(uuid/uuid.h,,AC_MSG_ERROR('You need the uuid library'))
Index: gnue/geas/src/collectiondata.c
diff -u gnue/geas/src/collectiondata.c:1.30 gnue/geas/src/collectiondata.c:1.31
--- gnue/geas/src/collectiondata.c:1.30 Sun Sep 2 02:49:16 2001
+++ gnue/geas/src/collectiondata.c Wed Nov 14 16:17:14 2001
@@ -19,7 +19,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- $Id: collectiondata.c,v 1.30 2001/09/02 06:49:16 reinhard Exp $
+ $Id: collectiondata.c,v 1.31 2001/11/14 21:17:14 reinhard Exp $
*/
@@ -77,9 +77,6 @@
GList *hacklist = NULL;
ObjectData *hackobj = NULL;
- timer_start_operation( TIMER_LISTS , "Start query: find list of objects" );
-// timer_start_profile( TIMER_FUNC_MAKELIST );
-
if( using_postgresql() )
start_objectstore_transaction();
@@ -99,24 +96,18 @@
}
if( using_postgresql() )
commit_objectstore_transaction();
-// timer_update_profile( TIMER_FUNC_MAKELIST );
- timer_fail_operation( TIMER_LISTS );
return (NULL);
}
- timer_done_operation( TIMER_LISTS );
if (!result)
{
self_test_message ("query failed");
if( using_postgresql() )
commit_objectstore_transaction();
-// timer_update_profile( TIMER_FUNC_MAKELIST );
- timer_fail_operation( TIMER_LISTS );
return (NULL);
}
self_test_message ("query succeeded");
/* place links into collection */
- timer_start_operation( TIMER_LISTS , "place query results in list" );
idx = oql_query_get_field_position (query, "sys_id");
if (idx == (-1))
{
@@ -127,8 +118,6 @@
}
if( using_postgresql() )
commit_objectstore_transaction();
-// timer_update_profile( TIMER_FUNC_MAKELIST );
- timer_fail_operation( TIMER_LISTS );
return (NULL);
}
@@ -138,8 +127,6 @@
{
if( using_postgresql() )
commit_objectstore_transaction();
-// timer_update_profile( TIMER_FUNC_MAKELIST );
- timer_fail_operation( TIMER_LISTS );
return (NULL);
}
// hack_id = g_new0( GEAS_object_reference , 1 );
@@ -156,8 +143,6 @@
printf ("E %s\n", CORBA_exception_id (ev));
if( using_postgresql() )
commit_objectstore_transaction();
-// timer_update_profile( TIMER_FUNC_MAKELIST );
- timer_fail_operation( TIMER_LISTS );
return (NULL);
}
hackobj = oc_find_cached_object_by_key( "geas::listholder" , listid );
@@ -237,8 +222,6 @@
if( using_postgresql() )
commit_objectstore_transaction();
-// timer_update_profile( TIMER_FUNC_MAKELIST );
- timer_done_operation( TIMER_LISTS );
/* printf( "cache stats after list creation: " ); */
/* oc_print_stats(); */
/* printf( "\n" ); */
Index: gnue/geas/src/geas-server.c
diff -u gnue/geas/src/geas-server.c:1.110 gnue/geas/src/geas-server.c:1.111
--- gnue/geas/src/geas-server.c:1.110 Tue Sep 25 15:48:43 2001
+++ gnue/geas/src/geas-server.c Wed Nov 14 16:17:14 2001
@@ -19,7 +19,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- $Id: geas-server.c,v 1.110 2001/09/25 19:48:43 ntiffin Exp $
+ $Id: geas-server.c,v 1.111 2001/11/14 21:17:14 reinhard Exp $
*/
@@ -33,7 +33,6 @@
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include <sys/time.h>
#ifdef USE_GNU_GETOPT
#include <getopt.h>
@@ -151,230 +150,6 @@
#endif
-#ifdef TIMER_TESTING
-static int active_timer_sections[ TIMER_SECTIONS ];
-
-unsigned long int timer_base_seconds;
-
-unsigned long int timer_get_current( void );
-unsigned long int
-timer_get_current( void )
-{
- struct timeval tv;
-
- gettimeofday( &tv , NULL );
- return ((tv.tv_sec-timer_base_seconds)*1000000)+(tv.tv_usec);
-}
-#define us_to_seconds(x) ((float) (x)/1000000.0 )
-
-struct timer_profile
-{
- unsigned long int max,min,total,count,timercount;
- float avg;
-};
-struct timer_profile timer_profiles[ TIMER_FUNC_COUNT ];
-
-void timer_display_profiles( void )
-{
- int i;
- unsigned int unaccounted;
-
- printf( "\n----------------------------------\n"
- "Profiles: (time in seconds to 6dp)\n" );
-
- unaccounted = timer_profiles[ TIMER_FUNC_OPERATION ].total;
-
- for( i=0 ; i<TIMER_FUNC_COUNT ; i++ ) {
- if( timer_profiles[i].count > 0 ) {
- printf( "PROFILE: " );
- switch( i )
- {
- case TIMER_FUNC_MAKEREF : printf( "make ref() : " ); break;
- case TIMER_FUNC_MAKEOID : printf( "make oid() : " ); break;
- case TIMER_FUNC_HANDLERESULTS: printf( "handle results : " ); break;
- case TIMER_FUNC_GETFIELD : printf( "getField() : " ); break;
- case TIMER_FUNC_SETFIELD : printf( "setField() : " ); break;
- case TIMER_FUNC_NEWOBJECT : printf( "newObject() : " ); break;
- case TIMER_FUNC_LOADALL : printf( "loadAll() : " ); break;
- case TIMER_FUNC_MAKEID : printf( "make id : " ); break;
- case TIMER_FUNC_GET_OBJECTS: printf( "_get_objects() : " ); break;
- case TIMER_FUNC_OPERATION : printf( "operation : " ); break;
- case TIMER_FUNC_FIND_BY_KEY: printf( "find by key : " ); break;
- case TIMER_FUNC_FIND_CACHED_BY_KEY: printf( "find cached by key : " );
break;
- case TIMER_FUNC_GET_FIELD : printf( "get field : " ); break;
- case TIMER_FUNC_SET_FIELD : printf( "set field : " ); break;
- case TIMER_FUNC_FLUSH : printf( "flush : " ); break;
- case TIMER_FUNC_TEMP1 : printf( "filling object array: " ); break;
- case TIMER_FUNC_GETENTRY : printf( "getEntry() : " ); break;
- case TIMER_FUNC_LOOKUP : printf( "hash table lookup : " ); break;
- case TIMER_FUNC_EXECQUERY : printf( "exec query : " ); break;
- case TIMER_FUNC_RELEASELIST: printf( "release list : " ); break;
-
- case TIMER_FUNC_A : printf( "temp A : " ); break;
- case TIMER_FUNC_B : printf( "temp B : " ); break;
- case TIMER_FUNC_C : printf( "temp C : " ); break;
- case TIMER_FUNC_D : printf( "temp D : " ); break;
- case TIMER_FUNC_E : printf( "temp E : " ); break;
- case TIMER_FUNC_F : printf( "temp F : " ); break;
- case TIMER_FUNC_G : printf( "temp G : " ); break;
- case TIMER_FUNC_H : printf( "temp H : " ); break;
- case TIMER_FUNC_I : printf( "temp I : " ); break;
- case TIMER_FUNC_J : printf( "temp J : " ); break;
- case TIMER_FUNC_K : printf( "temp K : " ); break;
- case TIMER_FUNC_L : printf( "temp L : " ); break;
- }
- printf( "count:%5lu min:%9.6f avg:%9.6f max:%9.6f tot:%9.6f\n" ,
- timer_profiles[i].count,
- us_to_seconds( timer_profiles[i].min ),
- us_to_seconds( timer_profiles[i].avg ),
- us_to_seconds( timer_profiles[i].max ),
- us_to_seconds( timer_profiles[i].total ) );
- if( i != TIMER_FUNC_OPERATION ) unaccounted -= timer_profiles[i].total;
- }
- timer_profiles[i].count = 0;
- }
- refill_oid_buffer (1024 * 1024);
- oc_print_stats();
-}
-
-void timer_start_profile( int function )
-{
- timer_profiles[function].timercount = timer_get_current();
-}
-
-void timer_update_profile( int function )
-{
- unsigned long int diff;
- diff = timer_get_current() - timer_profiles[function].timercount;
-
- if( function == TIMER_FUNC_OPERATION )
- printf( "diff: %lu max: %lu min:%lu\n" , diff ,
- timer_profiles[function].max ,
- timer_profiles[function].min );
-
- if( timer_profiles[function].count == 0 )
- {
- timer_profiles[function].max = diff;
- timer_profiles[function].min = diff;
- timer_profiles[function].count = 1;
- timer_profiles[function].total = diff;
- timer_profiles[function].avg = diff;
- }
- else
- {
- if( diff > timer_profiles[function].max ) {
- if( function == TIMER_FUNC_OPERATION ) printf( "inc max\n" );
- timer_profiles[function].max = diff;
- }
-
- if( diff < timer_profiles[function].min ) {
- if( function == TIMER_FUNC_OPERATION ) printf( "inc max\n" );
- timer_profiles[function].min = diff;
- }
-
- timer_profiles[function].count++;
- timer_profiles[function].total += diff;
- timer_profiles[function].avg =
- timer_profiles[function].total/timer_profiles[function].count;
- }
-/*
- printf( "PROFILE: " );
- switch( function )
- {
- case TIMER_FUNC_GETFIELD : printf( "getField() : " ); break;
- case TIMER_FUNC_SETFIELD : printf( "setField() : " ); break;
- case TIMER_FUNC_NEWOBJECT : printf( "newObject() : " ); break;
- case TIMER_FUNC_LOADALL : printf( "loadAll() : " ); break;
- case TIMER_FUNC_GET_OBJECTS: printf( "_get_objects() : " ); break;
- case TIMER_FUNC_OPERATION : printf( "operation : " ); break;
- }
- printf( "min: %.6f avg: %.6f max: %.6f\n" ,
- us_to_seconds( timer_profiles[i].max ).
- us_to_seconds( timer_profiles[i].avg ).
- us_to_seconds( timer_profiles[i].min ) );
-*/
-}
-
-struct timeable
-{
- char name[128];
- unsigned long int timeval;
-};
-
-/* statically allocated structure, to avoid memory allocation
- during timing operations */
-#define MAX_TIMEABLE_COUNT 256
-struct timeable timeablestack[ MAX_TIMEABLE_COUNT ];
-static signed int timer_operation_count = (-1);
-
-#define TIMER_INDENT " "
-
-void timer_start_operation( int section , char *fmt , ... )
-{
- int i;
- va_list ap;
-return;
- /* increment stack poitner */
- timer_operation_count++;
-
- /* die if too many nested operations */
- g_assert( timer_operation_count < MAX_TIMEABLE_COUNT );
-
- /* record data on stack */
- va_start (ap, fmt);
- vsnprintf (timeablestack[timer_operation_count].name,128, fmt, ap);
- va_end (ap);
-
- timeablestack[timer_operation_count].timeval = timer_get_current();
-
- /* display start event */
- if( active_timer_sections[section] == 1 ) {
- for( i=0 ; i<timer_operation_count ; i++ )
- printf( TIMER_INDENT );
- printf( "TIMER: START: %s\n" , timeablestack[timer_operation_count].name );
- }
-}
-
-void timer_done_operation( int section )
-{
- unsigned long int diff;
- int i;
-return;
- g_assert( timer_operation_count >= 0 );
-
- if( active_timer_sections[section] == 1 ) {
- diff = timer_get_current() - timeablestack[timer_operation_count].timeval;
- for( i=0 ; i<timer_operation_count ; i++ )
- printf( TIMER_INDENT );
- printf( "TIMER: END : %.6f %s\n" ,
- us_to_seconds(diff) ,
- timeablestack[timer_operation_count].name );
- }
-
- timer_operation_count -= 1;
-}
-
-void timer_fail_operation( int section )
-{
- unsigned long int diff;
- int i;
-return;
- g_assert( timer_operation_count >= 0 );
-
- if( active_timer_sections[section] == 1 ) {
- diff = timer_get_current() - timeablestack[timer_operation_count].timeval;
- for( i=0 ; i<timer_operation_count ; i++ )
- printf( TIMER_INDENT );
- printf( "TIMER: FAIL : %.6f %s\n" ,
- us_to_seconds(diff) ,
- timeablestack[timer_operation_count].name );
- }
-
- timer_operation_count -= 1;
-}
-
-#endif
-
/* Public functions */
/** \brief Main function
@@ -388,10 +163,6 @@
#endif
char *filename = NULL;
FILE *fp = NULL;
-#ifdef TIMER_TESTING
- struct timeval tv;
- int i;
-#endif
PortableServer_POA root_poa;
PortableServer_POAManager pm;
@@ -440,35 +211,6 @@
}
#endif
- /* set up a timer for speed testing */
-#ifdef TIMER_TESTING
- /* select active sections for timing info display */
-
- gettimeofday( &tv , NULL );
- timer_base_seconds = tv.tv_sec;
-
- /* clear all */
- for( i=0 ; i<TIMER_SECTIONS ; i++ )
- active_timer_sections[i] = 0;
-
- for( i=0 ; i<TIMER_FUNC_COUNT ;i++ ) {
- timer_profiles[i].max = 0;
- timer_profiles[i].min = 0;
- timer_profiles[i].total = 0;
- timer_profiles[i].count = 0;
- timer_profiles[i].avg = 0.0;
- }
-
- active_timer_sections[ TIMER_MISC ] = 1;
- active_timer_sections[ TIMER_SKELETON ] = 0;
- active_timer_sections[ TIMER_SKELMISC ] = 0;
- active_timer_sections[ TIMER_CACHE ] = 0;
- active_timer_sections[ TIMER_LISTS ] = 0;
-
-#endif
-
- timer_start_operation(TIMER_MISC,"Server initialisation");
-
/* read command line arguments, including a config file */
readOptions (argc, argv);
@@ -687,7 +429,6 @@
}
/* start server */
- timer_done_operation(TIMER_MISC);
fprintf (stderr, "The GNU Enterprise Application Server is ready.\n");
CORBA_ORB_run (the_orb, &ev);
Index: gnue/geas/src/geas-server.h
diff -u gnue/geas/src/geas-server.h:1.52 gnue/geas/src/geas-server.h:1.53
--- gnue/geas/src/geas-server.h:1.52 Fri Jul 6 00:48:43 2001
+++ gnue/geas/src/geas-server.h Wed Nov 14 16:17:14 2001
@@ -20,7 +20,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- $Id: geas-server.h,v 1.52 2001/07/06 04:48:43 dneighbors Exp $
+ $Id: geas-server.h,v 1.53 2001/11/14 21:17:14 reinhard Exp $
*/
/** \file geas-server.h
@@ -33,70 +33,6 @@
#define GEAS_SERVER_H
#include "classdata.h"
-
-#ifdef TIMER_TESTING
- #define TIMER_MISC 0 /* geas-server.c */
- #define TIMER_SKELETON 1 /* geas-skeleton.c */
- #define TIMER_SKELMISC 2 /* geas-skeleton.c */
- #define TIMER_CACHE 3 /* objectcache/ */
- #define TIMER_LISTS 4 /* collectiondata.c */
- #define TIMER_SECTIONS 20 /* count of sections */
-
- #define TIMER_FUNC_GETFIELD 0
- #define TIMER_FUNC_SETFIELD 1
- #define TIMER_FUNC_NEWOBJECT 2
- #define TIMER_FUNC_LOADALL 3
- #define TIMER_FUNC_GET_OBJECTS 4
-
- #define TIMER_FUNC_FIND_BY_KEY 6
- #define TIMER_FUNC_FIND_CACHED_BY_KEY 7
- #define TIMER_FUNC_GET_FIELD 8
- #define TIMER_FUNC_SET_FIELD 9
- #define TIMER_FUNC_FLUSH 10
- #define TIMER_FUNC_MAKELIST 11
- #define TIMER_FUNC_RELEASELIST 12
- #define TIMER_FUNC_MAKEID 13
- #define TIMER_FUNC_EXECQUERY 14
- #define TIMER_FUNC_HANDLERESULTS 15
- #define TIMER_FUNC_LOOKUP 16
- #define TIMER_FUNC_TEMP1 17
- #define TIMER_FUNC_GETENTRY 18
-
- #define TIMER_FUNC_A 42
- #define TIMER_FUNC_B 43
- #define TIMER_FUNC_C 44
- #define TIMER_FUNC_D 45
- #define TIMER_FUNC_E 46
- #define TIMER_FUNC_F 47
- #define TIMER_FUNC_G 48
- #define TIMER_FUNC_H 49
- #define TIMER_FUNC_I 50
- #define TIMER_FUNC_J 51
- #define TIMER_FUNC_K 52
- #define TIMER_FUNC_L 53
-
- #define TIMER_FUNC_MAKEOID 97
- #define TIMER_FUNC_MAKEREF 98
- #define TIMER_FUNC_OPERATION 99
- #define TIMER_FUNC_COUNT 100
-
-
- void timer_start_operation ( int section , char *name , ... );
- void timer_done_operation ( int section );
- void timer_fail_operation ( int section );
- void timer_start_profile ( int function );
- void timer_update_profile ( int function );
- void timer_display_profiles( void );
-
-#else
- #define timer_start_operation(x, dummy...) /* empty */
- #define timer_done_operation(dummy) /* empty */
- #define timer_fail_operation(dummy) /* empty */
-
- #define timer_start_profile(dummy) /* empty */
- #define timer_update_profile(dummy) /* empty */
- #define timer_display_profiles() /* empty */
-#endif
/** \brief username reserved for the server */
#define SERVER_PRIVATE_USERNAME "server_private_user"
Index: gnue/geas/src/geas-skeleton.c
diff -u gnue/geas/src/geas-skeleton.c:1.68 gnue/geas/src/geas-skeleton.c:1.69
--- gnue/geas/src/geas-skeleton.c:1.68 Sun Jul 22 17:16:45 2001
+++ gnue/geas/src/geas-skeleton.c Wed Nov 14 16:17:14 2001
@@ -19,7 +19,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- $Id: geas-skeleton.c,v 1.68 2001/07/22 21:16:45 reinhard Exp $
+ $Id: geas-skeleton.c,v 1.69 2001/11/14 21:17:14 reinhard Exp $
*/
@@ -123,11 +123,9 @@
GEAS_object_reference *retval = NULL;
/* convert it to an ID */
- timer_start_operation(TIMER_SKELMISC,"get_current_object_reference");
id = PortableServer_POA_servant_to_id (poa, servant, ev);
if (ev->_major != CORBA_NO_EXCEPTION)
{
- timer_fail_operation( TIMER_SKELETON );
return (NULL);
}
@@ -136,12 +134,10 @@
{
if (id)
CORBA_free (id);
- timer_fail_operation( TIMER_SKELMISC );
return (NULL);
}
if (!retval)
{
- timer_fail_operation( TIMER_SKELMISC );
return (NULL);
}
@@ -172,7 +168,6 @@
CORBA_free (id);
/* return new ID data */
- timer_done_operation( TIMER_SKELMISC );
return (retval);
}
@@ -192,17 +187,13 @@
GEAS_ObjectReference retval = NULL;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
- timer_start_operation(TIMER_SKELETON,"Query::Query::_get_id");
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = Query__get_id (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -213,12 +204,10 @@
GEAS_Query_logictype retval = 0;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
@@ -226,7 +215,6 @@
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -237,19 +225,16 @@
{
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return;
}
Constraint__set_logic (id, value, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
}
static void
@@ -259,19 +244,16 @@
{
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return;
}
Constraint_addField (id, field, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
}
static void
@@ -287,19 +269,16 @@
{
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return;
}
Query_release (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
}
static void
@@ -308,19 +287,16 @@
{
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return;
}
Query_clear (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
}
static GEAS_Query_Constraint
@@ -330,19 +306,16 @@
GEAS_Query_Constraint retval;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (CORBA_OBJECT_NIL);
}
retval = Constraint_newConstraint (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return (retval);
}
@@ -353,19 +326,16 @@
GEAS_Query_Constraint retval;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (CORBA_OBJECT_NIL);
}
retval = Constraint_newConstraint (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return (retval);
}
@@ -376,12 +346,10 @@
CORBA_char *retval = NULL;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
@@ -389,7 +357,6 @@
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -400,19 +367,16 @@
{
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return;
}
Query__set_orderby (id, value, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
}
static CORBA_boolean
@@ -422,12 +386,10 @@
CORBA_boolean retval = CORBA_FALSE;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
@@ -435,7 +397,6 @@
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -446,19 +407,16 @@
{
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return;
}
Query__set_reverse (id, value, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
}
static GEAS_Query_logictype
@@ -468,19 +426,16 @@
GEAS_Query_logictype retval = GEAS_Query_UNKNOWN;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = Constraint__get_logic (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return (retval);
}
@@ -491,19 +446,16 @@
{
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return;
}
Constraint__set_logic (id, value, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
}
static CORBA_char *
@@ -513,19 +465,16 @@
CORBA_char *retval = NULL;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = Query__get_classname (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return (retval);
}
@@ -536,19 +485,16 @@
{
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return;
}
Query__set_classname (id, value, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
}
static void
@@ -558,19 +504,16 @@
{
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return;
}
Constraint_addField (id, field, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
}
/* XYZ ------------------------------- */
@@ -582,12 +525,10 @@
CORBA_long retval = 0;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
@@ -595,7 +536,6 @@
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -605,19 +545,16 @@
{
GEAS_object_reference *id = NULL;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return;
}
Admin__set_debuglevel (id, value, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
}
static CORBA_boolean
@@ -627,19 +564,16 @@
CORBA_boolean retval = FALSE;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = Admin__get_verbose (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return (retval);
}
@@ -649,17 +583,14 @@
{
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return;
}
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
}
static void
@@ -668,19 +599,16 @@
{
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return;
}
Admin_restart (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
}
static void
@@ -689,19 +617,16 @@
{
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return;
}
Admin_shutdown (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
}
static CORBA_unsigned_long
@@ -712,17 +637,14 @@
CORBA_unsigned_long retval = 0;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = Connection_countAllInstances (id, classname, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return (retval);
}
@@ -733,19 +655,16 @@
CORBA_char *retval = NULL; /* default value */
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = Connection__get_currentUserID (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return (retval);
}
@@ -756,19 +675,16 @@
GEAS_classnames *retval = NULL;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = Connection__get_classes (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -779,19 +695,16 @@
GEAS_classlist *retval = NULL;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = Connection__get_schema (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -802,19 +715,16 @@
GEAS_Query_Query retval = NULL;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = Connection_newQuery (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -826,12 +736,10 @@
GEAS_ObjectList retval = NULL;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
@@ -840,7 +748,6 @@
allow_oid_refill = TRUE;
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -852,19 +759,16 @@
GEAS_ClassDefinition *retval = NULL;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = Connection_getClassDefinition (id, name, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -876,19 +780,16 @@
GEAS_ClassDefinition *retval = NULL;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = Connection_getFullClassDefinition (id, name, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -901,19 +802,16 @@
GEAS_LookupOptions *retval = NULL;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = Connection_getLookupFieldOptions (id, classname, fieldname, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -925,19 +823,16 @@
CORBA_boolean retval = CORBA_FALSE;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = Connection_supportsFeature (id, featureID, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -953,13 +848,11 @@
GEAS_object_reference *id = NULL;
ObjectData *ob;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
if (allow_oid_refill)
refill_oid_buffer (5);
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
@@ -971,7 +864,6 @@
retval = CORBA_TRUE;
}
- timer_done_operation( TIMER_SKELETON );
#ifdef STUPID_CRAP
printf( "in database :- %s/%s : %d (T:%d F:%d)\n" , id->classname,
id->objectid , retval , CORBA_TRUE,CORBA_FALSE );
{
@@ -992,19 +884,16 @@
GEAS_DataObject retval = CORBA_OBJECT_NIL;
GEAS_object_reference *id = NULL;
- timer_start_operation(TIMER_SKELETON,"newObject(%s)",classname);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = Connection_newObject (id, classname, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -1016,19 +905,16 @@
GEAS_DataObject retval = CORBA_OBJECT_NIL;
GEAS_object_reference *id = NULL;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = Connection_newEmptyList (id, classname, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -1043,12 +929,10 @@
GEAS_ObjectList retval = CORBA_OBJECT_NIL;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
@@ -1057,12 +941,9 @@
allow_oid_refill = TRUE;
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
-int sillytest = 0;
-
static GEAS_ObjectList
impl_GEAS_Connection_loadAll (impl_POA_GEAS_Connection * servant,
CORBA_char * classname, CORBA_Environment * ev)
@@ -1070,37 +951,11 @@
GEAS_ObjectList retval = CORBA_OBJECT_NIL;
GEAS_object_reference *id;
-#ifdef TIMER_TESTING
- /* yet another quick hack - isn't this fun? */
- if( strcmp(classname,"averages") == 0 )
- {
- timer_display_profiles();
- make_ServerError_exception(ev,"not really an error");
- return retval;
- }
- if( strcmp(classname,"start") == 0 )
- {
- sillytest = 1;
- timer_start_profile(TIMER_FUNC_OPERATION);
- make_ServerError_exception(ev,"not really an error");
- return retval;
- }
- if( strcmp(classname,"done") == 0 )
- {
- timer_update_profile(TIMER_FUNC_OPERATION);
- make_ServerError_exception(ev,"not really an error");
- return retval;
- }
-#endif
-
- timer_start_operation(TIMER_SKELETON,"loadAll(%s)",classname);
- timer_start_profile( TIMER_FUNC_LOADALL );
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
@@ -1109,8 +964,6 @@
allow_oid_refill = TRUE;
free_geas_object_reference (id);
- timer_update_profile( TIMER_FUNC_LOADALL );
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -1124,12 +977,10 @@
GEAS_DataObject retval = CORBA_OBJECT_NIL;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
@@ -1137,7 +988,6 @@
Connection_loadSingleObject (id, classname, fieldname, searchvalue, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -1151,19 +1001,16 @@
GEAS_Transaction retval = CORBA_OBJECT_NIL;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = TransactionFactory_new (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -1175,19 +1022,16 @@
GEAS_Transaction retval = CORBA_OBJECT_NIL;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = TransactionFactory_current (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -1209,19 +1053,16 @@
GEAS_Transaction retval = CORBA_OBJECT_NIL;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = TransactionFactory_new (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -1233,19 +1074,16 @@
GEAS_Transaction retval = CORBA_OBJECT_NIL;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = TransactionFactory_current (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -1266,18 +1104,15 @@
{
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return;
}
Transaction_begin (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
}
/* raises: TransactionNotInProgress */
@@ -1287,18 +1122,15 @@
{
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return;
}
Transaction_commit (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
}
/* raises: TransactionNotInProgress */
@@ -1308,18 +1140,15 @@
{
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return;
}
Transaction_abort (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
}
/* raises: TransactionNotInProgress */
@@ -1329,18 +1158,15 @@
{
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return;
}
Transaction_checkpoint (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
}
/* raises: TransactionNotInProgress */
@@ -1350,18 +1176,15 @@
{
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return;
}
Transaction_join (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
}
/* raises: TransactionNotInProgress */
@@ -1371,18 +1194,15 @@
{
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return;
}
Transaction_leave (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
}
/* raises: */
@@ -1393,18 +1213,15 @@
CORBA_boolean retval = CORBA_FALSE;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = Transaction_isOpen (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -1416,7 +1233,6 @@
{
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
if (allow_oid_refill)
@@ -1424,11 +1240,9 @@
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return;
}
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
}
static void
@@ -1437,19 +1251,16 @@
{
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return;
}
Connection_logout (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
}
static GEAS_LoadDefinition *
@@ -1461,19 +1272,16 @@
GEAS_object_reference *id;
GEAS_LoadDefinition *retval = NULL;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = Connection_getReferenceDefinition (id, classname, fieldname, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return (retval);
}
@@ -1483,11 +1291,9 @@
{
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return;
}
@@ -1495,7 +1301,6 @@
free_geas_object_reference (id);
if (allow_oid_refill)
refill_oid_buffer (1024 * 1024);
- timer_done_operation( TIMER_SKELETON );
}
static void
@@ -1504,17 +1309,14 @@
{
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return;
}
Connection_activateEventLog (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
}
static GEAS_Changes *
@@ -1524,17 +1326,14 @@
GEAS_object_reference *id = NULL;
GEAS_Changes *retval = NULL;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = Connection__get_latestChanges (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return (retval);
}
@@ -1546,10 +1345,8 @@
CORBA_boolean retval = CORBA_FALSE;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
@@ -1557,7 +1354,6 @@
strcmp (id->objectid, oid) == 0)
retval = CORBA_TRUE;
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -1569,19 +1365,16 @@
GEAS_ObjectReference retval = NULL;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = DataObject__get_objectID (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -1592,19 +1385,16 @@
CORBA_boolean retval = FALSE;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = DataObject_ofclass (id, classname, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -1615,19 +1405,16 @@
CORBA_char *retval = NULL;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = DataObject__get_classname (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -1638,19 +1425,16 @@
GEAS_classnames *retval = NULL;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = DataObject__get_classes (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -1661,19 +1445,16 @@
GEAS_fieldlist *retval = NULL;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = DataObject__get_allfields (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -1685,19 +1466,16 @@
GEAS_LookupOptions *retval = NULL;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = DataObject_getLookupFieldOptions (id, fieldname, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -1708,19 +1486,16 @@
{
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return;
}
DataObject_setLookupField (id, setting, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
}
static CORBA_char *
@@ -1732,29 +1507,14 @@
trace_functioncall ();
-// if (allow_oid_refill)
-// refill_oid_buffer (5);
-
-//if( sillytest == 0 )
id = get_current_object_reference (servant, servant->poa, ev);
-
timer_start_operation(TIMER_SKELETON,"%s.getField(%s)",id->classname,fieldname);
- timer_start_profile( TIMER_FUNC_GETFIELD );
-
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
-
-//if( sillytest == 0 )
- retval = DataObject_getField (id, fieldname, ev);
-//else
-// retval = CORBA_string_dup("hello there");
-//if( sillytest == 0 )
+ retval = DataObject_getField (id, fieldname, ev);
free_geas_object_reference (id);
- timer_update_profile( TIMER_FUNC_GETFIELD );
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -1765,11 +1525,9 @@
{
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,"setField(%s,%s)",fieldname,value);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return;
}
@@ -1781,7 +1539,6 @@
free_geas_object_reference (id);
trace_functiondone ();
- timer_done_operation( TIMER_SKELETON );
}
static GEAS_DataObject
@@ -1792,18 +1549,15 @@
GEAS_DataObject retval = NULL;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = DataObject_getReference (id, fieldname, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -1814,13 +1568,11 @@
GEAS_ObjectList retval = NULL;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
allow_oid_refill = FALSE;
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
@@ -1828,7 +1580,6 @@
free_geas_object_reference (id);
allow_oid_refill = TRUE;
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -1839,19 +1590,16 @@
{
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return;
}
DataObject_insert (id, fieldname, obj, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
}
static void
@@ -1862,19 +1610,16 @@
{
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return;
}
DataObject_setReference (id, fieldname, obj, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
}
static void
@@ -1883,12 +1628,10 @@
{
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return;
}
@@ -1896,7 +1639,6 @@
refill_oid_buffer (5);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
}
static void
@@ -1905,12 +1647,10 @@
{
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return;
}
@@ -1920,7 +1660,6 @@
refill_oid_buffer (5);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
}
static CORBA_char *
@@ -1932,7 +1671,6 @@
CORBA_char *retval = NULL;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
if (allow_oid_refill)
@@ -1940,14 +1678,12 @@
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = DataObject_callMethod (id, methodname, args, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -1958,7 +1694,6 @@
CORBA_unsigned_long retval = 0;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
if (allow_oid_refill)
@@ -1966,13 +1701,11 @@
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = ObjectList__get_length (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -1983,8 +1716,6 @@
GEAS_objectslist *retval = NULL;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
- timer_start_profile( TIMER_FUNC_GET_OBJECTS );
trace_functioncall ();
if (allow_oid_refill)
@@ -1992,15 +1723,12 @@
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = ObjectList__get_objects (id, ev);
free_geas_object_reference (id);
- timer_update_profile( TIMER_FUNC_GET_OBJECTS );
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -2011,19 +1739,16 @@
CORBA_char *retval = NULL;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = ObjectList__get_classname (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -2035,8 +1760,6 @@
GEAS_DataObject retval = NULL;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
- timer_start_profile(TIMER_FUNC_GETENTRY);
trace_functioncall ();
if (allow_oid_refill)
@@ -2044,16 +1767,12 @@
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
- timer_update_profile(TIMER_FUNC_GETENTRY);
return (retval);
}
retval = ObjectList_getEntry (id, index, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
- timer_update_profile(TIMER_FUNC_GETENTRY);
return retval;
}
@@ -2064,19 +1783,16 @@
{
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return;
}
ObjectList_appendObject (id, obj, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
}
static void
@@ -2086,19 +1802,16 @@
{
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return;
}
ObjectList_removeEntry (id, index, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
}
static void
@@ -2108,19 +1821,16 @@
{
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return;
}
ObjectList_resort (id, fieldname, ascending, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
}
static CORBA_unsigned_long
@@ -2132,19 +1842,16 @@
CORBA_unsigned_long retval = 0;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = ObjectList_hideObjects (id, fieldname, compare, value, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -2157,19 +1864,16 @@
CORBA_unsigned_long retval = 0;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = ObjectList_showObjects (id, fieldname, compare, value, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -2179,17 +1883,14 @@
{
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return;
}
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
}
static CORBA_unsigned_long
@@ -2199,19 +1900,16 @@
CORBA_unsigned_long retval = 0;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = ObjectList_applyFilter (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -2222,19 +1920,16 @@
CORBA_boolean retval = FALSE;
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return (retval);
}
retval = ObjectList__get_delayFilter (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -2245,17 +1940,14 @@
{
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return;
}
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
}
static void
@@ -2264,19 +1956,16 @@
{
GEAS_object_reference *id;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
id = get_current_object_reference (servant, servant->poa, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_fail_operation( TIMER_SKELETON );
return;
}
ObjectList_release (id, ev);
free_geas_object_reference (id);
- timer_done_operation( TIMER_SKELETON );
}
GEAS_ConnectionFactory
@@ -2287,7 +1976,6 @@
impl_POA_GEAS_ConnectionFactory *newservant;
PortableServer_ObjectId *objid;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
newservant = g_new0 (impl_POA_GEAS_ConnectionFactory, 1);
@@ -2298,7 +1986,6 @@
CORBA_free (objid);
retval = PortableServer_POA_servant_to_reference (poa, newservant, ev);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -2308,7 +1995,6 @@
{
PortableServer_ObjectId *objid;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
objid = PortableServer_POA_servant_to_id (servant->poa, servant, ev);
@@ -2325,12 +2011,10 @@
{
GEAS_Connection retval;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
retval = ConnectionFactory_guestLogin (ev);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -2344,11 +2028,9 @@
{
GEAS_Connection retval;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
retval = ConnectionFactory_unsecureLogin (username, password, ev);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -2358,12 +2040,10 @@
{
CORBA_char *retval;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
retval = ConnectionFactory_getAuthenticationKey (username, ev);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -2375,12 +2055,10 @@
{
GEAS_Connection retval;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
retval = ConnectionFactory_getConnection (username, passkey, ev);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -2392,12 +2070,10 @@
{
GEAS_Admin retval;
- timer_start_operation(TIMER_SKELETON,__PRETTY_FUNCTION__);
trace_functioncall ();
retval = ConnectionFactory_adminLogin (username, passkey, ev);
- timer_done_operation( TIMER_SKELETON );
return retval;
}
@@ -2859,12 +2535,10 @@
GEAS_Connection retval = CORBA_OBJECT_NIL;
PortableServer_ObjectId *object_id;
-timer_start_profile( TIMER_FUNC_MAKEOID );
/* create ID */
object_id = PortableServer_string_to_ObjectId ((CORBA_char *) string, ev);
if (ev->_major != CORBA_NO_EXCEPTION)
{
-timer_update_profile( TIMER_FUNC_MAKEOID );
return (CORBA_OBJECT_NIL);
}
@@ -2876,12 +2550,10 @@
corba_classname, ev);
CORBA_free (object_id);
if (ev->_major != CORBA_NO_EXCEPTION) {
- timer_update_profile( TIMER_FUNC_MAKEOID );
return (CORBA_OBJECT_NIL);
}
/* done */
- timer_update_profile( TIMER_FUNC_MAKEOID );
return (retval);
}
@@ -3074,11 +2746,9 @@
while (count < max && oid_count < (OID_BUF_LEN - 1))
{
-// timer_start_profile( TIMER_FUNC_MAKEID );
oid_count++;
count++;
uuid_generate (&oid_buffer[oid_count][0]);
-// timer_update_profile( TIMER_FUNC_MAKEID );
}
debug_output (DEBUGLEVEL_2, "Created %d oids", count);
}
Index: gnue/geas/src/objectcache/objectcache.c
diff -u gnue/geas/src/objectcache/objectcache.c:1.59
gnue/geas/src/objectcache/objectcache.c:1.60
--- gnue/geas/src/objectcache/objectcache.c:1.59 Sun Sep 2 02:49:16 2001
+++ gnue/geas/src/objectcache/objectcache.c Wed Nov 14 16:17:14 2001
@@ -19,7 +19,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- $Id: objectcache.c,v 1.59 2001/09/02 06:49:16 reinhard Exp $
+ $Id: objectcache.c,v 1.60 2001/11/14 21:17:14 reinhard Exp $
*/
#include "config.h"
@@ -135,7 +135,6 @@
void
oc_shrink_cache (unsigned int new_max_length)
{
- timer_start_operation( TIMER_CACHE , __PRETTY_FUNCTION__ );
trace_functioncall ();
/* allow infinite numbers of objects anyway */
@@ -143,7 +142,6 @@
/* this can't extend it */
if (new_max_length >= cache_max_size) {
- timer_fail_operation( TIMER_CACHE);
return;
}
@@ -168,8 +166,6 @@
/* still need space for 1 item in the cache, for reading/writing */
if (cache_max_size < 1)
cache_max_size = 1;
-
- timer_done_operation( TIMER_CACHE );
}
/* ------------------------------------------------------------------------- *\
@@ -178,7 +174,6 @@
void
oc_extend_cache (unsigned int new_max_length)
{
- timer_start_operation( TIMER_CACHE , __PRETTY_FUNCTION__ );
trace_functioncall ();
/* allow infinite numbers of objects anyway */
@@ -195,8 +190,6 @@
cache_max_size = new_max_length;
/* only allocates more space, no need to remove any objects */
-
- timer_done_operation( TIMER_CACHE );
}
/** \brief make space in caxche
@@ -214,7 +207,6 @@
/* allow infinite numbers of objects anyway */
if( cache_max_size == 0 ) return;
- timer_start_operation( TIMER_CACHE , __PRETTY_FUNCTION__ );
trace_functioncall ();
spaces_to_make = 1;
@@ -266,7 +258,6 @@
message ("New cache size: %d objects", objectcache_count);
}
#endif
- timer_done_operation( TIMER_CACHE );
}
/* ------------------------------------------------------------------------- *\
@@ -317,8 +308,6 @@
{
return (obj);
}
- timer_start_operation( TIMER_CACHE , __PRETTY_FUNCTION__ );
- timer_start_profile( TIMER_FUNC_FIND_BY_KEY );
/* not in cache, so load from database */
q = oql_load_object_by_key (classname, key);
@@ -327,8 +316,6 @@
obj = oc_objectstore_query_to_objectcache (q);
}
oql_free_query (q);
- timer_update_profile( TIMER_FUNC_FIND_BY_KEY );
- timer_done_operation( TIMER_CACHE );
return (obj);
}
@@ -342,8 +329,6 @@
char lookup[1024];
char *p;
- timer_start_operation( TIMER_CACHE , __PRETTY_FUNCTION__ );
- timer_start_profile( TIMER_FUNC_FIND_CACHED_BY_KEY );
trace_functioncall ();
if (strncmp (classname, "root::", 6) == 0)
{
@@ -356,17 +341,13 @@
/* find the classname's hash table - if none object can't be in the */
/* cache yet */
// lookup = g_strdup_printf ("%s-%s", p, key);
-timer_start_profile( TIMER_FUNC_LOOKUP );
sprintf( lookup , "%s-%s" , p , key );
obj = g_hash_table_lookup (cachedata, lookup);
-timer_update_profile( TIMER_FUNC_LOOKUP );
//if( !obj ) {
// printf( "not found: '%s'\n" , lookup );
// abort();
//}
// g_free (lookup);
- timer_update_profile( TIMER_FUNC_FIND_CACHED_BY_KEY );
- timer_done_operation( TIMER_CACHE );
return (obj);
}
@@ -386,7 +367,6 @@
/* printf( "adding object: currently %d entries in cache\n" ,
objectcache_count ); */
- timer_start_operation( TIMER_CACHE , __PRETTY_FUNCTION__ );
trace_functioncall ();
/* if there's still any '-' characters, remove them */
@@ -421,7 +401,6 @@
oid = NULL;
if (!obj)
{
- timer_fail_operation( TIMER_CACHE);
return (NULL);
}
/* printf( "created: %08lx > %08lx/%08lx (%s/%s)\n", obj,
@@ -445,7 +424,6 @@
printf ("now has %d entries\n", objectcache_count);
#endif
/* done */
- timer_done_operation( TIMER_CACHE );
return (obj);
}
@@ -459,14 +437,12 @@
/* GList *idxs, *ids; */
/* odl_class *c; */
- timer_start_operation( TIMER_CACHE , __PRETTY_FUNCTION__ );
trace_functioncall ();
obj = g_hash_table_lookup (cachedata, object->hashkey);
if (!obj)
{
/* object wasn't in the cache */
- timer_fail_operation( TIMER_CACHE);
return (FALSE);
}
flushable = g_list_remove (flushable, object);
@@ -485,7 +461,6 @@
/* printf( "objectcache_count = %d\n" , objectcache_count ); */
- timer_done_operation( TIMER_CACHE );
return (TRUE);
}
@@ -511,7 +486,6 @@
int err;
char *errmsg;
- timer_start_operation( TIMER_CACHE , __PRETTY_FUNCTION__ );
trace_functioncall ();
/* remove from cache */
@@ -527,11 +501,9 @@
{
errormsg (errmsg);
g_free (errmsg);
- timer_fail_operation( TIMER_CACHE);
return (FALSE);
}
- timer_done_operation( TIMER_CACHE );
return (TRUE);
}
@@ -581,8 +553,6 @@
struct query_result *r = NULL;
GHashTable *values;
- timer_start_operation( TIMER_CACHE , __PRETTY_FUNCTION__ );
- timer_start_profile( TIMER_FUNC_FLUSH );
trace_functioncall ();
/* TODO: error checking, updating object flags */
@@ -596,7 +566,6 @@
if (r == NULL || r->success != TRUE)
{
free_query_result (r);
- timer_fail_operation( TIMER_CACHE);
return;
}
free_query_result (r);
@@ -607,8 +576,6 @@
printf ("TODO: error handler at %s/%d\n", __FILE__, __LINE__);
exit (0);
}
- timer_update_profile( TIMER_FUNC_FLUSH );
- timer_done_operation( TIMER_CACHE );
}
/* ========================================================================= *\
@@ -669,14 +636,12 @@
/* ObjectData *o = NULL; */
trace_functioncall ();
- timer_start_profile( TIMER_FUNC_GET_FIELD );
flushable = oc_object_to_start_of_list (flushable, object);
/* special case */
if (g_strcasecmp ("sys_id", fieldname) == 0)
{
- timer_update_profile( TIMER_FUNC_GET_FIELD );
return (g_strdup (object->key));
}
/* look for field name in object */
@@ -684,18 +649,15 @@
if (f)
{
/* found in cache, returnm it */
- timer_update_profile( TIMER_FUNC_GET_FIELD );
return (g_strdup (f->value));
}
/* get class and field info */
cl = odl_find_class (all_classes, object->classname, NULL);
if (!cl) {
- timer_update_profile( TIMER_FUNC_GET_FIELD );
return (NULL);
}
ft = odl_class_get_field (cl, fieldname);
if (!ft) {
- timer_update_profile( TIMER_FUNC_GET_FIELD );
return (NULL);
}
switch (odl_field_get_type (ft))
@@ -714,11 +676,9 @@
if (f)
{
/* found in cache, returnm it */
- timer_update_profile( TIMER_FUNC_GET_FIELD );
return (g_strdup (f->value));
}
/* still not found? damn.. */
- timer_update_profile( TIMER_FUNC_GET_FIELD );
return (NULL);
}
}
@@ -740,7 +700,6 @@
q = create_base_query (loadclass);
if (!q)
{
- timer_update_profile( TIMER_FUNC_GET_FIELD );
return (NULL);
}
/* add constraints to find just members of this lookup */
@@ -754,7 +713,6 @@
if (!c)
{
oql_free_query (q);
- timer_update_profile( TIMER_FUNC_GET_FIELD );
return (NULL);
}
o =
@@ -763,7 +721,6 @@
if (!o)
{
oql_free_query (q);
- timer_update_profile( TIMER_FUNC_GET_FIELD );
return (NULL);
}
value = (char *) oc_get_object_field (o, t->data);
@@ -772,7 +729,6 @@
(const char *) s->data))
{
oql_free_query (q);
- timer_update_profile( TIMER_FUNC_GET_FIELD );
return (NULL);
}
s = g_list_next (s);
@@ -784,7 +740,6 @@
criticalerror ("%s.%s has unbalanced field lists",
odl_class_get_full_name (cl), fieldname);
oql_free_query (q);
- timer_update_profile( TIMER_FUNC_GET_FIELD );
return (NULL);
}
if (q)
@@ -803,7 +758,6 @@
{
f->readonly = TRUE;
}
- timer_update_profile( TIMER_FUNC_GET_FIELD );
return (retval);
}
}
@@ -815,7 +769,6 @@
}
/* didn't find it */
- timer_update_profile( TIMER_FUNC_GET_FIELD );
return (NULL);
}
@@ -828,11 +781,9 @@
{
_FieldData *f;
- timer_start_profile( TIMER_FUNC_SET_FIELD );
if (g_strcasecmp ("sys_id", fieldname) == 0)
{
- timer_update_profile( TIMER_FUNC_SET_FIELD );
return (FALSE);
}
f = g_hash_table_lookup (object->fields, fieldname);
@@ -853,7 +804,6 @@
f->value = g_strdup (value);
}
- timer_update_profile( TIMER_FUNC_SET_FIELD );
return FALSE;
}
@@ -870,10 +820,8 @@
odl_class *c;
trace_functioncall ();
- timer_start_profile( TIMER_FUNC_SET_FIELD );
if (g_strcasecmp ("sys_id", fieldname) == 0)
{
- timer_update_profile( TIMER_FUNC_SET_FIELD );
return (FALSE);
}
f = g_hash_table_lookup (object->fields, fieldname);
@@ -894,7 +842,6 @@
/* a readonly field can be set the first time */
if (f->readonly && !system)
{
- timer_update_profile( TIMER_FUNC_SET_FIELD );
return (FALSE);
}
if (readonly)
@@ -973,10 +920,8 @@
oc_free_index_identifier_list (ids);
}
flushable = oc_object_to_start_of_list (flushable, object);
- timer_update_profile( TIMER_FUNC_SET_FIELD );
return (TRUE);
}
- timer_update_profile( TIMER_FUNC_SET_FIELD );
return (FALSE);
}
@@ -1389,22 +1334,18 @@
trace_functioncall ();
// return( NULL ); /* XYZ */
- timer_start_profile( TIMER_FUNC_E );
if (!q)
{
- timer_update_profile( TIMER_FUNC_E );
return (NULL);
}
/* name of class to search for */
if (!q->classes)
{
- timer_update_profile( TIMER_FUNC_E );
return (NULL);
}
classname = q->classes->data;
if (!classname)
{
- timer_update_profile( TIMER_FUNC_E );
return (NULL);
}
if (debuglevel == OC_TEMP_DEBUG)
@@ -1420,9 +1361,7 @@
printf ("OCCACHE: use objectID to search main cache\n");
}
}
- timer_update_profile( TIMER_FUNC_E );
- timer_start_profile( TIMER_FUNC_F );
/* fields to match */
buf = g_string_new (classname);
g_string_append (buf, "/");
@@ -1450,10 +1389,7 @@
{
printf ("OCCACHE: Look in cache '%s'\n", buf->str);
}
- timer_update_profile( TIMER_FUNC_F );
-
- timer_start_profile( TIMER_FUNC_G );
idx = g_hash_table_lookup (indexes, buf->str);
if (!idx)
{
@@ -1461,7 +1397,6 @@
{
/* look in main table */
g_string_free (buf, TRUE);
- timer_update_profile( TIMER_FUNC_G );
return (oc_find_cached_object_by_key (classname, key));
}
if (debuglevel == OC_TEMP_DEBUG)
@@ -1469,15 +1404,11 @@
printf ("could not find index %s\n", buf->str);
}
g_string_free (buf, TRUE);
- timer_update_profile( TIMER_FUNC_G );
return (NULL);
}
g_string_free (buf, TRUE);
- timer_update_profile( TIMER_FUNC_G );
-
/* make appropriate object hash key for finding 'classname' in 'idx' */
- timer_start_profile( TIMER_FUNC_H );
buf = g_string_new ("");
l = idx->index->fields;
while (l)
@@ -1524,16 +1455,13 @@
printf ("OCCACHE: failed\n");
}
g_string_free (buf, TRUE);
- timer_update_profile( TIMER_FUNC_H );
return (NULL);
}
l = g_list_next (l);
}
- timer_update_profile( TIMER_FUNC_H );
/* found an index, now look for the object in that index */
- timer_start_profile( TIMER_FUNC_I );
if (debuglevel == OC_TEMP_DEBUG)
{
printf ("OCCACHE: looking for '%s' in index\n", buf->str);
@@ -1543,12 +1471,10 @@
if (!link)
{
- timer_update_profile( TIMER_FUNC_I );
return (NULL);
}
if (!link->objects)
{
- timer_update_profile( TIMER_FUNC_I );
return (NULL);
}
if (debuglevel == OC_TEMP_DEBUG)
@@ -1556,7 +1482,6 @@
printf ("OCCACHE: found\n");
}
fflush (NULL);
- timer_update_profile( TIMER_FUNC_I );
return (link->objects->data);
}
Index: gnue/geas/src/objectlist.c
diff -u gnue/geas/src/objectlist.c:1.30 gnue/geas/src/objectlist.c:1.31
--- gnue/geas/src/objectlist.c:1.30 Sun Sep 2 02:49:16 2001
+++ gnue/geas/src/objectlist.c Wed Nov 14 16:17:14 2001
@@ -20,7 +20,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- $Id: objectlist.c,v 1.30 2001/09/02 06:49:16 reinhard Exp $
+ $Id: objectlist.c,v 1.31 2001/11/14 21:17:14 reinhard Exp $
*/
@@ -82,7 +82,6 @@
char *classname;
/* get length of list */
-timer_start_profile( TIMER_FUNC_D );
len = ObjectList__get_length (id, ev);
if (ev->_major != CORBA_NO_EXCEPTION)
{
@@ -102,7 +101,6 @@
obj = oc_find_cached_object_by_key( "geas::listholder" , id->listid );
classname = oc_get_object_field( obj , "classname" );
hacklist = oc_get_object_userdata( obj );
-timer_update_profile( TIMER_FUNC_D );
#if 0
xyz
@@ -119,7 +117,6 @@
g_free( classname );
#else
-timer_start_profile( TIMER_FUNC_TEMP1 );
for (i = 0; i < len; i++)
{
GEAS_DataObject xretval = CORBA_OBJECT_NIL;
@@ -128,13 +125,10 @@
char *key, *classname = NULL, *pos;
QueryData *q;
int index = i;
-timer_start_profile( TIMER_FUNC_GETENTRY );
-timer_start_profile( TIMER_FUNC_A );
len = ObjectList__get_length (id, ev);
if (ev->_major != CORBA_NO_EXCEPTION)
{
-timer_update_profile( TIMER_FUNC_GETENTRY );
return (CORBA_OBJECT_NIL);
}
@@ -145,16 +139,13 @@
ob = oc_find_object_by_key ("geas::listholder", id->listid);
classname = oc_get_object_field (ob, "classname");
-timer_update_profile( TIMER_FUNC_A );
/* create query */
-timer_start_profile( TIMER_FUNC_B );
q = oql_load_object ("geas::listitem");
if (!q)
{
make_ServerError_exception (ev, "Could not create query");
g_free (classname);
-timer_update_profile( TIMER_FUNC_B );
return (CORBA_OBJECT_NIL);
}
oql_add_query_constraint (q, NULL, id->listid, "=", "geas::listitem",
@@ -166,16 +157,13 @@
/* WHERE geas::listitem.listid = id->listid AND
* geas::listitem.position = index
*/
-timer_update_profile( TIMER_FUNC_B );
ob = oc_search_for_single_object (q);
if (ob)
{
ObjectData *xyz; /* sensible variable names? this is already a
nasty hack, so why start being sensible now? */
-timer_start_profile( TIMER_FUNC_C );
key = oc_get_object_field (ob, "reference");
-timer_start_profile( TIMER_FUNC_MAKEREF );
xyz = oc_find_object_by_key( classname , key );
@@ -189,20 +177,14 @@
if( oc_get_object_userdata(xyz) == NULL ) printf( "hey!\n" );
}
-
-
-timer_update_profile( TIMER_FUNC_MAKEREF );
g_free (key);
oql_free_query (q);
-timer_update_profile( TIMER_FUNC_C );
-timer_update_profile( TIMER_FUNC_GETENTRY );
/* add object reference to the list */
retval->_buffer[i] = CORBA_Object_duplicate(xretval,ev);
}
}
}
-timer_update_profile( TIMER_FUNC_TEMP1 );
#endif
return (retval);
@@ -231,13 +213,10 @@
int err;
char *errmsg;
int idx;
-timer_start_profile( TIMER_FUNC_GETENTRY );
-timer_start_profile( TIMER_FUNC_A );
len = ObjectList__get_length (id, ev);
if (ev->_major != CORBA_NO_EXCEPTION)
{
-timer_update_profile( TIMER_FUNC_GETENTRY );
return (CORBA_OBJECT_NIL);
}
if (index >= len)
@@ -262,16 +241,13 @@
ob = oc_find_object_by_key ("geas::listholder", id->listid);
classname = oc_get_object_field (ob, "classname");
-timer_update_profile( TIMER_FUNC_A );
/* create query */
-timer_start_profile( TIMER_FUNC_B );
q = oql_load_object ("geas::listitem");
if (!q)
{
make_ServerError_exception (ev, "Could not create query");
g_free (classname);
-timer_update_profile( TIMER_FUNC_B );
return (CORBA_OBJECT_NIL);
}
oql_add_query_constraint (q, NULL, id->listid, "=", "geas::listitem",
@@ -283,22 +259,16 @@
/* WHERE geas::listitem.listid = id->listid AND
* geas::listitem.position = index
*/
-timer_update_profile( TIMER_FUNC_B );
ob = oc_search_for_single_object (q);
if (ob)
{
-timer_start_profile( TIMER_FUNC_C );
key = oc_get_object_field (ob, "reference");
-timer_start_profile( TIMER_FUNC_MAKEREF );
retval =
make_dataobject_reference (classname, key, id->username,
id->sessionid, ev);
-timer_update_profile( TIMER_FUNC_MAKEREF );
g_free (key);
oql_free_query (q);
-timer_update_profile( TIMER_FUNC_C );
-timer_update_profile( TIMER_FUNC_GETENTRY );
return (retval);
}
@@ -327,7 +297,6 @@
free_query_result (result);
}
g_free (classname);
-timer_update_profile( TIMER_FUNC_GETENTRY );
return (CORBA_OBJECT_NIL);
}
idx = oql_query_get_field_position (q, "reference");
@@ -342,7 +311,6 @@
{
g_free (classname);
}
-timer_update_profile( TIMER_FUNC_GETENTRY );
return (retval);
}
@@ -649,13 +617,10 @@
/* QueryData *q; */
struct query_result *result;
- timer_start_profile( TIMER_FUNC_RELEASELIST );
-
ob = oc_find_object_by_key ("geas::listholder", id->listid);
if (!ob)
{
make_ServerError_exception( ev , "list data lost" );
- timer_update_profile( TIMER_FUNC_RELEASELIST );
return;
}
len = oc_get_object_field (ob, "length");
@@ -710,5 +675,4 @@
{
free_query_result (result);
}
- timer_update_profile( TIMER_FUNC_RELEASELIST );
}
Index: gnue/geas/src/objectstore/postgresql.c
diff -u gnue/geas/src/objectstore/postgresql.c:1.12
gnue/geas/src/objectstore/postgresql.c:1.13
--- gnue/geas/src/objectstore/postgresql.c:1.12 Sun Sep 2 02:49:16 2001
+++ gnue/geas/src/objectstore/postgresql.c Wed Nov 14 16:17:14 2001
@@ -20,7 +20,7 @@
along with GEAS; if not, write to the Free Software Foundation, Inc.,
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- $Id: postgresql.c,v 1.12 2001/09/02 06:49:16 reinhard Exp $
+ $Id: postgresql.c,v 1.13 2001/11/14 21:17:14 reinhard Exp $
*/
#include "config.h"
@@ -310,9 +310,7 @@
retry:
tries++;
/* printf( "[%s]\n" , oql_query_as_sql(query,dbtype) ); */
- timer_start_profile( TIMER_FUNC_EXECQUERY );
res = PQexec (conn->handle, oql_query_as_sql (query, dbtype));
- timer_update_profile( TIMER_FUNC_EXECQUERY );
PQerrorcode = PQresultStatus (res);
#if 0
if (PQerrorcode != PGRES_FATAL_ERROR)
@@ -342,7 +340,6 @@
{
/* message ("[ok, data rows expected] rows affected: %d",
result->rows_affected ); */
- timer_start_profile( TIMER_FUNC_HANDLERESULTS );
result->rows_affected = PQntuples (res);
result->field_count = PQnfields (res);
result->success = TRUE;
@@ -379,7 +376,6 @@
if (res != NULL)
PQclear (res);
res = NULL;
- timer_update_profile( TIMER_FUNC_HANDLERESULTS );
}
else
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue/geas configure.in src/collectiondata.c src...,
Reinhard Mueller <=