Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Final move of Dustins network tables patches

Browse Source 
Change-Id: I7d351d87e63c8174b62f4ec09f805f685c80019c
This commit is contained in:
Fredric Silberberg
2015-02-07 19:19:59 -05:00
parent 39158754d7
commit bfa4bbaf78
8 changed files with 91 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
networktables/cpp/lib/Win32/src/main/native/OSAL/Task.cpp
View File

@@ -1,6 +1,8 @@
#include "stdafx.h"
#include "OSAL/Task.h"
#include "NetworkCommunication/UsageReporting.h"
#include "WPIErrors.h"
#include <string.h>
#include <Windows.h>
@@ -55,7 +57,7 @@ DWORD thread_proc( void *p_ptr )
//This sets the name of the thread, which can help to identify threads in win32
#define MS_VC_EXCEPTION 0x406D1388
static void set_thread_name( const char *p_thread_name, DWORD ID )
{
{
#pragma pack(push,8)
typedef struct tagTHREADNAME_INFO
{ DWORD dwType; // Must be 0x1000.
@@ -162,7 +164,7 @@ bool NTTask::Stop()
::TerminateThread( m_Handle, 0 );
// Free the memory
::VirtualFree( Info_.AllocationBase, 0, MEM_RELEASE );
::VirtualFree( Info_.AllocationBase, 0, MEM_RELEASE );
}
//if (Verify())
@@ -289,19 +291,19 @@ bool NTTask::HandleError(STATUS results)
//case S_objLib_OBJ_ID_ERROR:
// wpi_setWPIErrorWithContext(TaskIDError, m_taskName);
// break;
//
//
//case S_objLib_OBJ_DELETED:
// wpi_setWPIErrorWithContext(TaskDeletedError, m_taskName);
// break;
//
//
//case S_taskLib_ILLEGAL_OPTIONS:
// wpi_setWPIErrorWithContext(TaskOptionsError, m_taskName);
// break;
//
//
//case S_memLib_NOT_ENOUGH_MEMORY:
// wpi_setWPIErrorWithContext(TaskMemoryError, m_taskName);
// break;
//
//
//case S_taskLib_ILLEGAL_PRIORITY:
// wpi_setWPIErrorWithContext(TaskPriorityError, m_taskName);
// break;
@@ -312,4 +314,3 @@ bool NTTask::HandleError(STATUS results)
//}
return false;
}