diff --git a/src/lib/dtt/src/dtt_appl_rttsys_p46.dtt b/src/lib/dtt/src/dtt_appl_rttsys_p46.dtt index c451011a84e2e110f31b016640098c63be177eda..4a115eb3f04664ad3dba59fb661818f5bf826dfd 100644 --- a/src/lib/dtt/src/dtt_appl_rttsys_p46.dtt +++ b/src/lib/dtt/src/dtt_appl_rttsys_p46.dtt @@ -21,31 +21,31 @@ 32 0 0 113 0 0 0 113 0 0 0 0 0 0 0 0 0 0 0 0 0 32 32 0 0 113 0 0 0 113 0 0 0 0 0 0 0 0 0 0 0 0 0 32 32 0 0 113 0 0 0 113 0 0 0 0 0 0 0 0 0 0 0 0 0 32 -32 120 120 110 120 120 120 118 0 0 0 0 0 0 0 0 0 0 0 0 0 32 -32 32 0 113 0 0 0 113 0 0 0 0 0 0 0 0 0 0 0 0 0 32 -32 73 115 113 0 0 0 113 0 0 0 0 0 0 0 0 0 0 0 0 0 82 -32 110 105 113 0 0 0 113 0 0 0 0 0 0 0 0 0 0 0 0 0 69 -32 105 122 113 0 0 0 113 0 0 0 0 0 0 0 0 0 0 0 0 0 84 -32 116 101 113 0 0 0 113 0 0 0 0 0 0 0 0 0 0 0 0 0 85 -32 105 0 113 0 0 0 113 0 0 0 0 0 0 0 0 0 0 0 0 0 82 -32 97 0 113 0 0 0 113 0 0 0 0 0 0 0 0 0 0 0 0 0 78 -80 108 0 113 0 0 0 113 0 0 0 0 0 0 0 0 0 0 0 0 0 32 -79 0 0 113 0 0 0 113 0 0 0 0 0 0 0 0 0 0 0 0 0 83 -79 0 0 113 0 0 0 113 0 0 0 0 0 0 0 0 0 0 0 0 0 104 -76 0 0 113 0 0 0 113 0 0 0 0 0 0 0 0 0 0 0 0 0 111 -83 120 120 110 120 120 120 118 0 0 0 0 0 0 0 0 0 0 0 0 0 119 -32 0 0 113 0 0 0 113 0 0 0 0 0 0 0 0 0 0 0 0 0 32 -32 69 115 113 0 0 0 113 0 0 0 0 0 0 0 0 0 0 0 0 0 112 -32 120 105 113 0 0 0 113 0 0 0 0 0 0 0 0 0 0 0 0 0 111 -32 116 122 113 0 0 0 113 0 0 0 0 0 0 0 0 0 0 0 0 0 111 -32 101 101 113 0 0 0 113 0 0 0 0 0 0 0 0 0 0 0 0 0 108 -32 110 0 113 0 0 0 113 0 0 0 0 0 0 0 0 0 0 0 0 0 32 -32 100 0 113 0 0 0 113 0 0 0 0 0 0 0 0 0 0 0 0 0 32 -32 101 0 113 0 0 0 113 0 0 0 0 0 0 0 0 0 0 0 0 0 32 -32 100 0 113 0 0 0 113 0 0 0 0 0 0 0 0 0 0 0 0 0 32 -32 0 0 113 0 0 0 113 0 0 0 0 0 0 0 0 0 0 0 0 0 32 -32 0 0 113 0 0 0 113 0 0 0 0 0 0 0 0 0 0 0 0 0 32 -32 120 120 110 120 120 120 118 0 0 0 0 0 0 0 0 0 0 0 0 0 32 +32 120 120 110 120 120 120 118 108 120 116 120 120 120 109 0 0 0 0 0 0 32 +32 32 0 113 0 0 0 113 113 0 113 0 0 0 113 0 0 0 0 0 0 32 +32 73 115 113 0 0 0 113 113 70 113 0 0 0 113 0 0 0 0 0 0 82 +32 110 105 113 0 0 0 113 113 114 113 0 0 0 113 0 0 0 0 0 0 69 +32 105 122 113 0 0 0 113 113 101 113 0 0 0 113 0 0 0 0 0 0 84 +32 116 101 113 0 0 0 113 113 101 113 0 0 0 113 0 0 0 0 0 0 85 +32 105 0 113 0 0 0 113 113 0 113 0 0 0 113 0 0 0 0 0 0 82 +32 97 0 113 0 0 0 113 113 0 113 0 0 0 113 0 0 0 0 0 0 78 +80 108 0 113 0 0 0 113 113 0 113 0 0 0 113 0 0 0 0 0 0 32 +79 0 0 113 0 0 0 113 113 0 113 0 0 0 113 0 0 0 0 0 0 83 +79 0 0 113 0 0 0 113 113 0 113 0 0 0 113 0 0 0 0 0 0 104 +76 0 0 113 0 0 0 113 113 0 113 0 0 0 113 0 0 0 0 0 0 111 +83 120 120 110 120 120 120 118 119 120 110 120 120 120 118 0 0 0 0 0 0 119 +32 0 0 113 0 0 0 113 113 0 113 0 0 0 113 0 0 0 0 0 0 32 +32 69 115 113 0 0 0 113 113 70 113 0 0 0 113 0 0 0 0 0 0 112 +32 120 105 113 0 0 0 113 113 114 113 0 0 0 113 0 0 0 0 0 0 111 +32 116 122 113 0 0 0 113 113 101 113 0 0 0 113 0 0 0 0 0 0 111 +32 101 101 113 0 0 0 113 113 101 113 0 0 0 113 0 0 0 0 0 0 108 +32 110 0 113 0 0 0 113 113 32 113 0 0 0 113 0 0 0 0 0 0 32 +32 100 0 113 0 0 0 113 113 40 113 0 0 0 113 0 0 0 0 0 0 32 +32 101 0 113 0 0 0 113 113 37 113 0 0 0 113 0 0 0 0 0 0 32 +32 100 0 113 0 0 0 113 113 41 113 0 0 0 113 0 0 0 0 0 0 32 +32 0 0 113 0 0 0 113 113 0 113 0 0 0 113 0 0 0 0 0 0 32 +32 0 0 113 0 0 0 113 113 0 113 0 0 0 113 0 0 0 0 0 0 32 +32 120 120 110 120 120 120 118 107 120 117 120 120 120 106 0 0 0 0 0 0 32 32 0 0 113 0 0 0 113 0 0 0 0 0 0 0 0 0 0 0 0 0 32 32 84 115 113 0 0 0 113 0 0 0 0 0 0 0 0 0 0 0 0 0 32 32 111 105 113 0 0 0 113 0 0 0 0 0 0 0 0 0 0 0 0 0 32 @@ -101,31 +101,31 @@ 2 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 2 2 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 2 2 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 2 -2 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 2 -2 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 2 -2 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 2 -2 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 2 -2 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 2 -2 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 2 -2 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 2 -2 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 2 -2 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 2 -2 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 2 -2 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 2 -2 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 2 -2 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 2 -2 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 2 -2 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 2 -2 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 2 -2 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 2 -2 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 2 -2 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 2 -2 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 2 -2 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 2 -2 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 2 -2 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 2 -2 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 2 -2 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 2 +2 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 2 +2 0 0 1 0 0 0 1 1 0 1 0 0 0 1 0 0 0 0 0 0 2 +2 0 0 1 0 0 0 1 1 0 1 0 0 0 1 0 0 0 0 0 0 2 +2 0 0 1 0 0 0 1 1 0 1 0 0 0 1 0 0 0 0 0 0 2 +2 0 0 1 0 0 0 1 1 0 1 0 0 0 1 0 0 0 0 0 0 2 +2 0 0 1 0 0 0 1 1 0 1 0 0 0 1 0 0 0 0 0 0 2 +2 0 0 1 0 0 0 1 1 0 1 0 0 0 1 0 0 0 0 0 0 2 +2 0 0 1 0 0 0 1 1 0 1 0 0 0 1 0 0 0 0 0 0 2 +2 0 0 1 0 0 0 1 1 0 1 0 0 0 1 0 0 0 0 0 0 2 +2 0 0 1 0 0 0 1 1 0 1 0 0 0 1 0 0 0 0 0 0 2 +2 0 0 1 0 0 0 1 1 0 1 0 0 0 1 0 0 0 0 0 0 2 +2 0 0 1 0 0 0 1 1 0 1 0 0 0 1 0 0 0 0 0 0 2 +2 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 2 +2 0 0 1 0 0 0 1 1 0 1 0 0 0 1 0 0 0 0 0 0 2 +2 0 0 1 0 0 0 1 1 0 1 0 0 0 1 0 0 0 0 0 0 2 +2 0 0 1 0 0 0 1 1 0 1 0 0 0 1 0 0 0 0 0 0 2 +2 0 0 1 0 0 0 1 1 0 1 0 0 0 1 0 0 0 0 0 0 2 +2 0 0 1 0 0 0 1 1 0 1 0 0 0 1 0 0 0 0 0 0 2 +2 0 0 1 0 0 0 1 1 0 1 0 0 0 1 0 0 0 0 0 0 2 +2 0 0 1 0 0 0 1 1 0 1 0 0 0 1 0 0 0 0 0 0 2 +2 0 0 1 0 0 0 1 1 0 1 0 0 0 1 0 0 0 0 0 0 2 +2 0 0 1 0 0 0 1 1 0 1 0 0 0 1 0 0 0 0 0 0 2 +2 0 0 1 0 0 0 1 1 0 1 0 0 0 1 0 0 0 0 0 0 2 +2 0 0 1 0 0 0 1 1 0 1 0 0 0 1 0 0 0 0 0 0 2 +2 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 2 2 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 2 2 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 2 2 0 0 1 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 2 @@ -252,6 +252,36 @@ Database USER Declaration INT x,y 70 4 ------------------------------------------------------------------- +Number 7 +Text "%" +Type UPDATE +Parameter POOLS_FREESIZE1 +Text/Dualpar "" +Privileges NO +Outputflags +Characters 11 +Decimals 0 +MaxLimit 0.000000 +MinLimit 0.000000 +Database RTTSYS +Declaration INT +x,y 24 11 +------------------------------------------------------------------- +Number 8 +Text "%" +Type UPDATE +Parameter POOLS_FREE1 +Text/Dualpar "" +Privileges NO +Outputflags +Characters 7 +Decimals 2 +MaxLimit 0.000000 +MinLimit 0.000000 +Database RTTSYS +Declaration FLOAT +x,y 37 11 +------------------------------------------------------------------- Number 11 Text " " Type UPDATE @@ -342,6 +372,36 @@ Database USER Declaration INT x,y 70 5 ------------------------------------------------------------------- +Number 17 +Text "%" +Type UPDATE +Parameter POOLS_FREESIZE2 +Text/Dualpar "" +Privileges NO +Outputflags +Characters 11 +Decimals 0 +MaxLimit 0.000000 +MinLimit 0.000000 +Database RTTSYS +Declaration INT +x,y 24 12 +------------------------------------------------------------------- +Number 18 +Text "%" +Type UPDATE +Parameter POOLS_FREE2 +Text/Dualpar "" +Privileges NO +Outputflags +Characters 7 +Decimals 2 +MaxLimit 0.000000 +MinLimit 0.000000 +Database RTTSYS +Declaration FLOAT +x,y 37 12 +------------------------------------------------------------------- Number 21 Text " " Type UPDATE @@ -432,6 +492,36 @@ Database USER Declaration INT x,y 70 6 ------------------------------------------------------------------- +Number 27 +Text "%" +Type UPDATE +Parameter POOLS_FREESIZE3 +Text/Dualpar "" +Privileges NO +Outputflags +Characters 11 +Decimals 0 +MaxLimit 0.000000 +MinLimit 0.000000 +Database RTTSYS +Declaration INT +x,y 24 13 +------------------------------------------------------------------- +Number 28 +Text "%" +Type UPDATE +Parameter POOLS_FREE3 +Text/Dualpar "" +Privileges NO +Outputflags +Characters 7 +Decimals 2 +MaxLimit 0.000000 +MinLimit 0.000000 +Database RTTSYS +Declaration FLOAT +x,y 37 13 +------------------------------------------------------------------- Number 202 Text "%" Type UPDATE diff --git a/src/lib/dtt/src/dtt_rttsys.c b/src/lib/dtt/src/dtt_rttsys.c index ef2ea35c87ce1b7d1010d828c87adc36195a342d..b6d444b11e756f0509c3a577a37c0056ee145279 100644 --- a/src/lib/dtt/src/dtt_rttsys.c +++ b/src/lib/dtt/src/dtt_rttsys.c @@ -11231,6 +11231,8 @@ int RTTSYS_POOLS( menu_ctx ctx, int i, j; pool_sGhead *pool; int num; + int total_size; + int free_size; IF_NOQCOM_RETURN; @@ -11268,17 +11270,17 @@ int RTTSYS_POOLS( menu_ctx ctx, menu_ptr++; /* Extend size */ - *(int *)menu_ptr->value_ptr = pool->extendsize * POOL_SSIZE; + *(int *)menu_ptr->value_ptr = pool->extendsize * POOL_SSIZE; menu_ptr++; /* Total size */ - *(int *)menu_ptr->value_ptr = 0; - for ( i = 0; i < pool_cSegs; i++) - { + total_size = pool->initsize * POOL_SSIZE; + for ( i = 1; i < pool_cSegs; i++) { if ( pool->seg[i].generation == 0) break; - *(int *)menu_ptr->value_ptr += pool->seg[i].fragsize * POOL_SSIZE; + total_size += pool->extendsize * POOL_SSIZE; } + *(int *)menu_ptr->value_ptr = total_size; menu_ptr++; /* Generation */ @@ -11286,6 +11288,20 @@ int RTTSYS_POOLS( menu_ctx ctx, /* Lookaside index */ menu_ptr++; + + /* Free size */ + free_size = 0; + for ( i = 0; i < pool_cSegs; i++) { + if ( pool->seg[i].generation == 0) + break; + free_size += pool->seg[i].fragsize * POOL_SSIZE; + } + *(int *)menu_ptr->value_ptr = free_size; + menu_ptr++; + + /* Free percentage */ + *(float *) menu_ptr->value_ptr = (float) free_size / total_size * 100; + menu_ptr++; } return RTT__SUCCESS; @@ -11349,13 +11365,13 @@ int RTTSYS_POOLS( menu_ctx ctx, menu_ptr++; /* Total size */ - *(int *)menu_ptr->value_ptr = 0; - for ( i = 0; i < pool_cSegs; i++) - { + total_size = pool->initsize * POOL_SSIZE; + for ( i = 1; i < pool_cSegs; i++) { if ( pool->seg[i].generation == 0) break; - *(int *)menu_ptr->value_ptr += pool->seg[i].fragsize * POOL_SSIZE; + total_size += pool->extendsize * POOL_SSIZE; } + *(int *)menu_ptr->value_ptr = total_size; menu_ptr++; /* Generation */ @@ -11365,6 +11381,20 @@ int RTTSYS_POOLS( menu_ctx ctx, /* Lookaside index */ menu_ptr->value_ptr = (char *) &pool->la_idx; menu_ptr++; + + /* Free size */ + free_size = 0; + for ( i = 0; i < pool_cSegs; i++) { + if ( pool->seg[i].generation == 0) + break; + free_size += pool->seg[i].fragsize * POOL_SSIZE; + } + *(int *)menu_ptr->value_ptr = free_size; + menu_ptr++; + + /* Free percentage */ + *(float *)menu_ptr->value_ptr = (float) free_size / total_size * 100; + menu_ptr++; } break; @@ -12228,4 +12258,4 @@ int rttsys_get_login_picture( rtt_t_backgr **picture) { *picture = (rtt_t_backgr *) &dtt_systempicture_p38_bg; return RTT__SUCCESS; -} \ No newline at end of file +}