← Back to branch summary

~ubuntu-branches/ubuntu/raring/ceph/raring

« back to all changes in this revision

Viewing changes to src/tools/common.cc

  • Committer: Package Import Robot
  • Author(s): Laszlo Boszormenyi (GCS)
  • Date: 2012-02-05 10:07:38 UTC
  • mfrom: (1.1.7) (0.1.11 sid)
  • Revision ID: package-import@ubuntu.com-20120205100738-00s0bxx93mamy8tk
Tags: 0.41-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/tools/common.cc
32
32
#include "common/Timer.h"
33
33
#include "global/global_init.h"
34
34
 
35
 
#ifndef DARWIN
 
35
#if !defined(DARWIN) && !defined(__FreeBSD__)
36
36
#include <envz.h>
37
37
#endif // DARWIN
38
38
 
118
118
          << (notify->is_latest ? " (latest)" : "")
119
119
          << dendl;
120
120
  
121
 
  if (ceph_fsid_compare(&notify->fsid, &ctx->mc.monmap.fsid)) {
 
121
  if (notify->fsid != ctx->mc.monmap.fsid) {
122
122
    dout(0) << notify->get_source_inst() << " notify fsid " << notify->fsid << " != "
123
123
            << ctx->mc.monmap.fsid << dendl;
124
124
    notify->put();
654
654
{
655
655
  // wait for messenger to finish
656
656
  messenger->wait();
 
657
 
 
658
  ctx->lock.Lock();
 
659
  ctx->mc.shutdown();
 
660
  ctx->timer.shutdown();
 
661
  ctx->lock.Unlock();
 
662
 
657
663
  messenger->destroy();
658
664
  tok_end(tok);
659
665
  
660
 
  ctx->lock.Lock();
661
 
  ctx->mc.shutdown();
662
 
  ctx->timer.shutdown();
663
 
  ctx->lock.Unlock();
664
666
  return 0;
665
667
}