Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 15a189d3cad6
Choose a base ref
...
head repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cda65868ddc1
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on May 31, 2021

  1. pthread_compat: minor coding style fixes to curly braces, added heade… 

    …r comments
    @azonenberg
    azonenberg committed May 31, 2021
    Copy the full SHA
    945ccd5 View commit details

  2. Updated to latest scopehal

    @azonenberg
    azonenberg committed May 31, 2021
    Copy the full SHA
    cda6586 View commit details
Showing with 61 additions and 2 deletions.
  1. +1 −1 lib
  2. +31 −1 src/glscopeclient/pthread_compat.cpp
  3. +29 −0 src/glscopeclient/pthread_compat.h
2 changes: 1 addition & 1 deletion lib
Submodule lib updated 5 files
+3 −0 .gitmodules
+1 −0 OpenCL-CLHPP
+9 −2 scopehal/CMakeLists.txt
+3 −2 scopehal/PeakDetectionFilter.cpp
+1 −1 scopehal/scopehal.h
32 changes: 31 additions & 1 deletion src/glscopeclient/pthread_compat.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,38 @@
/***********************************************************************************************************************
* *
* glscopeclient *
* *
* Copyright (c) 2012-2021 Andrew D. Zonenberg *
* All rights reserved. *
* *
* Redistribution and use in source and binary forms, with or without modification, are permitted provided that the *
* following conditions are met: *
* *
* * Redistributions of source code must retain the above copyright notice, this list of conditions, and the *
* following disclaimer. *
* *
* * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the *
* following disclaimer in the documentation and/or other materials provided with the distribution. *
* *
* * Neither the name of the author nor the names of any contributors may be used to endorse or promote products *
* derived from this software without specific prior written permission. *
* *
* THIS SOFTWARE IS PROVIDED BY THE AUTHORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED *
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL *
* THE AUTHORS BE HELD LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES *
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR *
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT *
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE *
* POSSIBILITY OF SUCH DAMAGE. *
* *
***********************************************************************************************************************/

#if defined(unix) || defined(__unix__) || defined(__unix)
#include <pthread.h>
#endif

void pthread_setname_np_compat(const char *name) {
void pthread_setname_np_compat(const char *name)
{
#if defined(unix) || defined(__unix__) || defined(__unix)
#if __linux__
// on Linux, max 16 chars including \0, see man page
29 changes: 29 additions & 0 deletions src/glscopeclient/pthread_compat.h
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,32 @@
/***********************************************************************************************************************
* *
* glscopeclient *
* *
* Copyright (c) 2012-2021 Andrew D. Zonenberg *
* All rights reserved. *
* *
* Redistribution and use in source and binary forms, with or without modification, are permitted provided that the *
* following conditions are met: *
* *
* * Redistributions of source code must retain the above copyright notice, this list of conditions, and the *
* following disclaimer. *
* *
* * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the *
* following disclaimer in the documentation and/or other materials provided with the distribution. *
* *
* * Neither the name of the author nor the names of any contributors may be used to endorse or promote products *
* derived from this software without specific prior written permission. *
* *
* THIS SOFTWARE IS PROVIDED BY THE AUTHORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED *
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL *
* THE AUTHORS BE HELD LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES *
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR *
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT *
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE *
* POSSIBILITY OF SUCH DAMAGE. *
* *
***********************************************************************************************************************/

#ifndef pthread_compat_h
#define pthread_compat_h
void pthread_setname_np_compat(const char *name);