mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-19 00:41:43 +00:00
This deals with the majority of the user-facing code in wpilibC++Devices and a substantial portion of it in wpilibC++. wpilibC++Sim and wpilibC++IntegrationTests are untouched except where it is necessary to make them work with the rest of the libraries. There is still a lot to do in the following areas: -The HAL (which we may not want to touch at all). -The I2C, Serial, and SPI interfaces in wpilibC++Devices, which I haven't gotten around to doing yet. -Most wpilibC++Devices classes have void* pointers for interacting with the HAL. -InterruptableSensorBase passes a void *params for the interrupt handler. -I haven't converted all the const char* to std::strings. -There are plenty of other cases of raw pointers still existing. -This doesn't fall directly under raw pointer stuff, but move syntax and rvalue references could be introduced in many places. -I haven't touched vision code. -The Resource classes conflict (one is in the hal, the other in wpilibC++). Someone should figure out a more permanent fix (eg, just renaming them), then doing what I did (making a new namespace for one of them, essentially the same as renaming it). A few other things: -I created a NullDeleter class which is marked as deprecated. What this does is it can be passed as the deleter to a std::shared_ptr so that when you are converting raw pointers to shared_ptrs the shared_ptr doesn't do any deletion if someone else owns the raw pointer. This should only be used in making old raw pointer UIs. -I had to alter the build.gradle so that it did not emit errors when deprecated functions called deprecated functions. Unfortunately, gradle doesn't appear to be actually printing out gcc warnigns for some reason. The best way I have found to fix this is to patch the toolchains (https://bitbucket.org/byteit101/toolchain-builder/pull-request/5/make-gcc-not-throw-warnings-for-nested/diff) so that a deprecated function calling a deprecated function is fine but a non-deprecated function calling a deprecated function will throw a warning (which we then elevate with -Werror). I believe that clang deals with this properly, although I have not tried it myself. Change-Id: Ib8090c66893576fe73654f4e9d268f9d37be06a2
47 lines
1.6 KiB
C++
47 lines
1.6 KiB
C++
/*----------------------------------------------------------------------------*/
|
|
/* Copyright (c) FIRST 2008. All Rights Reserved. */
|
|
/* Open Source Software - may be modified and shared by FRC teams. The code */
|
|
/* must be accompanied by the FIRST BSD license file in $(WIND_BASE)/WPILib. */
|
|
/*----------------------------------------------------------------------------*/
|
|
#pragma once
|
|
|
|
#include "../Errors.hpp"
|
|
#include "HAL/cpp/priority_mutex.h"
|
|
#include <stdint.h>
|
|
|
|
#include <vector>
|
|
|
|
// TODO: Replace this with something appropriate to avoid conflicts with
|
|
// wpilibC++ Resource class (which performs an essentially identical function).
|
|
namespace hal {
|
|
|
|
/**
|
|
* The Resource class is a convenient way to track allocated resources.
|
|
* It tracks them as indicies in the range [0 .. elements - 1].
|
|
* E.g. the library uses this to track hardware channel allocation.
|
|
*
|
|
* The Resource class does not allocate the hardware channels or other
|
|
* resources; it just tracks which indices were marked in use by
|
|
* Allocate and not yet freed by Free.
|
|
*/
|
|
class Resource
|
|
{
|
|
public:
|
|
Resource(const Resource&) = delete;
|
|
Resource& operator=(const Resource&) = delete;
|
|
explicit Resource(uint32_t size);
|
|
virtual ~Resource() = default;
|
|
static void CreateResourceObject(Resource **r, uint32_t elements);
|
|
uint32_t Allocate(const char *resourceDesc);
|
|
uint32_t Allocate(uint32_t index, const char *resourceDesc);
|
|
void Free(uint32_t index);
|
|
|
|
private:
|
|
::std::vector<bool> m_isAllocated;
|
|
priority_recursive_mutex m_allocateLock;
|
|
|
|
static priority_recursive_mutex m_createLock;
|
|
};
|
|
|
|
} // namespace hal
|