Commit 8418ca20 authored by Claes Sjofors's avatar Claes Sjofors

Xtt logging scantime min limit 10 ms removed

parent de8ab792
...@@ -186,7 +186,7 @@ XttLogging::~XttLogging() ...@@ -186,7 +186,7 @@ XttLogging::~XttLogging()
**************************************************************************/ **************************************************************************/
int XttLogging::logging_set( int XttLogging::logging_set(
int a_logg_time, float a_logg_time,
char *filename, char *filename,
char *parameter, char *parameter,
char *condition, char *condition,
...@@ -467,7 +467,7 @@ int XttLogging::show_entry( ...@@ -467,7 +467,7 @@ int XttLogging::show_entry(
" Type: Cont\n"); " Type: Cont\n");
(*buff_cnt) += sprintf( buff + *buff_cnt, (*buff_cnt) += sprintf( buff + *buff_cnt,
" Time: %d ms\n", logg_time); " Time: %5.1f ms\n", logg_time);
(*buff_cnt) += sprintf( buff + *buff_cnt, (*buff_cnt) += sprintf( buff + *buff_cnt,
" Buffer: %d pages\n", buffer_size); " Buffer: %d pages\n", buffer_size);
(*buff_cnt) += sprintf( buff + *buff_cnt, (*buff_cnt) += sprintf( buff + *buff_cnt,
...@@ -543,7 +543,7 @@ int XttLogging::store( ...@@ -543,7 +543,7 @@ int XttLogging::store(
fprintf( outfile, "logging set/create/entry=current/file=\"%s\"\n", fprintf( outfile, "logging set/create/entry=current/file=\"%s\"\n",
logg_filename); logg_filename);
if ( logg_time != 0) if ( logg_time != 0)
fprintf( outfile, "logging set/entry=current/time=%d\n", fprintf( outfile, "logging set/entry=current/time=%f\n",
logg_time); logg_time);
fprintf( outfile, "logging set/entry=current/buffer=%d\n", fprintf( outfile, "logging set/entry=current/buffer=%d\n",
wanted_buffer_size); wanted_buffer_size);
...@@ -1014,7 +1014,7 @@ static void *xtt_logproc( void *arg) ...@@ -1014,7 +1014,7 @@ static void *xtt_logproc( void *arg)
break; break;
} }
time_MsToD( &deltatime, logg->logg_time); time_FloatToD( &deltatime, logg->logg_time / 1000);
if ( logg->logg_priority != 0) if ( logg->logg_priority != 0)
sts = logg->set_prio( logg->logg_priority); sts = logg->set_prio( logg->logg_priority);
...@@ -1073,7 +1073,7 @@ static void *xtt_logproc( void *arg) ...@@ -1073,7 +1073,7 @@ static void *xtt_logproc( void *arg)
if ( first_scan) if ( first_scan)
time_float = 0.; time_float = 0.;
/* Print time and the value of the parameter on the file */ /* Print time and the value of the parameter on the file */
char_cnt += logg->log_print( "%11.3f", time_float); char_cnt += logg->log_print( "%12.4f", time_float);
for ( i = 0; i < RTT_LOGG_MAXPAR; i++) for ( i = 0; i < RTT_LOGG_MAXPAR; i++)
{ {
if ( logg->parameterstr[i][0] != 0) if ( logg->parameterstr[i][0] != 0)
......
...@@ -82,7 +82,7 @@ class XttLogging { ...@@ -82,7 +82,7 @@ class XttLogging {
pwr_tAName conditionstr; pwr_tAName conditionstr;
char *condition_ptr; char *condition_ptr;
gdh_tDlid condition_subid; gdh_tDlid condition_subid;
int logg_time; float logg_time;
pwr_tFileName logg_filename; pwr_tFileName logg_filename;
FILE *logg_file; FILE *logg_file;
char old_value[RTT_LOGG_MAXPAR][8]; char old_value[RTT_LOGG_MAXPAR][8];
...@@ -105,7 +105,7 @@ class XttLogging { ...@@ -105,7 +105,7 @@ class XttLogging {
void init( int logg_index, void *logg_xnav); void init( int logg_index, void *logg_xnav);
int logging_set( int logging_set(
int logg_time, float logg_time,
char *filename, char *filename,
char *parameterstr, char *parameterstr,
char *conditionstr, char *conditionstr,
......
...@@ -3148,7 +3148,7 @@ int XNav::show_logging( int index) ...@@ -3148,7 +3148,7 @@ int XNav::show_logging( int index)
flow_eDest_IntoLast, command, 0, brow->pixmap_action); flow_eDest_IntoLast, command, 0, brow->pixmap_action);
new ItemLocal( brow, Lng::translate("Time (ms)"), "logg_Time", new ItemLocal( brow, Lng::translate("Time (ms)"), "logg_Time",
pwr_eType_Int32, sizeof( logg[0].logg_time), 10, 100000, 0, pwr_eType_Float32, sizeof( logg[0].logg_time), 0, 100000, 0,
(void *) &logg[index].logg_time, NULL, flow_eDest_IntoLast); (void *) &logg[index].logg_time, NULL, flow_eDest_IntoLast);
new ItemLocal( brow, Lng::translate("File "), "logg_File", new ItemLocal( brow, Lng::translate("File "), "logg_File",
pwr_eType_String, sizeof( logg[0].logg_filename), 0, 0, 0, pwr_eType_String, sizeof( logg[0].logg_filename), 0, 0, 0,
......
...@@ -5591,7 +5591,7 @@ static int xnav_logging_func( void *client_data, ...@@ -5591,7 +5591,7 @@ static int xnav_logging_func( void *client_data,
int entry; int entry;
int line_size; int line_size;
char *parameter_ptr; char *parameter_ptr;
int logg_time; float logg_time;
char *file_ptr; char *file_ptr;
char *condition_ptr; char *condition_ptr;
int buffer_size; int buffer_size;
...@@ -5632,7 +5632,7 @@ static int xnav_logging_func( void *client_data, ...@@ -5632,7 +5632,7 @@ static int xnav_logging_func( void *client_data,
if ( ODD( dcli_get_qualifier( "/TIME", time_str, sizeof(time_str)))) if ( ODD( dcli_get_qualifier( "/TIME", time_str, sizeof(time_str))))
{ {
/* convert to integer */ /* convert to integer */
nr = sscanf( time_str, "%d", &logg_time); nr = sscanf( time_str, "%f", &logg_time);
if ( nr != 1) if ( nr != 1)
{ {
xnav->message('E', "Time syntax error"); xnav->message('E', "Time syntax error");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment