mirror of
https://github.com/PCSX2/pcsx2.git
synced 2026-09-30 00:07:07 +02:00
Jonathan Li
ac78688a32
In the previous code, the threads were created and destroyed in the base class constructor and destructor, so the threads could potentially be active while the object is in a partially constructed or destroyed state. The thread however, relies on a virtual function to process the queue items, and the vtable might not be in the desired state when the object is partially constructed or destroyed. This probably only matters during object destruction - no items are in the queue during object construction so the virtual function won't be called, but items may still be queued up when the destructor is called, so the virtual function can be called. It wasn't an issue because all uses of the thread explicitly waited for the queues to be empty before invoking the destructor. Adjust the constructor to take a std::function parameter, which the thread will use instead to process queue items, and avoid inheriting from the GSJobQueue class. This will also eliminate the need to explicitly wait for all jobs to finish (unless there are other external factors, of course), which would probably make future code safer.
59 lines
1.6 KiB
C++
59 lines
1.6 KiB
C++
/*
|
|
* Copyright (C) 2015-2015 Gregory hainaut
|
|
*
|
|
* This Program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2, or (at your option)
|
|
* any later version.
|
|
*
|
|
* This Program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with GNU Make; see the file COPYING. If not, write to
|
|
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA USA.
|
|
* http://www.gnu.org/copyleft/gpl.html
|
|
*
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "GSThread_CXX11.h"
|
|
|
|
namespace GSPng {
|
|
enum Format {
|
|
START = 0,
|
|
RGBA_PNG = 0,
|
|
RGB_PNG,
|
|
RGB_A_PNG,
|
|
ALPHA_PNG,
|
|
R8I_PNG,
|
|
R16I_PNG,
|
|
R32I_PNG,
|
|
COUNT
|
|
};
|
|
|
|
class Transaction
|
|
{
|
|
public:
|
|
Format m_fmt;
|
|
const std::string m_file;
|
|
uint8* m_image;
|
|
int m_w;
|
|
int m_h;
|
|
int m_pitch;
|
|
int m_compression;
|
|
|
|
Transaction(GSPng::Format fmt, const string& file, const uint8* image, int w, int h, int pitch, int compression);
|
|
~Transaction();
|
|
};
|
|
|
|
bool Save(GSPng::Format fmt, const string& file, uint8* image, int w, int h, int pitch, int compression, bool rb_swapped = false);
|
|
|
|
void Process(std::shared_ptr<Transaction> &item);
|
|
|
|
using Worker = GSJobQueue<std::shared_ptr<Transaction>, 16>;
|
|
}
|