Skip to content

Commit

Permalink
Fixed an x64 build regression introduced in latest revs
Browse files Browse the repository at this point in the history
  • Loading branch information
@delscorcho
delscorcho committed Dec 3, 2018
1 parent b732f82 commit 0e71b55
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 28 deletions.
40 changes: 20 additions & 20 deletions jobsystem.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#pragma once

#ifdef WIN32
#if defined(WIN32) || defined(WIN64)
# define WINDOWS
#endif

Expand All @@ -28,11 +28,11 @@

namespace jobsystem
{
size_t GetBit(size_t n) { return 1 << n; }
uint64_t GetBit(uint64_t n) { return static_cast<uint64_t>(1) << n; }

typedef std::function<void()> JobDelegate; ///< Structure of callbacks that can be requested as jobs.

typedef unsigned int affinity_t;
typedef uint64_t affinity_t;

static const affinity_t kAffinityAllBits = static_cast<affinity_t>(~0);

Expand Down Expand Up @@ -259,7 +259,7 @@ namespace jobsystem
eJobEvent_WorkerUsed, ///< A worker has been utilized.
};

typedef std::function<void(const JobQueueEntry& job, EJobEvent, size_t, size_t)> JobEventObserver; ///< Delegate definition for job event observation.
typedef std::function<void(const JobQueueEntry& job, EJobEvent, uint64_t, size_t)> JobEventObserver; ///< Delegate definition for job event observation.

typedef std::deque<JobQueueEntry> JobQueue; ///< Data structure to represent job queue.

Expand Down Expand Up @@ -300,7 +300,7 @@ namespace jobsystem

