From 642cad34de7cfdf27c0e666239407e639995c39c Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Tue, 12 Jan 2016 12:29:37 +0100
Subject: [PATCH] rm backup in SMem
---
PERF_LOG | 3 ++-
pub/lib/commands.cpp | 13 -------------
pub/lib/fit.cpp | 1 -
pub/lib/mem.cpp | 34 ----------------------------------
pub/lib/mem.hpp | 4 ----
5 files changed, 2 insertions(+), 53 deletions(-)
diff --git a/PERF_LOG b/PERF_LOG
index 213a7934..ee78e00e 100644
--- a/PERF_LOG
+++ b/PERF_LOG
@@ -15,4 +15,5 @@ v2.3.3a o2 1.31 0.85 0.86 1.02 0.92
v2.3.3a h5 1.92 1.32 1.32 5.58 1.14
b59c787 h5 1.84 1.15 1.33 5.48 1.12
-1170cda o2 1.31 0.86 0.86 1.03 0.91
\ No newline at end of file
+1170cda o2 1.31 0.86 0.86 1.03 0.91
+ o2 1.31 0.74 0.87 1.03 0.93
\ No newline at end of file
diff --git a/pub/lib/commands.cpp b/pub/lib/commands.cpp
index ba293f66..95e3107a 100644
--- a/pub/lib/commands.cpp
+++ b/pub/lib/commands.cpp
@@ -67,7 +67,6 @@ bool frida_command( string cmd )
" ! execute shell command\n"
" quit terminate Frida session\n"
"Command groups (type initial letter for help):\n"
- " b backup of online files\n"
" c curves and fits\n"
" d directory (inspect internal files)\n"
" e edit (change textual parameters)\n"
@@ -151,18 +150,6 @@ bool frida_command( string cmd )
" - hence are equivalent: x = x[k,j,i] = x[k,j,] = x[k,j] = x[k,] = x[k]\n"
;
- } else if (cmd == "b") {
- cout << "Backup commands:\n"
- " bc copy to online backup (automatically before cf)\n"
- " br retrieved from online backup\n"
- ;
-
- } else if (cmd == "bc") {
- SMem::instance()->mem_backup_store();
-
- } else if (cmd == "br") {
- SMem::instance()->mem_backup_retrieve();
-
} else if (cmd == "c") {
cout << "Curve and fit commands:\n"
" cc create\n"
diff --git a/pub/lib/fit.cpp b/pub/lib/fit.cpp
index 9bb964e5..217462c6 100644
--- a/pub/lib/fit.cpp
+++ b/pub/lib/fit.cpp
@@ -507,7 +507,6 @@ void NCurveFit::fit( bool _allow_slow_conv )
lm_control_struct control = lm_control_double;;
allow_slow_conv = _allow_slow_conv;
- SMem::instance()->mem_backup_store();
FileIterator fiter(SFSel::instance()->selC());
while ( COlc *fc = fiter.nextC() ) {
diff --git a/pub/lib/mem.cpp b/pub/lib/mem.cpp
index 3845fbdf..38f9d000 100644
--- a/pub/lib/mem.cpp
+++ b/pub/lib/mem.cpp
@@ -108,37 +108,3 @@ void SMem::mem_xchange()
mem_copy();
SFSel::instance()->sel_delete();
}
-
-//**************************************************************************************************
-//* Backup and retrieve
-//**************************************************************************************************
-
-//! Copy SFSel::instance()->selected files to backup.
-
-void SMem::mem_backup_store()
-{
- BAK.clear();
- FileIterator fiter(SFSel::instance()->sel());
- while ( const COlo *fin = fiter.next() ){
- POlo fout( fin->new_POlo() );
- fout->copy_mainvec( fin );
- BAK.push_back( POlo() );
- BAK.back().swap( fout ); // TODO: simplify!
- }
-}
-
-//! Retrieve files from backup.
-
-void SMem::mem_backup_retrieve()
-{
- if( !BAK.size() )
- throw S("no files in backup");
- SFSel::instance()->sel_collect_begin();
- throw S("TODO: restore mem_backup_retrieve()");
- /*
- for( auto b: BAK )
- mem_store( move(b), -1 );
- */
- SFSel::instance()->sel_collect_end();
- BAK.clear();
-}
diff --git a/pub/lib/mem.hpp b/pub/lib/mem.hpp
index 76541a36..8ce73ee1 100644
--- a/pub/lib/mem.hpp
+++ b/pub/lib/mem.hpp
@@ -29,8 +29,4 @@ public:
void mem_del( int k );
void mem_xchange();
void mem_copy();
-
- // Backup:
- void mem_backup_store();
- void mem_backup_retrieve();
};
--
GitLab