← Back to branch summary

~ignacio-nin/+junk/percona-xtradb-cluster-galera

« back to all changes in this revision

Viewing changes to gcs/src/gcs_gcomm.cpp

  • Committer: Alex Yurchenko
  • Date: 2011-11-28 12:23:55 UTC
  • mfrom: (87.1.4 1.x)
  • Revision ID: ayurchen@void-20111128122355-39frysjw3wi0v2io
https://launchpad.net/bugs/884566
https://launchpad.net/bugs/897121
References lp:884566, lp:897121 - synced with SVN r2565

Show diffs side-by-side

added added

removed removed

Lines of Context:
gcs/src/gcs_gcomm.cpp
238
238
        log_info << "gcomm: connected";
239
239
    }
240
240
 
241
 
    void close(bool join = true)
 
241
    void close()
242
242
    {
243
243
        if (tp == 0)
244
244
        {
247
247
        }
248
248
        log_info << "gcomm: terminating thread";
249
249
        terminate();
250
 
        if (join == true)
251
 
        {
252
 
            log_info << "gcomm: joining thread";
253
 
            pthread_join(thd, 0);
254
 
        }
 
250
        log_info << "gcomm: joining thread";
 
251
        pthread_join(thd, 0);
255
252
        log_info << "gcomm: closing backend";
256
253
        tp->close();
257
254
        gcomm::disconnect(tp, this);
472
469
                                  O_DROP,
473
470
                                  -1,
474
471
                                  e.get_errno()));
475
 
            close(false);
476
 
            pthread_detach(thd);
477
472
            break;
478
473
        }
479
474
        catch (...)
489
484
                                  O_DROP,
490
485
                                  -1,
491
486
                                  gu::Exception::E_UNSPEC));
492
 
            close(false);
493
 
            pthread_detach(thd);
494
487
            break;
495
488
        }
496
489
    }
732
725
    }
733
726
 
734
727
    GCommConn& conn(*ref.get());
735
 
    gcomm::Critical<Protonet> crit(conn.get_pnet());
736
728
    try
737
729
    {
738
730
        conn.close();