From 8906ae9a127f63e09eac63ea22b52a3b40432bda Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Tue, 22 Jan 2013 08:13:55 -0800 Subject: [PATCH] mds: remove unused EString event While we're at it, #include LogEvent.h from each of the log events, some of which didn't include it previously! Signed-off-by: Greg Farnum --- src/Makefile.am | 1 - src/mds/Locker.cc | 1 - src/mds/LogEvent.cc | 4 --- src/mds/LogEvent.h | 2 +- src/mds/MDCache.cc | 1 - src/mds/Migrator.cc | 1 - src/mds/Server.cc | 1 - src/mds/events/EExport.h | 1 + src/mds/events/EImportFinish.h | 1 + src/mds/events/EImportStart.h | 1 + src/mds/events/EString.h | 57 ---------------------------------- src/mds/journal.cc | 11 ------- 12 files changed, 4 insertions(+), 78 deletions(-) delete mode 100644 src/mds/events/EString.h diff --git a/src/Makefile.am b/src/Makefile.am index 142daea072503..fe75b038ac27b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1707,7 +1707,6 @@ noinst_HEADERS = \ mds/events/ESession.h\ mds/events/ESessions.h\ mds/events/ESlaveUpdate.h\ - mds/events/EString.h\ mds/events/ESubtreeMap.h\ mds/events/ETableClient.h\ mds/events/ETableServer.h\ diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc index 4d4d63576e946..d2ba41a4d76f5 100644 --- a/src/mds/Locker.cc +++ b/src/mds/Locker.cc @@ -26,7 +26,6 @@ #include "include/filepath.h" -#include "events/EString.h" #include "events/EUpdate.h" #include "events/EOpen.h" diff --git a/src/mds/LogEvent.cc b/src/mds/LogEvent.cc index 0c3b965f86a3a..cee838820efeb 100644 --- a/src/mds/LogEvent.cc +++ b/src/mds/LogEvent.cc @@ -18,8 +18,6 @@ #include "MDS.h" // events i know of -#include "events/EString.h" - #include "events/ESubtreeMap.h" #include "events/EExport.h" #include "events/EImportStart.h" @@ -52,8 +50,6 @@ LogEvent *LogEvent::decode(bufferlist& bl) // create event LogEvent *le; switch (type) { - case EVENT_STRING: le = new EString; break; - case EVENT_SUBTREEMAP: le = new ESubtreeMap; break; case EVENT_SUBTREEMAP_TEST: le = new ESubtreeMap; diff --git a/src/mds/LogEvent.h b/src/mds/LogEvent.h index e0b4bea4dc62b..9ff5cb85f63f7 100644 --- a/src/mds/LogEvent.h +++ b/src/mds/LogEvent.h @@ -15,7 +15,7 @@ #ifndef CEPH_LOGEVENT_H #define CEPH_LOGEVENT_H -#define EVENT_STRING 1 +#define EVENT_UNUSED 1 // was previously EVENT_STRING #define EVENT_SUBTREEMAP 2 #define EVENT_EXPORT 3 diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index dee4d2565bdbe..2c48d375af88e 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -51,7 +51,6 @@ #include "events/ESubtreeMap.h" #include "events/EUpdate.h" #include "events/ESlaveUpdate.h" -#include "events/EString.h" #include "events/EImportFinish.h" #include "events/EFragment.h" #include "events/ECommitted.h" diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc index 3449306d64a98..123986908a1c6 100644 --- a/src/mds/Migrator.cc +++ b/src/mds/Migrator.cc @@ -27,7 +27,6 @@ #include "include/filepath.h" -#include "events/EString.h" #include "events/EExport.h" #include "events/EImportStart.h" #include "events/EImportFinish.h" diff --git a/src/mds/Server.cc b/src/mds/Server.cc index 2028acd7a81c1..515dbfa3f9b5e 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -42,7 +42,6 @@ #include "messages/MDentryUnlink.h" -#include "events/EString.h" #include "events/EUpdate.h" #include "events/ESlaveUpdate.h" #include "events/ESession.h" diff --git a/src/mds/events/EExport.h b/src/mds/events/EExport.h index 534621d044919..645c790b22d6e 100644 --- a/src/mds/events/EExport.h +++ b/src/mds/events/EExport.h @@ -21,6 +21,7 @@ #include "../MDS.h" #include "EMetaBlob.h" +#include "../LogEvent.h" class EExport : public LogEvent { public: diff --git a/src/mds/events/EImportFinish.h b/src/mds/events/EImportFinish.h index f8c8b39838d86..85f0eb16cabb2 100644 --- a/src/mds/events/EImportFinish.h +++ b/src/mds/events/EImportFinish.h @@ -19,6 +19,7 @@ #include "include/types.h" #include "../MDS.h" +#include "../LogEvent.h" class EImportFinish : public LogEvent { protected: diff --git a/src/mds/events/EImportStart.h b/src/mds/events/EImportStart.h index 0d5f275e0ec1f..eaf606a9fcf5c 100644 --- a/src/mds/events/EImportStart.h +++ b/src/mds/events/EImportStart.h @@ -21,6 +21,7 @@ #include "../MDS.h" #include "EMetaBlob.h" +#include "../LogEvent.h" class EImportStart : public LogEvent { protected: diff --git a/src/mds/events/EString.h b/src/mds/events/EString.h deleted file mode 100644 index aa50514185aea..0000000000000 --- a/src/mds/events/EString.h +++ /dev/null @@ -1,57 +0,0 @@ -// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- -// vim: ts=8 sw=2 smarttab -/* - * Ceph - scalable distributed file system - * - * Copyright (C) 2004-2006 Sage Weil - * - * This is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software - * Foundation. See file COPYING. - * - */ - - -#ifndef CEPH_ESTRING_H -#define CEPH_ESTRING_H - -#include -#include -using namespace std; - -#include "../LogEvent.h" - -// generic log event -class EString : public LogEvent { - protected: - string event; - - public: - EString(string e) : - LogEvent(EVENT_STRING) { - event = e; - } - EString() : - LogEvent(EVENT_STRING) { - } - - void encode(bufferlist& bl) const { - ::encode(event, bl); - ::encode(stamp, bl); - } - void decode(bufferlist::iterator &bl) { - ::decode(event, bl); - if (!bl.end()) - ::decode(stamp, bl); - } - - void print(ostream& out) { - out << '"' << event << '"'; - } - - void replay(MDS *mds); - -}; - -#endif diff --git a/src/mds/journal.cc b/src/mds/journal.cc index 6c3977584e768..f828571e414a7 100644 --- a/src/mds/journal.cc +++ b/src/mds/journal.cc @@ -14,7 +14,6 @@ #include "common/config.h" #include "osdc/Journaler.h" -#include "events/EString.h" #include "events/ESubtreeMap.h" #include "events/ESession.h" #include "events/ESessions.h" @@ -266,16 +265,6 @@ void LogSegment::try_to_expire(MDS *mds, C_GatherBuilder &gather_bld) #define DOUT_COND(cct, l) (l<=cct->_conf->debug_mds || l <= cct->_conf->debug_mds_log) -// ----------------------- -// EString - -void EString::replay(MDS *mds) -{ - dout(10) << "EString.replay " << event << dendl; -} - - - // ----------------------- // EMetaBlob -- 2.39.5