Skip to content
Snippets Groups Projects

make some changes to awg interface files needed for use in CDS-CRTOOLS

Merged Erik von Reis requested to merge erik.vonreis/advligorts:awg_code_improvements into master
1 unresolved thread

Changes include wrapping testpoint functions in extern "C" for C++ use,

Adding back in some dynamic configuration functionality, and adding back in a truly egregious #ifdef that determines where the DCUID (node number) for a testpoint may be found in the testpoint structure.

Edited by Erik von Reis

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Erik von Reis marked this merge request as draft

    marked this merge request as draft

  • Erik von Reis added 1 commit

    added 1 commit

    • 85c863a6 - awgptman: testpoint.* now builds and runs with cds-crtools

    Compare with previous version

  • Erik von Reis added 1 commit

    added 1 commit

    • a6dcc288 - awgtpman: fixed node number returned by tpIsValid

    Compare with previous version

  • Erik von Reis marked this merge request as ready

    marked this merge request as ready

  • Erik von Reis marked this merge request as draft

    marked this merge request as draft

  • Erik von Reis changed title from Draft: awgtpman: put extern "C" around declarations in tesptoint.h to Draft: make some changes to awg interface files needed for use in CDS-CRTOOLS

    changed title from Draft: awgtpman: put extern "C" around declarations in tesptoint.h to Draft: make some changes to awg interface files needed for use in CDS-CRTOOLS

  • Erik von Reis changed the description

    changed the description

  • Erik von Reis added 1 commit

    added 1 commit

    • 32ffa90e - Wrap node detection in an #ifdef so that the different node locations between...

    Compare with previous version

  • Erik von Reis added 1 commit

    added 1 commit

    • f659a840 - awtpman Add DCUID in as chGroup as well as rmID

    Compare with previous version

  • Erik von Reis added 4 commits

    added 4 commits

    • d959fc28 - awgtpman: put extern "C" around declarations in tesptoint.h
    • dc1bea6e - awgptman: testpoint.* now builds and runs with cds-crtools
    • e7fda4b7 - awgtpman: fixed node number returned by tpIsValid
    • 868fd50e - awtpman Add DCUID in as chGroup as well as rmID

    Compare with previous version

  • Erik von Reis changed target branch from master to branch-4.2

    changed target branch from master to branch-4.2

  • Erik von Reis marked this merge request as ready

    marked this merge request as ready

  • Erik von Reis marked this merge request as draft

    marked this merge request as draft

  • Erik von Reis added 209 commits

    added 209 commits

    • f3fd5c3c - Add CLI utilities for working with raw trend files
    • 6beef937 - Minor changes to build under Debian 11.
    • 66a8a328 - Uncomitted changes rolf left on x2ats.
    • 6f63f432 - Merge branch 'master' into rolf_uncommitted
    • ef3075e2 - Removed some produced pdfs
    • ca47ecb7 - Merge branch 'low_io_count' into rolf_uncommitted
    • 209b1a4c - Merge branch 'master' into rolf_uncommitted
    • 0904a8d6 - Merge branch 'rolf_uncommitted' of https://git.ligo.org/cds/advligorts into rolf_uncommitted
    • cfe10125 - Merge branch 'rolf_uncommitted' of https://git.ligo.org/cds/advligorts into rolf_uncommitted
    • 21aba0e2 - Merge branch 'rolf_uncommitted' of https://git.ligo.org/cds/advligorts into rolf_uncommitted
    • 22a3d584 - RCG test: reverted oscillator test files back to those in master branch. They...
    • 143920a3 - Added stop test models
    • e20d6382 - Merge branch 'rolf_uncommitted' of https://git.ligo.org/cds/advligorts into rolf_uncommitted
    • 3e5a46a0 - Merge branch 'master' into rolf_uncommitted
    • 39196548 - RCG and RCG test Removed some unneeded files
    • 81f9bba3 - RCG test: removed unnecessary file
    • 3f6f758b - Added to gitignore
    • a9990158 - rcgtest: oscillator test now stops and starts the model, minimizing gradual error increase.
    • 8b92491f - rcgtest: DACKILL test improved to reliably reset IOP DK before test.
    • ef244aaf - rcgtest: getting autotest scripts working
    • 8de33229 - rcgtest: Moved auto test files into their own directory
    • 7b49742c - rcgtest: put autotest directory in rcgtest parent directory
    • 3994344e - rcgtest: Basic autotest script working
    • 970d22ad - rcg automated tests ran through systemd overnight.
    • 6e2d3be1 - Merge branch 'master' into improve_rcg_tests
    • 9e1cfeb8 - RCG tests: fixed duotone button to start the correct test. Was starting DAC kill test.
    • bdb2a4d0 - RCGTEST: fixed some problems with autotest report generation
    • 8f55669d - rcgtest: Put all tests in background so they don't lock the medm while executing.
    • 665069b3 - Merge branch 'master' into improve_rcg_tests
    • b35149c9 - Set environment when running tests. Also, make test user "controls".
    • 27d46901 - rcgtest: buildtestmodels.sh now quits on failure
    • e1a4a20b - rcgtest: Add Gps to list of ignored part types during calculation sequencing.
    • 20901e60 - rcgtest: Parameters now an ignored block for calculation
    • 7a96ea8a - rcgtest: Added some more types to ignore during calculation
    • ab72bdc2 - rcgttests: Fixed some typos in builttestmodels.sh
    • f5dfee7b - rcgtest: add -w as an option to make perl script wait until all tests complete
    • f4ee6e87 - rcgtest: fixed string compare
    • 790d8855 - rcgtest: python tests explicitly set to run python2
    • 3bb11b79 - rcgtest: tests made more 'rcg directory' agnostic. Some race conditions that...
    • 743c0315 - rcgtest: improved some test timing, fixed some test bugs
    • e0ff0c89 - autotest now working on best commit
    • 2f2aafdc - rcg test: change automated test type to 'all'
    • bda01c95 - rcg: partial fix to IRIGB
    • 1b0f8d3c - Merge branch 'improve_rcg_tests' into 'master'
    • 5cdb6ff3 - RCG: Fix post process script to handle $bdroot simulink variable
    • 8854ace9 - Merge branch 'post_build_script_fix' into 'master'
    • 9337deee - Merge branch 'master' into irigb_on_slow_iop
    • 04afc054 - Correct TIME 0 values for non-standard IOPs
    • ac32d28c - Merge branch '255_update_cmake_and_code_to_build_both_buster_and_bullseye' into 'master'
    • 94ea529c - Merge branch 'irigb_on_slow_iop' into 'master'
    • 1d4ad17a - Updates to gpstime/mbuf code to build on 5.10.x kernels.
    • 782837fe - remove old unused stuff
    • 5c786d0f - Merge branch 'cleanup' into 'master'
    • e4736c8e - Including a Linux kernel module that encapsulates the LIGO RT patch.
    • 656baf67 - move rtcds python package into src top level
    • 33d8181d - create skeleton for new python rcg package
    • ab8336a2 - Merge branch 'python-org' into 'master'
    • a025419e - Merge branch 'realtime_as_kernel_module' into 'master'
    • 043242a1 - Merge branch 'bullseye_build' into 'master'
    • e729bdb5 - Fix for 332, standalone_edcu does not reflect all of its created values into EPICS.
    • 1e07e7ce - Merge branch 'issue_332_standalone_edcu_not_special_epics_variables' into 'master'
    • dba353a1 - Close issue #333 (closed) rename ligo_rt to rts-cpu-isolator
    • ea97f818 - Merge branch 'issue_333_rename_ligo_rt' into 'master'
    • 9a9979e3 - Fix init/exit function names and printks for rts-cpu-isolator
    • 3bc794ea - Adding comments, util functions and typedef for playdead() funtion type.
    • a2574a29 - Adding 'static' to inline functions
    • 8e092e02 - Adapt the rcg build process to use rts-cpu-isolator symvers file.
    • 389af56c - Removing TODO and added issue for it
    • 330d87f9 - Merge branch 'issue-334' into 'master'
    • b0f1be6e - Adding the use of the rts-cpu-isolator.h header, and calling the...
    • 18ce7b34 - Merge branch 'issue_335_rcg_user_rts_cpu_isolator' into 'master'
    • 45aba124 - Fixing set_fe_code_idle( func ), func prototype needs to match the expected...
    • 8dd8ea93 - Fixing the void* (*) (void*) mismatch with the fe_start_controller and Linux play_dead prototypes
    • e4329266 - Merge branch 'master' of git.ligo.org:cds/advligorts into issue-337-moduleLoad
    • 6a30f779 - Fixing typo, makefile paths and missing linux/cpu.h header include
    • dd25ab3f - Cleaning up comments a bit, and making the include base start at src/drv/
    • 4958df6b - Merge branch 'issue-337-moduleLoad' into 'master'
    • 1c41746a - Remove all references to ioremap_nocache and replace with the LIGO_IOREMAP macro.
    • c46321d9 - Renaming the ligo_iomap.h and LIGO_IOREMAP to be more general.
    • 8b96ff81 - Merge branch 'issue_338_ioremap_cache_cannot_be_used_after_linux_5.6' into 'master'
    • 48e29a99 - Correcting the header to include for the ioremap version selection. drv/mmap.rfm.5565
    • 3e864a0f - RCG: Add automated tests for building, installing and running models.
    • 811eda80 - Update the ligo_shmem python module documentation.
    • f79d211c - Removing unused EPICS state notation programs
    • 4ba6b652 - Removing all remaining calls to findRfmCard
    • 50a7ba68 - Fixing typo in last commit
    • bb67b4e3 - Removing the now unused findRfmCard() function
    • ec73a1ea - Cleaning up tabs
    • b81646e4 - Merge branch 'shared-mem-cleanup' into 'master'
    • 8b64e7d2 - The feCodeGen.pl script was using ./diags.txt and ./diags2.txt to build the...
    • ea99d915 - Did not want to remove that line...
    • 7ef7d876 - Removing commented out line
    • 475c2b70 - Cleaning up findSharedMemory usage, fixing error checks on the returned...
    • eb60e3f6 - Adding include gaurd and include in file that implements
    • 53e5b5cc - Reduce foot print of cycle1 -> cycle2 dma size change for fast adcs.
    • bf30af07 - Merge branch 'nicer_dma_switch' into 'master'
    • db36c609 - Merge branch 'parallel-build-diags-file' into 'master'
    • 4405f1e3 - Merge branch 'rfm-global-cleanup' into 'master'
    • b054bd94 - Fixing permissions, and adding exe check
    • ddcf9812 - Merge branch 'bug_fix' into 'master'
    • 6df953db - Adding volatile for memory mapped IO, adding function for kernel space...
    • 6681c24a - Adding changes to allow for Debian 11 fe model builds
    • b06657c9 - Removing the unneeded ExtraSymbols.symvers and cleaning up the FE makefile so...
    • 4d65f815 - removing tab, so line does not get printed
    • 703d303d - Merge branch 'debian11-build-make' into 'master'
    • 3857dc3b - Merge branch 'master' into gpstime
    • a2c9afc7 - Fixing typo in file_operations data members
    • 80dcf468 - Merge branch 'gpstime-4-19-file-ops' into 'master'
    • 9295f83b - Merge branch 'master' into gpstime
    • 9df9e90a - Adding more banned extensions to (sub) gitignore
    • 8a8b402e - Fixing other test, so it uses new API
    • 1e5538f6 - Adding functiong header comment
    • a5abb5d7 - Merge branch 'gpstime' into 'master'
    • 355a4475 - Using the .h convention for includes, splitting kernel space and userspace timing calls
    • 8270b25c - Fixing userspce model build, undefined ref, and adding some include guards
    • 1a31253d - Fixing comment
    • b6c77aaa - Not removing these lines yet, but not sure why they are needed
    • 871cf8df - Merge branch 'us_shmem' into 'master'
    • 2d1cc38d - Merge branch 'model_build_tests' into 'master'
    • c648c87c - Fixing undefined refrence on debian 11, adding better error messages,...
    • 6a882604 - Removing the copy and lib from the path, so you can build the x1tst example...
    • ba2871dc - Merge branch 'deb11_build' into 'master'
    • e946f631 - RCG: Fix $bdroot variable replacement for long library references.
    • e9697a25 - Merge branch 'deep_self_links' into 'master'
    • 89459e97 - Adding support for a custom target dir while building, fixing a few issues...
    • 4dcd7992 - Re-adding $ I removed on accident
    • 7563a8d4 - Adding missing die
    • 7b202c2e - Merge branch 'unit_test_fixes' into 'master'
    • 26527208 - Adding return type to a function where is was missing
    • eb6ec782 - Merge branch 'branch-4.2' into 'master'
    • f56b6866 - Adding static to functions that use static globals
    • ed93e167 - Merge branch 'small_fixes' into 'master'
    • 00f430da - Change types for ADC and DAC dma data to volatile pointer types
    • c30d5074 - Merge branch 'master' into volatile_dma_data
    • 7c44c7bc - Merge branch 'volatile_dma_data' into 'master'
    • 3c81c22e - Added colon to line in rtcds.in
    • 76129323 - Merge branch 'master' of ssh://git.ligo.org/cds/advligorts
    • eee6ab9e - WIP updating gpstime to allow pausing/resuming/stepping in time
    • 9c9e7fb8 - WIP update to fe_simulation to work better with paused/single stepping time.
    • 0cc2bc86 - Update gpstime.c to make the main path for getting time w/o a timing card lock...
    • 3376134d - Update gpstime.c and it pause code to have a distinct duration type.
    • 7194a1e2 - Updating the fe_simulation test program to allow pausing/stepping/resuming the gpstime.
    • 3da35c98 - Merge branch 'time_step' into 'master'
    • fcd585b7 - rts start scripts now honor RTS_ENV environment variable.
    • 8dd3b7be - Merge branch 'rts_env_variable' into 'master'
    • 1d0836f4 - fe_generator: Add DOLPHIN_GEN and USE_DOLPHIN_CONTROL_PORT environment flags
    • ef352158 - Adjust the CA SDF to not constrain PVs to its prefix.
    • 0f632132 - Merge branch 'add_dolphin_gen' into 'master'
    • fb919117 - Merge branch 'issue369_ca_sdf_multi_prefix' into 'master'
    • 576e835d - Merge branch 'issue_349_update_ligo_shmem_documentation' into 'master'
    • c31ef474 - Merge branch 'rawtrend-cli' into 'master'
    • afc962c5 - Changing the mbuf_allocate_area to return a pointer instead of an index to memory owned by mbuf
    • 0b29fa89 - small formatting changes
    • ddca2818 - Adding interface that returns differing error codes to match error cases, also some cleanup
    • 0f7d4f16 - Adding kernel interface tests
    • 2e5882cf - Fixing error with how we call mbuf_allocate_area() in mbuf_allocate_area_file()
    • c04a0661 - Reverting change to Makefile
    • 9c4848eb - cleanup, and adding readme file for the test module
    • 58f6b12d - Typo fixes
    • 10f038ea - Fixing but where asking for a non-page aligned size would crash the system
    • 0f841e1d - Adding another kernel space unit test
    • 659fb992 - Adding unit test, and model usage of the new kernel side interface
    • c8e73481 - Another bug fix to allow slow controls SDF to work without restricting it to a prefix
    • bbaa985d - Merge branch 'casdf_no_prefix_fix' into 'master'
    • 86912c62 - Adding error check, and module cleanup
    • 7550a7bd - Moving the page size round to common kernel/userspace path
    • 37adbdf8 - Adding header skip logic to the _safe.snap parsing logic
    • e8dfe8b5 - Merge branch 'master' into sdf_parse_fix
    • e7bc8fe7 - Merge branch 'sdf_parse_fix' into 'master'
    • 4282143f - Merge branch 'mbuf_changes' into 'master'
    • d294f50b - Adding beter log messages when module is in verbose mode, removing extra shmem...
    • 05bae8a2 - Merge remote-tracking branch 'upstream/branch-4.2' into master-4.2-merge-3
    • 12c9b016 - Merge remote-tracking branch 'upstream/branch-4.2' into master-4.2-merge-3
    • 8d0a3912 - Changing version to 5.0.0 for master branch
    • 16c6fecd - Merge branch 'master-4.2-merge-3' into 'master'
    • 04144412 - Merge branch 'master' into mbuf_changes
    • 1eb0ed07 - Fixing constant in shmem_testpoint.h, adding kernelspace mbuf test
    • 0eaeda6b - Adding constant for size of EPICS shared memory block
    • 2c30ba11 - Merge branch 'mbuf_changes' into 'master'
    • bf2eecb0 - The TrueRMS.pm part adds window sizes after the header \#endif in the MODEL.h...
    • e25553c6 - Merge branch 'endif-fix' into 'master'
    • 77530f8c - WIP convert the sequencer to C++
    • f30d143e - Update the EPICS sequencer to build with no warnings as a C++ program.
    • 63654d22 - Adding a basic fixed sized string for use by the epics sequencer.
    • a1b39424 - Adding the fixed_string class to the EPICS sequencer.
    • d8a93c17 - Change the EPICS sequencer to using std::mutex/lock_guard and RAII
    • c932dbe7 - Adding a basic vector with a fixed backing store for use by the epics sequencer.
    • 28a577fb - More work in integrating the fixed_size_vector into the epics sequencer.
    • 4735456f - WIP on minor cleanups in main.cc of the sequencer.
    • d54cfcbe - Renaming the sequencer targets
    • aac3a9ee - Updating the simple_epics to have the ability to do r/w PVs
    • 8b26b1db - Updating simple_pv/simple_epics to start testing rw PVs
    • 0c16c4b2 - Updating simple_pv to allow for more int types.
    • e915057d - Beginning to split epics_channel.hh for multiple interface definitions
    • 662507e2 - Move the standalone_edcu code to its own directory
    • dfc230f0 - Removing old model based edcu code and a makefile
    • 01564bc1 - Minor fixes to allow building.
    • e28e9dfa - Moving checkFileCrc into a user space utility header file.
    • a6c6086b - Merge with branch-4.2
    • e0ce6be1 - Merge branch 'branch-4.2-merge-with-master' into 'master'
    • eba449cd - Updates to simple_pv_int.hh to fix an issue noticed in review.
    • dd1d37f1 - Merge branch 'epics_seq_cxx' into 'master'
    • 78665a44 - Merge branch 'branch-4.2' into master-branch-4.2-merge
    • 4d5133e3 - Merge branch 'master-branch-4.2-merge' into 'master'
    • 26581a48 - Merge branch 'branch-4.2'
    • 424ce4bb - Fixing epics channel name, adding better error checking, and cleaning up
    • f944687e - Merge branch 'seq-fix' into 'master'
    • 287a25d7 - awgtpman: conversion between rpc struct and testpoint_t types made safer
    • 0b238071 - Merge branch 'safer_testpoint_conversion' into awg_code_improvements

    Compare with previous version

  • Erik von Reis added 1 commit

    added 1 commit

    • 5855552c - awgtpman: testpoint.c now checks for bad node points

    Compare with previous version

  • Erik von Reis changed target branch from branch-4.2 to master

    changed target branch from branch-4.2 to master

  • Erik von Reis marked this merge request as ready

    marked this merge request as ready

279 315 if ((cleartp_1 (tpNode[node].id, node, testpoints, &result,
280 316 clnt) != RPC_SUCCESS) || (result < 0)) {
281 317 gdsError (GDS_ERR_PROG, "unable to clear test points");
318 free(testpoints.TP_r_val);
282 319 result = -4;
283 320 }
284 321
285 322 /* free handle */
286 323 clnt_destroy (clnt);
324 free(testpoints.TP_r_val);
287 325 return result;
288 326 }
  • Erik von Reis added 1 commit

    added 1 commit

    • 5d06f054 - awgtpman: Dropped extra free in tpClear

    Compare with previous version

  • Jonathan Hanks mentioned in commit 9092fbc2

    mentioned in commit 9092fbc2

  • Please register or sign in to reply
    Loading