#include <unistd.h>
+#include <algorithm>
+#include <cmath>
#include <cstdio>
#include <fstream>
#include <TTraceWrapper.h>
#include "common/step/filesystem/step_migrate_legacy_external_image.h"
#include "common/step/filesystem/step_move_installed_storage.h"
#include "common/step/filesystem/step_optional_acquire_external_storage.h"
-#include "common/step/filesystem/step_recover_change_owner.h"
#include "common/step/filesystem/step_recover_external_storage.h"
#include "common/step/filesystem/step_recover_files.h"
#include "common/step/filesystem/step_recover_globalapp_symlinks.h"
#include "common/step/pkgmgr/step_recover_application.h"
#include "common/step/pkgmgr/step_recover_parser_plugins.h"
#include "common/step/pkgmgr/step_register_app.h"
+#include "common/step/pkgmgr/step_recover_priv_sharedres.h"
#include "common/step/pkgmgr/step_remove_manifest.h"
+#include "common/step/pkgmgr/step_remove_priv_sharedres.h"
#include "common/step/pkgmgr/step_run_parser_plugins.h"
#include "common/step/pkgmgr/step_unregister_app.h"
#include "common/step/pkgmgr/step_update_app.h"
const char kHistoryFileName[] = LOGDIR"/installation-history.log";
const int kLogRotationSize = 1024 * 256; // 256KB
const int kLogMaximumRotation = 3;
+const int kSignalCount = 10;
}
// pkgmgr signal should work only for online mode
// there is no one to receive it in offline mode
if (context_->installation_mode.get() == InstallationMode::ONLINE) {
- pi_ = pkgmgr->CreatePkgmgrSignal();
+ ps_ = pkgmgr->CreatePkgmgrSignal();
}
}
Process();
if (it_ != steps_.end() && result_ == Result::ERROR) {
LOG(ERROR) << "Failure occurs in step: " << (*it_)->name();
- pkgmgr_parser_clear_cache_memory_db();
Undo();
} else {
- pkgmgr_parser_clear_cache_memory_db();
Clean();
}
sync();
unsigned total_steps = steps_.size();
unsigned current_step = 1;
+ double div = total_steps / static_cast<double>(kSignalCount);
+ int interval = std::max(1, static_cast<int>(std::round(div)));
for (it_ = steps_.begin(); it_ != steps_.end(); ++it_, ++current_step) {
status_ = SafeExecute(*it_, &Step::precheck, "precheck");
if (status_ != Step::Status::OK) {
if (status_ != Step::Status::RECOVERY_DONE) {
- LOG(ERROR) << "Error during processing";
+ LOG(ERROR) << "Error during processing(" << (*it_)->name() << ")";
result_ = Result::ERROR;
}
break;
if (!context_->pkgid.get().empty())
history_logger_.LogHistoryStart(context_->pkgid.get(),
GetPackageVersion(), context_->request_type.get());
- SendProgress(current_step * kProgressRange / total_steps);
+
+ if (current_step == total_steps || current_step % interval == 0)
+ SendProgress(current_step * kProgressRange / total_steps);
}
+ if (!context_->pkgid.get().empty())
+ pkgmgr_parser_update_pending_cache(context_->pkgid.get().c_str());
+
return result_;
}
AddStep<ci::security::StepPrivacyPrivilege>(
ci::security::StepPrivacyPrivilege::ActionType::Uninstall);
AddStep<ci::filesystem::StepRemoveFiles>();
+ AddStep<ci::pkgmgr::StepRemovePrivSharedres>();
AddStep<ci::filesystem::StepRemoveZipImage>();
AddStep<ci::filesystem::StepRemoveIcons>();
AddStep<ci::filesystem::StepRemoveTep>();
AddStep<ci::pkgmgr::StepRecoverParserPlugin>();
AddStep<ci::filesystem::StepRecoverManifest>();
AddStep<ci::filesystem::StepRecoverExternalStorage>();
- AddStep<ci::filesystem::StepRecoverStorageDirectories>();
AddStep<ci::filesystem::StepRecoverGlobalAppSymlinks>();
AddStep<ci::filesystem::StepRecoverFiles>();
+ AddStep<ci::pkgmgr::StepRecoverPrivSharedres>();
AddStep<ci::mount::StepMountRecover>();
- AddStep<ci::filesystem::StepRecoverChangeOwner>();
AddStep<ci::pkgmgr::StepRecoverApplication>();
AddStep<ci::security::StepRecoverTrustAnchor>();
AddStep<ci::security::StepRecoverSecurity>();
+ AddStep<ci::filesystem::StepRecoverStorageDirectories>();
}
void AppInstaller::MountInstallSteps() {
AddStep<ci::filesystem::StepRemoveGlobalAppSymlinks>();
AddStep<ci::filesystem::StepOptionalAcquireExternalStorage>();
AddStep<ci::filesystem::StepRemovePerUserStorageDirectories>();
+ AddStep<ci::pkgmgr::StepRemovePrivSharedres>();
AddStep<ci::pkgmgr::StepUnregisterApplication>();
AddStep<ci::security::StepUnregisterTrustAnchor>();
AddStep<ci::security::StepPrivacyPrivilege>(
void AppInstaller::ReadonlyUpdateUninstallSteps() {
AddStep<ci::configuration::StepConfigure>(pkgmgr_);
+ AddStep<ci::recovery::StepCreateRecoveryFile>();
AddStep<ci::configuration::StepParseManifest>(
ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
ci::configuration::StepParseManifest::StoreLocation::BACKUP);
AddStep<ci::security::StepPrivacyPrivilege>(
ci::security::StepPrivacyPrivilege::ActionType::Update);
AddStep<ci::filesystem::StepRemoveFiles>();
+ AddStep<ci::pkgmgr::StepRemovePrivSharedres>();
AddStep<ci::filesystem::StepRemoveZipImage>();
AddStep<ci::filesystem::StepRemoveIcons>();
AddStep<ci::filesystem::StepRemoveTep>();
ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
ci::configuration::StepParseManifest::StoreLocation::NORMAL);
AddStep<ci::pkgmgr::StepKillApps>();
+ AddStep<ci::pkgmgr::StepRemovePrivSharedres>();
AddStep<ci::pkgmgr::StepUpdatePkgDisableInfo>(
ci::pkgmgr::StepUpdatePkgDisableInfo::ActionType::Disable);
AddStep<ci::pkgmgr::StepRunParserPlugin>(
void AppInstaller::HandleStepError(Step::Status result,
const std::string& error) {
- if (!pi_)
+ if (!ps_)
return;
- pi_->SendError(result, error, context_->pkg_type.get(),
+ ps_->SendError(result, error, context_->pkg_type.get(),
context_->pkgid.get());
}
}
bool AppInstaller::SendStartIfNotSent(bool is_skippable) {
- if (!pi_)
+ if (!ps_)
return false;
- if (pi_->state() != PkgmgrSignal::State::NOT_SENT)
+ if (ps_->state() != PkgmgrSignal::State::NOT_SENT)
return true;
if (context_->pkgid.get().empty() && is_skippable)
return true;
// set request type before sending start signal
- pi_->SetRequestType(context_->request_type.get());
- pi_->SendStarted(context_->pkg_type.get(), context_->pkgid.get());
+ ps_->SetRequestType(context_->request_type.get());
+ ps_->SendStarted(context_->pkg_type.get(), context_->pkgid.get());
return true;
}
return;
// send installation progress
- pi_->SendProgress(progress,
+ ps_->SendProgress(progress,
context_->pkg_type.get(), context_->pkgid.get());
}
void AppInstaller::SendFinished(Step::Status process_status) {
+ pkgmgr_parser_update_pending_cache(context_->pkgid.get().c_str());
+
if (!SendStartIfNotSent(false))
return;
- pi_->SendFinished(process_status,
+ ps_->SendFinished(process_status,
context_->pkg_type.get(),
context_->pkgid.get());
}
Step::Status process_status = Step::Status::OK;
try {
TTRACE(TTRACE_TAG_APP, "%s_%s", step_ptr->name(), name.c_str());
+ LOG(DEBUG) << step_ptr->name() << "_" << name.c_str();
process_status = ((*step_ptr).*method)();
} catch (const std::exception& err) {
LOG(ERROR) << "Exception occurred in " << name.c_str() << "(): "