diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MYDDAS: New internal organization and new MYDDAS statistics

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1646 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
tiagosoares 2006-05-22 16:45:07 +00:00
parent f77458e11f
commit 4bf4767073
5 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
C/exec.c
View File

@ -23,8 +23,8 @@ static char SccsId[] = "@(#)cdmgr.c 1.1 05/02/98";
#ifdef CUT_C #ifdef CUT_C
#include "cut_c.h" #include "cut_c.h"
#endif #endif
#if defined CUT_C && (defined MYDDAS_ODBC || defined MYDDAS_MYSQL) #if defined MYDDAS_ODBC || defined MYDDAS_MYSQL
#include "myddas_util.h" #include "myddas.h"
#endif #endif
STATIC_PROTO(Int CallPredicate, (PredEntry *, choiceptr, yamop *)); STATIC_PROTO(Int CallPredicate, (PredEntry *, choiceptr, yamop *));

16
library/MYDDAS/myddas.ypp
View File

@ -142,6 +142,9 @@
'$get_table_name'/2, '$get_table_name'/2,
'$get_values_for_update'/4, '$get_values_for_update'/4,
'$extract_args'/4, '$extract_args'/4,
#ifdef MYDDAS_STATS
'$make_stats_list'/2,
#endif
'$lenght'/2 '$lenght'/2
]). ]).
@ -263,14 +266,16 @@ db_stats(List):-
db_stats(Connection,List):- db_stats(Connection,List):-
'$error_checks'(db_stats(Connection,List)), '$error_checks'(db_stats(Connection,List)),
NumberOfStats = 10, NumberOfStats = 10,
'$make_a_list'(NumberOfStats,List), '$make_a_list'(NumberOfStats,ListX1),
( var(Connection) -> ( var(Connection) ->
c_db_stats(0,List) c_db_stats(0,ListX1)
; ;
get_value(Connection,Conn), get_value(Connection,Conn),
c_db_stats(Conn,List) c_db_stats(Conn,ListX1)
). ),
'$make_stats_list'(ListX1,List).
#ifdef DEBUG
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% db_stats_time(+,-) % db_stats_time(+,-)
% Reference is C pointer (memory reference) % Reference is C pointer (memory reference)
@ -280,8 +285,9 @@ db_stats_time(Reference,Time):-
c_db_stats_time(Reference,Time). c_db_stats_time(Reference,Time).
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
#endif /* DEBUG */
#endif #endif /* MYDDAS_STATS */
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

3
library/MYDDAS/myddas_errors.ypp
View File

@ -146,6 +146,9 @@
% must have only one relation % must have only one relation
'$error_checks'(db_datalog_describe(Relation,_)) :- !, '$error_checks'(db_datalog_describe(Relation,_)) :- !,
nonvar(Relation). nonvar(Relation).
'$error_checks'(db_describe(Connection,Relation,_)) :- !,
atom(Connection),
nonvar(Relation).
'$error_checks'(db_my_show_tables(_)):- !. '$error_checks'(db_my_show_tables(_)):- !.
'$error_checks'(db_is_database_predicate(PredName,Arity,Module)):-!, '$error_checks'(db_is_database_predicate(PredName,Arity,Module)):-!,
nonvar(PredName), nonvar(PredName),

2
library/MYDDAS/myddas_mysql.ypp
View File

@ -100,7 +100,7 @@ db_datalog_describe(Connection,Relation) :-
db_describe(Relation,TableInfo) :- db_describe(Relation,TableInfo) :-
db_describe(myddas,Relation,TableInfo). db_describe(myddas,Relation,TableInfo).
db_describe(Connection,Relation,tableinfo(A1,A2,A3,A4,A5,A6)) :- db_describe(Connection,Relation,tableinfo(A1,A2,A3,A4,A5,A6)) :-
'$error_checks'(db_my_describe(Relation,Connection)), '$error_checks'(db_describe(Relation,Connection,_)),
'$get_value'(Connection,Conn), '$get_value'(Connection,Conn),
'$make_atom'(['DESCRIBE ',Relation],SQL), '$make_atom'(['DESCRIBE ',Relation],SQL),
db_my_result_set(Mode), db_my_result_set(Mode),

7
library/MYDDAS/myddas_util_predicates.ypp
View File

@ -39,6 +39,9 @@
'$build_query'/5, '$build_query'/5,
'$assert_facts'/2, '$assert_facts'/2,
'$lenght'/2, '$lenght'/2,
#ifdef MYDDAS_STATS
'$make_stats_list'/2,
#endif
'$check_list_on_list'/2 '$check_list_on_list'/2
]). ]).
@ -431,3 +434,7 @@
'$member_strick'(Element, Rest). '$member_strick'(Element, Rest).
'$make_stats_list'([],[]).
'$make_stats_list'([Ref|Tail],[Time|Final]):-
c_db_stats_time(Ref,Time),
'$make_stats_list'(Tail,Final).