struct TimelineEntry
{
size_t jobId; ///< ID of the job that generated this timeline entry.
uint64_t jobId; ///< ID of the job that generated this timeline entry.
ProfileClock::time_point start; ///< Job start time.
ProfileClock::time_point end; ///< Job end time.
char debugChar; ///< Job's debug character for profiling display.
Expand Down Expand Up @@ -375,13 +375,13 @@ namespace jobsystem

private:

void NotifyEventObserver(const JobQueueEntry& job, EJobEvent event, size_t value, size_t value2 = 0)
void NotifyEventObserver(const JobQueueEntry& job, EJobEvent event, uint64_t workerIndex, size_t jobId = 0)
{
#ifdef JOBSYSTEM_ENABLE_PROFILING

if (m_eventObserver)
{
m_eventObserver(job, event, value, value2);
m_eventObserver(job, event, workerIndex, jobId);
}

#endif // JOBSYSTEM_ENABLE_PROFILING
Expand Down Expand Up @@ -470,7 +470,7 @@ namespace jobsystem
threadName.dwFlags = 0;
__try
{
RaiseException(0x406D1388, 0, sizeof(threadName) / sizeof(DWORD), (ULONG_PTR*)&threadName);
RaiseException(0x406D1388, 0, sizeof(threadName) / sizeof(ULONG_PTR), (ULONG_PTR*)&threadName);
}
__except (EXCEPTION_CONTINUE_EXECUTION)
{
Expand Down Expand Up @@ -560,7 +560,7 @@ namespace jobsystem
{
private:

void Observer(const JobQueueEntry& job, EJobEvent event, size_t value, size_t value2 = 0)
void Observer(const JobQueueEntry& job, EJobEvent event, uint64_t workerIndex, size_t jobId = 0)
{
#ifdef JOBSYSTEM_ENABLE_PROFILING
switch (event)
Expand All @@ -586,21 +586,21 @@ namespace jobsystem

case eJobEvent_WorkerAwoken:
{
m_awokenMask |= GetBit(value);
m_awokenMask |= GetBit(workerIndex);
}
break;

case eJobEvent_WorkerUsed:
{
m_usedMask |= GetBit(value);
m_usedMask |= GetBit(workerIndex);
}
break;

case eJobEvent_JobStart:
{
auto& timeline = value < m_workers.size() ? m_timelines[value] : m_timelines[m_workers.size()];
auto& timeline = workerIndex < m_workers.size() ? m_timelines[workerIndex] : m_timelines[m_workers.size()];
ProfilingTimeline::TimelineEntry entry;
entry.jobId = value2;
entry.jobId = jobId;
entry.start = ProfileClock::now();
entry.debugChar = job.m_state ? job.m_state->m_debugChar : 0;
timeline.m_entries.push_back(entry);
Expand All @@ -609,7 +609,7 @@ namespace jobsystem

case eJobEvent_JobDone:
{
auto& timeline = value < m_workers.size() ? m_timelines[value] : m_timelines[m_workers.size()];
auto& timeline = workerIndex < m_workers.size() ? m_timelines[workerIndex] : m_timelines[m_workers.size()];
auto& entry = timeline.m_entries.back();
entry.end = ProfileClock::now();
}
Expand Down Expand Up @@ -709,7 +709,7 @@ namespace jobsystem
{
JOBSYSTEM_ASSERT(state->m_ready.load(std::memory_order_acquire));

const size_t workerAffinity = kAffinityAllBits;
const affinity_t workerAffinity = kAffinityAllBits;

// Steal jobs from workers until the specified job is done.
while (!state->IsDone())
Expand Down Expand Up @@ -740,7 +740,7 @@ namespace jobsystem

// Steal and run jobs from workers until all queues are exhausted.

const size_t workerAffinity = kAffinityAllBits;
const affinity_t workerAffinity = kAffinityAllBits;

JobQueueEntry job;
bool foundBusyWorker = true;
Expand Down Expand Up @@ -812,8 +812,8 @@ namespace jobsystem
std::atomic<unsigned int> m_jobsRun; ///< Counter to track # of jobs run.
std::atomic<unsigned int> m_jobsAssisted; ///< Counter to track # of jobs run via external Assist*().
std::atomic<unsigned int> m_jobsStolen; ///< Counter to track # of jobs stolen from another worker's queue.
std::atomic<unsigned int> m_usedMask; ///< Mask with bits set according to the IDs of the jobs that have executed jobs.
std::atomic<unsigned int> m_awokenMask; ///< Mask with bits set according to the IDs of the jobs that have been awoken at least once.
std::atomic<uint64_t> m_usedMask; ///< Mask with bits set according to the IDs of the jobs that have executed jobs.
std::atomic<uint64_t> m_awokenMask; ///< Mask with bits set according to the IDs of the jobs that have been awoken at least once.

private:

Expand Down Expand Up @@ -844,8 +844,8 @@ namespace jobsystem
"Jobs Run: %8d\n" // May be < jobs submitted
"Jobs Stolen: %8d\n"
"Jobs Assisted: %8d\n"
"Workers Used: %u\n"
"Workers Awoken: %u\n"
"Workers Used: %llu\n"
"Workers Awoken: %llu\n"
,
m_jobsRun.load(std::memory_order_acquire),
m_jobsStolen.load(std::memory_order_acquire),
Expand Down
16 changes: 8 additions & 8 deletions test/jobsystemtest/jobsystemtest.vcxproj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
Expand All @@ -23,32 +23,32 @@
<ProjectGuid>{4FC5B6FE-D227-4EE8-B4A5-9244C946387B}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>jobsystemtest</RootNamespace>
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
Expand Down Expand Up @@ -104,7 +104,7 @@
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions);WIN64</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>..\..\</AdditionalIncludeDirectories>
<TreatWarningAsError>true</TreatWarningAsError>
Expand Down Expand Up @@ -142,7 +142,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions);WIN64</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>..\..\</AdditionalIncludeDirectories>
<TreatWarningAsError>true</TreatWarningAsError>
Expand Down
Binary file added test/jobsystemtest/x64/Release/jobsystemtest.exe
View file
Binary file not shown.

0 comments on commit 0e71b55

Please sign in to comment.