diff --git a/src/pulsecore/asyncmsgq.c b/src/pulsecore/asyncmsgq.c index 5e5f1121381b83c7c530a00da0a3e282a8ca5777..cae421e38bbffa3648fa8c21d88c95b942d0ea63 100644 --- a/src/pulsecore/asyncmsgq.c +++ b/src/pulsecore/asyncmsgq.c @@ -157,7 +157,6 @@ int pa_asyncmsgq_send(pa_asyncmsgq *a, pa_msgobject *object, int code, const voi struct asyncmsgq_item i; pa_assert(PA_REFCNT_VALUE(a) > 0); - pa_usec_t startTime = pa_rtclock_now(); char t[PA_SNPRINTF_STR_LENGTH] = {0}; pa_snprintf(t, sizeof(t), "pa_asyncmsgq_send[%d] msg_wait_for_read:%u", code, a->mark, PaAsyncqGetNumToRead(a->asyncq)); @@ -187,12 +186,6 @@ int pa_asyncmsgq_send(pa_asyncmsgq *a, pa_msgobject *object, int code, const voi if (pa_flist_push(PA_STATIC_FLIST_GET(semaphores), i.semaphore) < 0) pa_semaphore_free(i.semaphore); CallEnd(); - pa_usec_t executionTime = pa_rtclock_now() - startTime; - if (executionTime > OH_DAEMON_TIMEOUT_THRESHOLD_ON_US) { // too long block of daemon thread, dangerous - AUDIO_WARNING_LOG("Execution time of this msg is too long: qLen[%{public}u], MSG[%{public}d] " \ - "(%{public}" PRIu64 "ms)", - PaAsyncqGetNumToRead(a->asyncq), code, executionTime / PA_USEC_PER_MSEC); - } return i.ret; } diff --git a/src/pulsecore/log.c b/src/pulsecore/log.c index f12fc594458e8216b06d6bde0029d2e013d8d857..6b2a5282064a3887f29f34a51a9bd5ce1ee28014 100644 --- a/src/pulsecore/log.c +++ b/src/pulsecore/log.c @@ -412,16 +412,6 @@ void pa_log_levelv_meta( filename = file; } - if (level == PA_LOG_ERROR) { - AUDIO_ERR_LOG("%{public}s:%{public}u (%{public}s) %{public}s", filename, line, func, text); - } else if (level == PA_LOG_WARN) { - AUDIO_WARNING_LOG("%{public}s:%{public}u (%{public}s) %{public}s", filename, line, func, text); - } else if (level == PA_LOG_NOTICE || level == PA_LOG_INFO) { - AUDIO_INFO_LOG("%{public}s:%{public}u (%{public}s) %{public}s", filename, line, func, text); - } else if (level == PA_LOG_DEBUG) { - AUDIO_DEBUG_LOG("%{public}s:%{public}u (%{public}s) %{public}s", filename, line, func, text); - } - if ((_flags & PA_LOG_PRINT_META) && file && line > 0 && func) pa_snprintf(location, sizeof(location), "[%s][%s:%i %s()] ", pa_strnull(pa_thread_get_name(pa_thread_self())), file, line, func); diff --git a/src/pulsecore/pdispatch.c b/src/pulsecore/pdispatch.c index 29b06e88f1da3ba2c2f6ccc1f7498bd9fd53a2a0..30f084ce3d3819385c524e8c7af785e7131a62dc 100644 --- a/src/pulsecore/pdispatch.c +++ b/src/pulsecore/pdispatch.c @@ -350,14 +350,7 @@ int pa_pdispatch_run(pa_pdispatch *pd, pa_packet *packet, pa_cmsg_ancil_data *an } else if (pd->callback_table && (command < pd->n_commands) && pd->callback_table[command]) { const pa_pdispatch_cb_t *cb = pd->callback_table+command; - - pa_usec_t startTime = pa_rtclock_now(); (*cb)(pd, command, tag, ts, userdata); - pa_usec_t executionTime = pa_rtclock_now() - startTime; - if (executionTime > OH_DAEMON_TIMEOUT_THRESHOLD_ON_US) { // too long block of daemon thread, dangerous - AUDIO_WARNING_LOG("Execution time of this command is too long: CMD[%{public}s] (%{public}" PRIu64 "ms)", - p, executionTime / PA_USEC_PER_MSEC); - } } else { pa_log("Received unsupported command %u", command); CallEnd(); diff --git a/src/pulsecore/resampleLoader.c b/src/pulsecore/resampleLoader.c index 65933b24f4d5ea37706892e2406a4fb291dcba73..2fcb977b29f9b2771e536df17f86b1210e1a2791 100644 --- a/src/pulsecore/resampleLoader.c +++ b/src/pulsecore/resampleLoader.c @@ -38,23 +38,17 @@ bool LoadProResampler(int (**func_ptr_addr)(pa_resampler *r)) ret = strcat_s(absolutePath, LD_ABS_PATH_LEN, libProResamplerName); CHECK_AND_RETURN_RET_LOG(ret == 0, false, "LoadProResampler: strcat_s libProResamplerName failed!"); - AUDIO_INFO_LOG("LoadProResampler: absolutePath is %{public}s", absolutePath); - ret = access(absolutePath, F_OK); CHECK_AND_RETURN_RET_LOG(ret == 0, false, "ProResampler does not exist! use SpeeX resampler!"); void *handle = dlopen(absolutePath, 1); CHECK_AND_RETURN_RET_LOG(handle != NULL, false, "dlopen lib ProResampler fail!, error: [%{public}s]", dlerror()); - AUDIO_INFO_LOG("dlopen lib ProResampler successful!"); - *func_ptr_addr = (int (*)(pa_resampler *r))(dlsym(handle, PRORESAMPLERINIT_SYM_AS_STR)); if (*func_ptr_addr == NULL) { - AUDIO_ERR_LOG("dlsym lib ProResampler failed! error: [%{public}s]", dlerror()); CHECK_AND_RETURN_RET_LOG(dlclose(handle) == 0, false, "dlclose libProResampler fail!, error: [%{public}s]", dlerror()); return false; } - AUDIO_INFO_LOG("dlsym lib ProResampler success!"); return true; } \ No newline at end of file diff --git a/src/pulsecore/resampler.c b/src/pulsecore/resampler.c index c5fa55cdd308b6b7948461ae638b565ed739a217..02260b83f14df877e8f648131ffd0e6906b7c3b0 100644 --- a/src/pulsecore/resampler.c +++ b/src/pulsecore/resampler.c @@ -209,7 +209,6 @@ static pa_resample_method_t fix_method( } if (method != PA_RESAMPLER_AUTO) { - AUDIO_INFO_LOG("resampler method is not auto, reset to auto!"); method = PA_RESAMPLER_AUTO; } @@ -445,13 +444,6 @@ pa_resampler* pa_resampler_new( } r->w_fz = pa_sample_size_of_format(r->work_format) * r->work_channels; - AUDIO_INFO_LOG("pa_resampler_new: rate %{public}u -> %{public}u (method %{public}s), " - "format %{public}s -> %{public}s (intermediate %{public}s), " - "channels %{public}u -> %{public}u (resampling %{public}u)", - a->rate, b->rate, pa_resample_method_to_string(r->method), pa_sample_format_to_string(a->format), - pa_sample_format_to_string(b->format), pa_sample_format_to_string(r->work_format), a->channels, b->channels, - r->work_channels); - /* set up the remap structure */ if (r->map_required) setup_remap(r, &r->remap, &lfe_remixed);