Skip to content

Commit 8c52d7a

Browse files
committed
fix(merge): drop duplicate restart-cap test hook after folding step-1 fixes into step 2
Merging sync/upstream-step1 (which defines cbm_index_restart_cap_for_testing) into step 2 (which had added the same hook independently) left two definitions in src/daemon/application.c and two declarations in application.h. Keep step 1's copy. Production build and test-runner compile are clean.
1 parent 7b470b2 commit 8c52d7a

2 files changed

Lines changed: 0 additions & 7 deletions

File tree

‎src/daemon/application.c‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1816,10 +1816,6 @@ bool cbm_daemon_application_index_args_equal_for_test(const char *left, const ch
18161816
return application_index_args_equal(left, right);
18171817
}
18181818

1819-
int cbm_index_restart_cap_for_testing(void) {
1820-
return application_max_restarts();
1821-
}
1822-
18231819
/* Caller holds application->mutex. Keeping watcher ownership validation and
18241820
* this admission in the same critical section closes the unwatch race. */
18251821
static cbm_daemon_application_job_t *application_job_subscribe_locked(

‎src/daemon/application.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,4 @@ size_t cbm_daemon_application_job_subscribers(cbm_daemon_application_t *applicat
164164
size_t cbm_daemon_application_physical_job_limit(cbm_daemon_application_t *application);
165165
size_t cbm_daemon_application_worker_memory_budget_bytes(cbm_daemon_application_t *application);
166166

167-
/* Recovery-round cap read from CBM_INDEX_MAX_RESTARTS (zero means none). */
168-
int cbm_index_restart_cap_for_testing(void);
169-
170167
#endif /* CBM_DAEMON_APPLICATION_H */

0 commit comments

Comments
 (0)