From 9d0562d22cef95b0db1af30e199a371670ca8050 Mon Sep 17 00:00:00 2001 From: Timo Weingärtner Date: Tue, 23 Apr 2013 18:28:33 +0200 Subject: remove hashing stuff the cases in which that gave a speedup are rare to nonexistent --- inode.h | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) (limited to 'inode.h') diff --git a/inode.h b/inode.h index 26db923..5c74a79 100644 --- a/inode.h +++ b/inode.h @@ -25,39 +25,16 @@ #include #include -#include - -class inode { -public: +struct inode { std::string const filename; struct stat const stat; -protected: - uLong mutable adler; - -public: inode (std::string const &, struct stat const); - uLong get_adler () const; - friend bool compare (inode const &, inode const &); friend std::ostream& operator<< (std::ostream&, inode const &); }; -inline inode::inode (std::string const & __filename, struct stat const __stat) : filename(__filename), stat(__stat), adler(-1) { -} - -inline uLong inode::get_adler () const { - if (adler == uLong(-1)) { - char buffer[1 << 14]; - std::ifstream f(filename.c_str()); - - adler = adler32(0L, Z_NULL, 0); - while (not f.eof()) { - f.read(buffer, sizeof(buffer)); - adler = adler32(adler, (Bytef *) buffer, f.gcount()); - } - } - return adler; +inline inode::inode (std::string const & __filename, struct stat const __stat) : filename(__filename), stat(__stat) { } inline bool compare (inode const & l, inode const & r) { -- cgit v1.2.3 From 7bb00e45cc6fcfa85514bf4e645b0cedebbc0216 Mon Sep 17 00:00:00 2001 From: Timo Weingärtner Date: Tue, 23 Apr 2013 18:32:03 +0200 Subject: use agg init and drop unnecessary stuff --- hadori.C | 2 +- inode.h | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) (limited to 'inode.h') diff --git a/hadori.C b/hadori.C index b5e1a57..9abd40b 100644 --- a/hadori.C +++ b/hadori.C @@ -91,7 +91,7 @@ void handle_file(std::string const & path, struct stat const & s) { to_link.erase(s.st_ino); return; } - inode f(path, s); + inode f{path, s}; debug << f << " is new to us" << std::endl; for (auto const & it : sizes.equal_range(s.st_size)) { inode const & candidate = kept.find(it.second)->second; diff --git a/inode.h b/inode.h index 5c74a79..c9768d2 100644 --- a/inode.h +++ b/inode.h @@ -28,15 +28,8 @@ struct inode { std::string const filename; struct stat const stat; - inode (std::string const &, struct stat const); - - friend bool compare (inode const &, inode const &); - friend std::ostream& operator<< (std::ostream&, inode const &); }; -inline inode::inode (std::string const & __filename, struct stat const __stat) : filename(__filename), stat(__stat) { -} - inline bool compare (inode const & l, inode const & r) { char lbuffer[1 << 14]; char rbuffer[1 << 14]; -- cgit v1.2.3 From 5d0c23bc87b5be492869616acc42e619914aae38 Mon Sep 17 00:00:00 2001 From: Timo Weingärtner Date: Wed, 24 Apr 2013 16:31:15 +0200 Subject: inode.h is not so big anymore, merge it into hadori.C --- Makefile | 2 +- hadori.C | 29 ++++++++++++++++++++++++++++- inode.h | 53 ----------------------------------------------------- 3 files changed, 29 insertions(+), 55 deletions(-) delete mode 100644 inode.h (limited to 'inode.h') diff --git a/Makefile b/Makefile index faad8fa..9776253 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ hadori.1: hadori help2man -n $< -o $@ -N ./$< hadori: hadori.o -hadori.o: hadori.C inode.h version.h +hadori.o: hadori.C version.h version.h: test ! -d .git || git describe | sed 's/^\(.*\)$$/#define HADORI_VERSION "hadori \1"/' > $@ diff --git a/hadori.C b/hadori.C index 4867648..d0b19ab 100644 --- a/hadori.C +++ b/hadori.C @@ -26,6 +26,7 @@ namespace po = boost::program_options; #include #include #include +#include #include #include @@ -35,7 +36,6 @@ namespace po = boost::program_options; #include #include -#include "inode.h" #include "version.h" // needed for equal_range and range-for @@ -51,6 +51,33 @@ template T& end(pair & ip) { po::variables_map config; std::ostream debug(std::clog.rdbuf()), verbose(std::clog.rdbuf()), error(std::clog.rdbuf()); +struct inode { + std::string const filename; + struct stat const stat; +}; + +inline bool compare (inode const & l, inode const & r) { + char lbuffer[1 << 14]; + char rbuffer[1 << 14]; + std::ifstream lf(l.filename.c_str()); + std::ifstream rf(r.filename.c_str()); + + while (not lf.eof()) { + lf.read(lbuffer, sizeof(lbuffer)); + rf.read(rbuffer, sizeof(rbuffer)); + if (lf.gcount() != rf.gcount()) + return false; + if (memcmp(lbuffer, rbuffer, lf.gcount())) + return false; + } + return true; +} + +inline std::ostream& operator<< (std::ostream& os, inode const & i) { + os << "Inode " << i.stat.st_ino << ", represented by " << i.filename; + return os; +} + void do_link (inode const & i, std::string const & other) { if (!link(i.filename.c_str(), other.c_str())) { error << "linking " << i << " to " << other << " succeeded before unlinking (race condition)" << std::endl; diff --git a/inode.h b/inode.h deleted file mode 100644 index c9768d2..0000000 --- a/inode.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) 2011 Timo Weingärtner - * - * This file is part of hadori. - * - * hadori is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Foobar is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with hadori. If not, see . - */ - -#include -#include -#include - -#include -#include -#include - -struct inode { - std::string const filename; - struct stat const stat; -}; - -inline bool compare (inode const & l, inode const & r) { - char lbuffer[1 << 14]; - char rbuffer[1 << 14]; - std::ifstream lf(l.filename.c_str()); - std::ifstream rf(r.filename.c_str()); - - while (not lf.eof()) { - lf.read(lbuffer, sizeof(lbuffer)); - rf.read(rbuffer, sizeof(rbuffer)); - if (lf.gcount() != rf.gcount()) - return false; - if (memcmp(lbuffer, rbuffer, lf.gcount())) - return false; - } - return true; -} - -inline std::ostream& operator<< (std::ostream& os, inode const & i) { - os << "Inode " << i.stat.st_ino << ", represented by " << i.filename; - return os; -} -- cgit v1.2.3