lix-project/lix
20
55
Fork 31
Code Issues 346 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Wrap thread local in function for Cygwin

Browse source 
Fixes #1826. See #1352 for a previous instance of a similar change.
This commit is contained in:
Asad Saeeduddin 2018-03-12 00:56:41 -04:00
parent 24b739817f
commit be54f4a0b6
3 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/download.hh
View file

@ -22,7 +22,7 @@ struct DownloadRequest
std::string mimeType;
DownloadRequest(const std::string & uri)
: uri(uri), parentAct(curActivity) { }
: uri(uri), parentAct(getCurActivity()) { }
};
struct DownloadResult

11
src/libutil/logging.cc
View file

@ -6,7 +6,16 @@
namespace nix {
thread_local ActivityId curActivity = 0;
static thread_local ActivityId curActivity = 0;
ActivityId getCurActivity()
{
return curActivity;
}
void setCurActivity(const ActivityId activityId)
{
curActivity = activityId;
}
Logger * logger = makeDefaultLogger();

11
src/libutil/logging.hh
View file

@ -77,7 +77,8 @@ public:
virtual void result(ActivityId act, ResultType type, const Fields & fields) { };
};
extern thread_local ActivityId curActivity;
ActivityId getCurActivity();
void setCurActivity(const ActivityId activityId);
struct Activity
{
@ -86,10 +87,10 @@ struct Activity
const ActivityId id;
Activity(Logger & logger, Verbosity lvl, ActivityType type, const std::string & s = "",
const Logger::Fields & fields = {}, ActivityId parent = curActivity);
const Logger::Fields & fields = {}, ActivityId parent = getCurActivity());
Activity(Logger & logger, ActivityType type,
const Logger::Fields & fields = {}, ActivityId parent = curActivity)
const Logger::Fields & fields = {}, ActivityId parent = getCurActivity())
: Activity(logger, lvlError, type, "", fields, parent) { };
Activity(const Activity & act) = delete;
@ -121,8 +122,8 @@ struct Activity
struct PushActivity
{
const ActivityId prevAct;
PushActivity(ActivityId act) : prevAct(curActivity) { curActivity = act; }
~PushActivity() { curActivity = prevAct; }
PushActivity(ActivityId act) : prevAct(getCurActivity()) { setCurActivity(act); }
~PushActivity() { setCurActivity(prevAct); }
};
extern Logger * logger;