← Back to branch summary

~ubuntu-branches/ubuntu/precise/ceph/precise

« back to all changes in this revision

Viewing changes to src/os/JournalingObjectStore.h

  • Committer: Bazaar Package Importer
  • Author(s): Clint Byrum, Clint Byrum, Micah Gersten
  • Date: 2011-02-12 22:50:26 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20110212225026-yyyw4tk0msgql3ul
Tags: 0.24.2-0ubuntu1
https://launchpad.net/bugs/658670
https://launchpad.net/bugs/684011
[ Clint Byrum <clint@ubuntu.com> ]
* New upstream release. (LP: #658670, LP: #684011)
* debian/patches/fix-mkcephfs.patch: dropped (applied upstream)
* Removed .la files from libceph1-dev, libcrush1-dev and 
  librados1-dev (per Debian policy v3.9.1 10.2).
* debian/control: adding pkg-config as a build dependency
* debian/control: depend on libcrypto++-dev instead of libssl-dev
* debian/watch: added watch file

[ Micah Gersten <micahg@ubuntu.com> ]
* debian/control: add Homepage

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/os/JournalingObjectStore.h
33
33
 
34
34
  Cond cond;
35
35
  Mutex journal_lock;
36
 
  Mutex lock;
 
36
 
 
37
  list<uint64_t> ops_submitting;
 
38
  list<Cond*> ops_apply_blocked;
37
39
 
38
40
protected:
39
41
  void journal_start();
41
43
  int journal_replay(uint64_t fs_op_seq);
42
44
 
43
45
  // --
 
46
  uint64_t op_submit_start();
 
47
  void op_submit_finish(uint64_t op_seq);
 
48
 
44
49
  uint64_t op_apply_start(uint64_t op);
 
50
  uint64_t _op_apply_start(uint64_t op);
45
51
  void op_apply_finish(uint64_t op);
46
 
  uint64_t op_journal_start(uint64_t op);
47
 
  void op_journal_finish();
48
 
 
49
 
  void journal_transaction(ObjectStore::Transaction& t, uint64_t op, Context *onjournal);
50
 
  void journal_transactions(list<ObjectStore::Transaction*>& tls, uint64_t op, Context *onjournal);
 
52
 
 
53
  void op_journal_transactions(list<ObjectStore::Transaction*>& tls, uint64_t op, Context *onjournal);
 
54
  void _op_journal_transactions(list<ObjectStore::Transaction*>& tls, uint64_t op, Context *onjournal);
 
55
 
 
56
  virtual int do_transactions(list<ObjectStore::Transaction*>& tls, uint64_t op_seq) = 0;
51
57
 
52
58
  bool commit_start();
53
59
  void commit_started();  // allow new ops (underlying fs should now be committing all prior ops)
59
65
                            applied_seq(0), committing_seq(0), committed_seq(0), 
60
66
                            open_ops(0), blocked(false),
61
67
                            journal(NULL),
62
 
                            journal_lock("JournalingObjectStore::journal_lock"),
63
 
                            lock("JournalingObjectStore::lock") { }
 
68
                            journal_lock("JournalingObjectStore::journal_lock") { }
64
69
  
65
70
};
66
71