Mercurial > hg > svcore
annotate base/Serialiser.cpp @ 986:e8e6c4e7437b
Correct some really stupid fixed-length string stuff, including a genuine stack overflow that causes a crash on OS/X for certain colour 3d plot data.
author | Chris Cannam |
---|---|
date | Mon, 29 Sep 2014 13:27:13 +0100 |
parents | d095214ffbaf |
children | 14c776dad920 |
rev | line source |
---|---|
Chris@297 | 1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */ |
Chris@297 | 2 |
Chris@297 | 3 /* |
Chris@297 | 4 Sonic Visualiser |
Chris@297 | 5 An audio file viewer and annotation editor. |
Chris@297 | 6 Centre for Digital Music, Queen Mary, University of London. |
Chris@297 | 7 This file copyright 2007 QMUL. |
Chris@297 | 8 |
Chris@297 | 9 This program is free software; you can redistribute it and/or |
Chris@297 | 10 modify it under the terms of the GNU General Public License as |
Chris@297 | 11 published by the Free Software Foundation; either version 2 of the |
Chris@297 | 12 License, or (at your option) any later version. See the file |
Chris@297 | 13 COPYING included with this distribution for more information. |
Chris@297 | 14 */ |
Chris@297 | 15 |
Chris@297 | 16 #include "Serialiser.h" |
Chris@297 | 17 |
Chris@406 | 18 #include <iostream> |
Chris@406 | 19 |
Chris@297 | 20 QMutex |
Chris@297 | 21 Serialiser::m_mapMutex; |
Chris@297 | 22 |
Chris@297 | 23 std::map<QString, QMutex *> |
Chris@297 | 24 Serialiser::m_mutexMap; |
Chris@297 | 25 |
Chris@297 | 26 Serialiser::Serialiser(QString id) : |
Chris@297 | 27 m_id(id) |
Chris@297 | 28 { |
Chris@297 | 29 m_mapMutex.lock(); |
Chris@297 | 30 |
Chris@297 | 31 if (m_mutexMap.find(m_id) == m_mutexMap.end()) { |
Chris@297 | 32 m_mutexMap[m_id] = new QMutex; |
Chris@297 | 33 } |
Chris@297 | 34 |
Chris@406 | 35 // The id mutexes are never deleted, so once we have a reference |
Chris@406 | 36 // to the one we need, we can hold on to it while we release the |
Chris@406 | 37 // map mutex. We need to release the map mutex, otherwise if the |
Chris@406 | 38 // id mutex is currently held, it will never be released (because |
Chris@406 | 39 // the destructor needs to hold the map mutex to release the id |
Chris@406 | 40 // mutex). |
Chris@406 | 41 |
Chris@406 | 42 QMutex *idMutex = m_mutexMap[m_id]; |
Chris@398 | 43 |
Chris@297 | 44 m_mapMutex.unlock(); |
Chris@406 | 45 |
Chris@406 | 46 idMutex->lock(); |
Chris@297 | 47 } |
Chris@297 | 48 |
Chris@297 | 49 Serialiser::~Serialiser() |
Chris@297 | 50 { |
Chris@398 | 51 m_mapMutex.lock(); |
Chris@398 | 52 |
Chris@297 | 53 m_mutexMap[m_id]->unlock(); |
Chris@398 | 54 |
Chris@398 | 55 m_mapMutex.unlock(); |
Chris@297 | 56 } |
Chris@297 | 57 |
Chris@297 | 58 |
Chris@297 | 59 |