{
s_indi_private_info *priv_info = __s_indi_get_priv_info(indi_plugin);
Storage *strg_vconf = tcore_server_find_storage(tcore_plugin_ref_server(indi_plugin), S_INDI_VCONF_STORAGE_NAME);
+ if (priv_info == NULL) {
+ err("priv_info is NULL!!!");
+ return;
+ }
s_indi_assert(NULL != strg_vconf);
/** NULL cp_name: subscription independent vconf key */
{
s_indi_private_info *priv_info = __s_indi_get_priv_info(indi_plugin);
Storage *strg_vconf = tcore_server_find_storage(tcore_plugin_ref_server(indi_plugin), S_INDI_VCONF_STORAGE_NAME);
+ if (priv_info == NULL) {
+ err("priv_info is NULL!!!");
+ return;
+ }
s_indi_assert(NULL != strg_vconf);
/** NULL cp_name: subscription independent vconf key */
{
gchar *cp_name = NULL;
s_indi_private_info *priv_info = __s_indi_get_priv_info(indi_plugin);
+ if (priv_info == NULL) {
+ err("priv_info is NULL!!!");
+ return;
+ }
/** @todo: It may be possible to use cp_name without duping as well */
cp_name = s_indi_strdup(tcore_server_get_cp_name_by_plugin(modem_plugin));
{
const char *cp_name = NULL;
s_indi_private_info *priv_info = __s_indi_get_priv_info(indi_plugin);
+ if (priv_info == NULL) {
+ err("priv_info is NULL!!!");
+ return;
+ }
+ s_indi_assert(NULL != priv_info->state_info);
cp_name = tcore_server_get_cp_name_by_plugin(modem_plugin);
s_indi_assert(NULL != cp_name);
- s_indi_assert(NULL != priv_info->state_info);
if (g_hash_table_remove(priv_info->state_info, cp_name))
s_indi_log_ex(cp_name, "Removed");
__s_indi_cb_user_data *cb_data = NULL;
s_indi_cp_state_info_type *state_info = NULL;
s_indi_private_info *priv_info = __s_indi_get_priv_info(indi_plugin);
+ if (priv_info == NULL) {
+ err("priv_info is NULL!!!");
+ return FALSE;
+ }
if ((state_info = g_hash_table_lookup(priv_info->state_info, cp_name)) == NULL) {
warn("CP [%s] Not Present", cp_name);
FILE *pf = NULL;
gchar *rv = NULL;
unsigned long long rx_curr_total = S_INDI_ZERO, tx_curr_total = S_INDI_ZERO, rx_prev_total = S_INDI_ZERO, tx_prev_total = S_INDI_ZERO;
- unsigned long rx_changes_total = S_INDI_ZERO, tx_changes_total = S_INDI_ZERO;
+ unsigned long long rx_changes_total = S_INDI_ZERO, tx_changes_total = S_INDI_ZERO;
s_indi_transfer_state cp_state = S_INDI_TRANSFER_NORMAL; /* Assume no activity */
enum tcore_storage_key key_last_rcv, key_last_snt, key_total_rcv, key_total_snt, key_service_state;
s_indi_private_info *priv_info = __s_indi_get_priv_info(indi_plugin);
Storage *strg_vconf = NULL;
+ if (priv_info == NULL) {
+ err("priv_info is NULL!!!");
+ return G_SOURCE_REMOVE;
+ }
+
/* VCONF Mapper */
if (s_indi_str_has_suffix(cp_name, "0")) {
key_last_rcv = STORAGE_KEY_CELLULAR_PKT_LAST_RCV;
/* Takes care of the fix: Fix the PLM p131003-03182. Sha-ID: 65544f0be8e60ae3f964921755a1e83fa8e71441*/
if ((dev_state = g_hash_table_lookup(state_info->device_info, ifname)) != NULL) {
gint result = S_INDI_ZERO;
- unsigned long rx_pkt = S_INDI_ZERO, tx_pkt = S_INDI_ZERO;
+ unsigned long long rx_pkt = S_INDI_ZERO, tx_pkt = S_INDI_ZERO;
/************************************************************************
Sample Input of S_INDI_PROC_FILE
************************************************************************
eth0: 2714004148 6475059 0 0 0 0 0 0 72595891 8726308 0 0 0 0 0 0
************************************************************************/
s_indi_log_v("Reading stats of interface %s", ifname);
- result = sscanf(entry, "%lu %*s %*s %*s %*s %*s %*s %*s %lu %*s %*s %*s %*s %*s %*s %*s", &rx_pkt, &tx_pkt);
+ result = sscanf(entry, "%llu %*s %*s %*s %*s %*s %*s %*s %llu %*s %*s %*s %*s %*s %*s %*s", &rx_pkt, &tx_pkt);
if (result <= S_INDI_ZERO) {
err("stats fail to get proc field => %d", result);
goto EXIT; /** @todo: REMOVE or CONTINUE ? */
}
}
- rx_changes_total = rx_curr_total - rx_prev_total;
- tx_changes_total = tx_curr_total - tx_prev_total;
+ rx_changes_total = ((rx_curr_total > rx_prev_total) ? (rx_curr_total - rx_prev_total) : S_INDI_ZERO);
+ tx_changes_total = ((tx_curr_total > tx_prev_total) ? (tx_curr_total - tx_prev_total) : S_INDI_ZERO);
if (rx_changes_total)
cp_state |= S_INDI_TRANSFER_RX;
cp_state |= S_INDI_TRANSFER_TX;
if (cp_state > 0)
- s_indi_log_txrx(modem_id, "Transfer State: [%d] RX: [%10lu] TX: [%10lu]", cp_state, rx_changes_total, tx_changes_total);
+ s_indi_log_txrx(modem_id, "Transfer State:[%d] RX: [%llu / %llu] TX: [%llu / %llu]",
+ cp_state, rx_changes_total, rx_curr_total, tx_changes_total, tx_curr_total);
if (state_info->dormant_info.lcd_state < S_INDI_LCD_OFF) {
if (state_info->cp_trans_state != cp_state) { /* New Transfer State */
state_info->cp_trans_state = cp_state;
tcore_storage_set_int(strg_vconf, STORAGE_KEY_PACKET_INDICATOR_STATE, cp_state);
if (cp_state != S_INDI_TRANSFER_NORMAL) { /* Data activity */
- s_indi_log_txrx(modem_id, "pkt_state[%d] rx_changes [%lu] tx_changes [%lu]",
- cp_state, rx_changes_total, tx_changes_total);
- tcore_storage_set_int(strg_vconf, key_last_rcv, rx_curr_total/1000);
- tcore_storage_set_int(strg_vconf, key_last_snt, tx_curr_total/1000);
+ /** @todo: VCONF needs upgrade to support llu */
+ tcore_storage_set_int(strg_vconf, key_last_rcv, (int)(rx_curr_total/1000ULL));
+ tcore_storage_set_int(strg_vconf, key_last_snt, (int)(tx_curr_total/1000ULL));
+
+ s_indi_log_txrx(modem_id, "VCONF LAST- RX: [%d] TX: [%d]", (int)(rx_curr_total/1000ULL), (int)(tx_curr_total/1000ULL));
}
}
}
tcore_storage_set_int(strg_vconf, key_total_rcv, tcore_storage_get_int(strg_vconf, key_total_rcv) + state_info->rx_total);
tcore_storage_set_int(strg_vconf, key_total_snt, tcore_storage_get_int(strg_vconf, key_total_snt) + state_info->tx_total);
+ /* After updating total vconf key, last vconf key needs to be reset */
+ tcore_storage_set_int(strg_vconf, key_last_rcv, 0);
+ tcore_storage_set_int(strg_vconf, key_last_snt, 0);
+
/** @todo: VCONF needs upgrade to support llu */
- s_indi_log_txrx(modem_id, "RX-TOTAL [%d] TX-TOTAL [%d]",
+ s_indi_log_txrx(modem_id, "VCONF TOTAL- RX: [%d] TX: [%d]",
tcore_storage_get_int(strg_vconf, key_total_rcv), tcore_storage_get_int(strg_vconf, key_total_snt));
state_info->rx_total = S_INDI_ZERO;
state_info->tx_total = S_INDI_ZERO;
s_indi_cp_state_info_type *state_info = data;
const char *cp_name = NULL;
Storage *strg_vconf = NULL;
- enum tcore_storage_key key_total_rcv, key_total_snt;
+ enum tcore_storage_key key_last_rcv, key_last_snt, key_total_rcv, key_total_snt;
+ unsigned int modem_id;
s_indi_assert(NULL != state_info);
s_indi_assert(NULL != state_info->co_ps);
/* VCONF Mapper */
if (s_indi_str_has_suffix(cp_name, "0")) {
+ key_last_rcv = STORAGE_KEY_CELLULAR_PKT_LAST_RCV;
+ key_last_snt = STORAGE_KEY_CELLULAR_PKT_LAST_SNT;
key_total_rcv = STORAGE_KEY_CELLULAR_PKT_TOTAL_RCV;
key_total_snt = STORAGE_KEY_CELLULAR_PKT_TOTAL_SNT;
+ modem_id = MODEM_ID_PRIMARY;
} else if (s_indi_str_has_suffix(cp_name, "1")) {
+ key_last_rcv = STORAGE_KEY_CELLULAR_PKT_LAST_RCV2;
+ key_last_snt = STORAGE_KEY_CELLULAR_PKT_LAST_SNT2;
key_total_rcv = STORAGE_KEY_CELLULAR_PKT_TOTAL_RCV2;
key_total_snt = STORAGE_KEY_CELLULAR_PKT_TOTAL_SNT2;
+ modem_id = MODEM_ID_SECONDARY;
} else {
err("Unhandled CP Name %s", cp_name);
s_indi_assert_not_reached();
/* Update VCONF before dying */
tcore_storage_set_int(strg_vconf, key_total_rcv, tcore_storage_get_int(strg_vconf, key_total_rcv) + state_info->rx_total);
tcore_storage_set_int(strg_vconf, key_total_snt, tcore_storage_get_int(strg_vconf, key_total_snt) + state_info->tx_total);
- dbg("CP [%s] RX-TOTAL [%10llu] TX-TOTAL [%10llu]", cp_name,
- tcore_storage_get_int(strg_vconf, key_total_rcv), tcore_storage_get_int(strg_vconf, key_total_snt));
+
+ /* After updating total vconf key, last vconf key needs to be reset */
+ tcore_storage_set_int(strg_vconf, key_last_rcv, 0);
+ tcore_storage_set_int(strg_vconf, key_last_snt, 0);
+
+ s_indi_log_txrx(modem_id, "VCONF TOTAL -RX: [%d] TX: [%d]",
+ tcore_storage_get_int(strg_vconf, key_total_rcv), tcore_storage_get_int(strg_vconf, key_total_snt));
OUT:
s_indi_free(data);
s_indi_assert(NULL != state_info);
/* Update parent before dying */
- state_info->rx_total += dev_state->curr_rx/1000;
- state_info->tx_total += dev_state->curr_tx/1000;
+ state_info->rx_total += dev_state->curr_rx/1000ULL;
+ state_info->tx_total += dev_state->curr_tx/1000ULL;
- s_indi_log_v("DYING after contributing [RX: %lu][TX: %lu] OUT OF [RX: %llu][TX: %llu]",
- dev_state->curr_rx/1000, dev_state->curr_tx/1000,
+ dbg("DYING after contributing [RX: %llu][TX: %llu] OUT OF [RX: %llu][TX: %llu]",
+ dev_state->curr_rx/1000ULL, dev_state->curr_tx/1000ULL,
state_info->rx_total, state_info->tx_total);
s_indi_free(data);
{
GSList *mp_list = tcore_server_get_modem_plugin_list(tcore_plugin_ref_server(indi_plugin));
GSList *tmp;
- s_indi_log_v("Processing %u present modems", g_slist_length(mp_list));
+ dbg("Processing %u present modems", g_slist_length(mp_list));
for (tmp = mp_list; tmp; tmp = tmp->next)
__s_indi_add_modem_plugin(indi_plugin, tmp->data);
s_indi_cp_state_info_type *state_info = NULL;
GVariant *tmp = value;
s_indi_private_info *priv_info = __s_indi_get_priv_info(user_data);
+ if (priv_info == NULL) {
+ err("priv_info is NULL!!!");
+ return;
+ }
s_indi_assert(NULL != tmp);
switch (key) {
case STORAGE_KEY_PM_STATE: {
GHashTableIter iter;
- gpointer key, value;
+ gpointer key_info, value_info;
gint pm_state = S_INDI_ZERO;
if (!g_variant_is_of_type(tmp, G_VARIANT_TYPE_INT32)) {
dbg("PM state Value:[%d]", pm_state);
g_hash_table_iter_init(&iter, priv_info->state_info);
- while (g_hash_table_iter_next(&iter, &key, &value)) {
- state_info = value;
+ while (g_hash_table_iter_next(&iter, &key_info, &value_info)) {
+ state_info = value_info;
state_info->dormant_info.lcd_state = pm_state;
}
}
const char *cp_name = NULL;
s_indi_cp_state_info_type *state_info = NULL;
s_indi_private_info *priv_info = __s_indi_get_priv_info(indi_plugin);
+ if (priv_info == NULL) {
+ err("priv_info is NULL!!!");
+ return TCORE_HOOK_RETURN_CONTINUE;
+ }
cp_name = tcore_server_get_cp_name_by_plugin(tcore_object_ref_plugin(source));
s_indi_assert(NULL != cp_name);
const char *cp_name = NULL;
s_indi_cp_state_info_type *state_info = NULL;
s_indi_private_info *priv_info = __s_indi_get_priv_info(indi_plugin);
+ if (priv_info == NULL) {
+ err("priv_info is NULL!!!");
+ return TCORE_HOOK_RETURN_CONTINUE;
+ }
s_indi_assert(cstatus != NULL);
s_indi_log_ex(cp_name, "cid(%d) state(%d) reason(%d)",
cstatus->context_id, cstatus->state, cstatus->result);
- if (cstatus->state == S_INDI_PS_CALL_OK)
+ if (cstatus->state == S_INDI_PS_CALL_OK) {
+ s_indi_log_ex(cp_name, "PS Call state - [PS_CALL_OK]");
return TCORE_HOOK_RETURN_CONTINUE;
+ }
if ((state_info = g_hash_table_lookup(priv_info->state_info, cp_name)) == NULL) {
warn("BAILING OUT: [%s] not found", cp_name);
gboolean data_allowed = FALSE;
gboolean roaming_allowed = FALSE;
+ s_indi_log_ex(cp_name, "PS Call state - [PS_CALL_CONNECT]");
+
/* Fetch context with internet/tethering role */
l_context = tcore_ps_ref_context_by_id(source, cstatus->context_id);
while (l_context) {
tcore_storage_set_int(strg_vconf, STORAGE_KEY_PACKET_INDICATOR_STATE, S_INDI_TRANSFER_NORMAL);
state_info->cp_trans_state = S_INDI_TRANSFER_NORMAL;
- s_indi_log_ex(cp_name, "PS Call status - [CONNECTED]");
-
/* Create new dev state */
dev_state = __s_indi_alloc_device_state(co_context, state_info);
g_hash_table_insert(state_info->device_info, dev_name, dev_state);
gchar *dev_name = NULL;
GSList *l_context = tcore_ps_ref_context_by_id(source, cstatus->context_id);
+ s_indi_log_ex(cp_name, "PS Call state - [PS_CALL_NO_CARRIER]");
+
/* Remove all related contexts */
while (l_context) {
dev_name = tcore_context_get_ipv4_devname(l_context->data);
S_INDI_NOT_USED(command);
S_INDI_NOT_USED(data_len);
CORE_OBJECT_CHECK_RETURN(source, CORE_OBJECT_TYPE_NETWORK, TCORE_HOOK_RETURN_CONTINUE);
+ if (priv_info == NULL) {
+ err("priv_info is NULL!!!");
+ return TCORE_HOOK_RETURN_CONTINUE;
+ }
cp_name = tcore_server_get_cp_name_by_plugin(tcore_object_ref_plugin(source));
s_indi_assert(NULL != cp_name);
S_INDI_NOT_USED(data);
CORE_OBJECT_CHECK_RETURN(source, CORE_OBJECT_TYPE_CALL, TCORE_HOOK_RETURN_CONTINUE);
+ if (priv_info == NULL) {
+ err("priv_info is NULL!!!");
+ return TCORE_HOOK_RETURN_CONTINUE;
+ }
/* Update all modem states */
g_hash_table_iter_init(&iter, priv_info->state_info);
__s_indi_unregister_vconf_key(STORAGE_KEY_PM_STATE, plugin, NULL);
/* Destroy all watched modems */
+ if (priv_info == NULL) {
+ err("priv_info is NULL!!!");
+ return;
+ }
iter = g_hash_table_get_values(priv_info->state_info);
while (iter) {
state_info = iter->data;
projects / platform / core / telephony / tel-plugin-indicator.git / blobdiff