fix(ncm): 缓存命中改单请求出参,移除全局命中计数(评审 P2-2/P2-1)
问题(P2-2):离线判定用 `ncm_apicache_hits()` 前后差值判「本次是否缓存命中」—— ①其它 worker 的命中会污染差值 → 误判「已回在线」;②盘缓存分支的 g_hits++ 在 g_mu 锁外, 跨线程自增/64 位读存在竞争与撕裂可能。 修法(出参方案): - `api_post_cached(..., int *from_cache)`:命中置 1(未走网络),miss/失败为 0; 四个调用点显式传参。 - 新增 `ncm_api_user_playlist_ex(..., int *out_from_cache)`;out_n 与原接口一致**必填** (NULL→NCM_ERR_ARG,修入口容忍 NULL、成功路径却无条件解引用的契约不一致,评审 P2-1); out_from_cache 可 NULL。旧 `ncm_api_user_playlist` 为薄包装(调用方零改动)。 - `appstate_load_playlists_ex` 透传该标志;home_worker 用本次请求的 from_cache 判定是否 回在线;歌单页只在失败时同步离线态(成功可能是缓存命中,不据此清离线)。 - 删除 `ncm_apicache_hits()`/g_hits(无使用者,同时消除数据竞争);盘缓存命中分支两行 合并为一行(行为不变,重构)。 - 测试:session_gate_sim 新增 D2 五例(miss→0 且真网络 +1 次 / 命中→1 且 0 请求 / 失败→0 / 兼容入口不崩 / out_n 必填契约);playlist_race_sim、plpage_sim 补 `_ex` 桩。 验证:session_gate_sim 88 PASS/0 FAIL;test_ncm_core_host 139 PASS/0 FAIL; http_truncate_sim 13 PASS/0 FAIL;核心 13 TU(-Wall -Wextra)0 warning。
This commit is contained in:
1 parent
b1d607d43f
commit
31879f3302
12 files changed
+134
-49
No files matched your search
@@ -259,8 +259,11 @@ int appstate_ensure_uid(void)
|
||||
* 之间的发布点。持久化(playlists.bin)同单写者(home worker)在发布后读,无相互竞态。 */
|
||||
static pthread_mutex_t g_pls_mu = PTHREAD_MUTEX_INITIALIZER;
|
||||
|
||||
int appstate_load_playlists(void)
|
||||
/* from_cache(可 NULL):透传 ncm_api_user_playlist_ex 的「本次是否接口缓存命中」。
|
||||
* 仅真正走网络成功时才应把 App 判为在线(M9 评审 P2-2:缓存命中不代表网络恢复)。 */
|
||||
int appstate_load_playlists_ex(int *from_cache)
|
||||
{
|
||||
if (from_cache) *from_cache = 0;
|
||||
if (!g_st.logged_in) return NCM_ERR_AUTH;
|
||||
int rc = appstate_ensure_uid();
|
||||
if (rc != NCM_OK) return rc;
|
||||
@@ -273,8 +276,9 @@ int appstate_load_playlists(void)
|
||||
* 单飞),免 96KB 栈。 */
|
||||
static ncm_playlist_t s_pls[NCM_PLAYLIST_MAX];
|
||||
int n = 0;
|
||||
int rc2 = ncm_api_user_playlist(g_st.ctx.device_id, g_st.ctx.cookie, g_st.uid,
|
||||
NCM_PLAYLIST_MAX, 0, s_pls, NCM_PLAYLIST_MAX, &n);
|
||||
int rc2 = ncm_api_user_playlist_ex(g_st.ctx.device_id, g_st.ctx.cookie, g_st.uid,
|
||||
NCM_PLAYLIST_MAX, 0, s_pls, NCM_PLAYLIST_MAX, &n,
|
||||
from_cache);
|
||||
if (rc2 == NCM_OK) {
|
||||
int cnt = (n > NCM_PLAYLIST_MAX) ? NCM_PLAYLIST_MAX : n;
|
||||
pthread_mutex_lock(&g_pls_mu);
|
||||
@@ -283,11 +287,14 @@ int appstate_load_playlists(void)
|
||||
pthread_mutex_unlock(&g_pls_mu);
|
||||
appstate_playlists_cache_save(); /* §26:网络成功 → 覆写盘缓存(stale-while-revalidate) */
|
||||
}
|
||||
meow_log(MEOW_LOG_INFO, "home: playlists rc=%d count=%d uid=%s", rc2,
|
||||
(rc2 == NCM_OK) ? n : g_st.playlist_count, g_st.uid);
|
||||
meow_log(MEOW_LOG_INFO, "home: playlists rc=%d count=%d uid=%s%s", rc2,
|
||||
(rc2 == NCM_OK) ? n : g_st.playlist_count, g_st.uid,
|
||||
(from_cache && *from_cache) ? " (cache)" : "");
|
||||
return rc2;
|
||||
}
|
||||
|
||||
int appstate_load_playlists(void) { return appstate_load_playlists_ex(NULL); }
|
||||
|
||||
/* ---- 歌单列表磁盘缓存(§26,NCM_CACHE_DESIGN §2.2)----
|
||||
* 快照 <data_dir>/playlists.bin:magic(4) + ver(2) + 时间戳(8) + count(4) + 数组(ncm_playlist_t)。
|
||||
* 进首页先渲染缓存秒开(断网可离线浏览),后台 worker 拉网络成功后覆写;结构体改版靠 ver 判 miss。
|
||||
|
||||
Reference in new issue
Block a user