New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Deinit functions #1859

Merged

kunstmusik merged 28 commits into develop from feature/deinit

May 12, 2024

Member

vlazzarini commented Apr 2, 2024

New deinit system for opcodes

The third function slot in OENTRY has been redeployed to support a deinit function.
This function has the same signature as init() and perf() functions.
The old deinit callback mechanism has been removed
Opcodes have been converted to using the new system
include/plugin.h and Opcodes/OpcodeBase.hpp have been modified to operate with the new system

vlazzarini added 4 commits

April 1, 2024 16:22


          working on deinit

2877ffc


          converted diskin to use new deinit

f6a917c


          deinit implemented and callback mechanism removed

21a6094


          Merge branch 'develop' into feature/deinit

1010ced

vlazzarini requested review from kunstmusik and jpffitch

April 2, 2024 14:40

vlazzarini changed the title ~~Feature/deinit~~ Deinit functions

vlazzarini added 2 commits

April 2, 2024 18:31


          moved away from use thread from OENTRY

123f98a


          improved code

530366e

Contributor

gogins commented Apr 3, 2024 via email

Good, Mike

----------------------------------------------------- Michael Gogins Irreducible Productions http://michaelgogins.tumblr.com Michael dot Gogins at gmail dot com

On Tue, Apr 2, 2024 at 3:40 PM vlazzarini ***@***.***> wrote: New deinit system for opcodes - The third function slot in OENTRY has been redeployed to support a deinit function. - This function has the same signature as init() and perf() functions. - The old deinit callback mechanism has been removed - Opcodes have been converted to using the new system - include/plugin.h and Opcodes/OpcodeBase.hpp have been modified to operate with the new system ------------------------------ You can view, comment on, or merge this pull request online at: #1859 Commit Summary - 2877ffc <2877ffc> working on deinit - f6a917c <f6a917c> converted diskin to use new deinit - 21a6094 <21a6094> deinit implemented and callback mechanism removed - 1010ced <1010ced> Merge branch 'develop' into feature/deinit File Changes (37 files <https://github.com/csound/csound/pull/1859/files>) - *M* Engine/csound_orc_semantics.c <https://github.com/csound/csound/pull/1859/files#diff-40ff15734704fc9189a2cbc6724e0c7e786991aa2692fc4a044c462f96b2f873> (4) - *M* Engine/entry1.c <https://github.com/csound/csound/pull/1859/files#diff-57206c58764b5c13309502b3dd921bcf346317cac940dcc91904d56f575a909a> (30) - *M* Engine/insert.c <https://github.com/csound/csound/pull/1859/files#diff-9024de7ca0528d6602be1f01f5057167201d8a7f8ebc6596c0b915a8a5974909> (63) - *M* Engine/symbtab.c <https://github.com/csound/csound/pull/1859/files#diff-425dfc94f91c28f6c6ae7c3fae9f736c1f43c9848ff22f2d036fe1a6eab2a216> (4) - *M* Engine/ugen.c <https://github.com/csound/csound/pull/1859/files#diff-119a79eaa960496d6964351741e7491d0c3441d07cf8881875b7e33cfec84557> (9) - *M* H/diskin2.h <https://github.com/csound/csound/pull/1859/files#diff-3606a5fa20f9f1d734543c56f1d61f530cd766f8db5f016a4f74613e83ebcc36> (3) - *M* H/entry1.h <https://github.com/csound/csound/pull/1859/files#diff-ec58ba1b7bbee413014d79c22e372fae52e3da6569108880cd687aa4e1cb3047> (1) - *M* H/prototyp.h <https://github.com/csound/csound/pull/1859/files#diff-660c197e8537dd9c4a66471bd5e435a54b2ba825c0afa0a239c6ba512e522de9> (12) - *M* OOps/diskin2.c <https://github.com/csound/csound/pull/1859/files#diff-07d2f3d5577688f4a9a5721fd430559c954204c5a27b06a5a041a949ae168390> (29) - *M* OOps/goto_ops.c <https://github.com/csound/csound/pull/1859/files#diff-613b102ff640e47f9c13c340cf4ff2527552bdcb7c5d1288b45b6ac95a70a8c5> (6) - *M* Opcodes/OSC.c <https://github.com/csound/csound/pull/1859/files#diff-9bbadd01d8ca48d6ee9e21425c4306a475bf846a1af3f80210567745bc849992> (32) - *M* Opcodes/OpcodeBase.hpp <https://github.com/csound/csound/pull/1859/files#diff-663c6ec15d2baef642557b54df88c17a5538dc6aa7eae3368bd41bbbe46b8135> (14) - *M* Opcodes/cpumeter.c <https://github.com/csound/csound/pull/1859/files#diff-f1d8e51f8b6cb202d61f722dbcd1584b26bbd232a69581265aea7e94187f8bbe> (14) - *M* Opcodes/date.c <https://github.com/csound/csound/pull/1859/files#diff-b35a8b28e1236c9af1f4b27f8e2fae1a1c07cf0338a300a7f2cd7da7a45dc1eb> (6) - *M* Opcodes/doppler.cpp <https://github.com/csound/csound/pull/1859/files#diff-df0f4ae11367b1021d66e7d68f69638ac61a50e418cd5789c0b161a680088229> (2) - *M* Opcodes/fout.c <https://github.com/csound/csound/pull/1859/files#diff-c8e1aa5d9677f54c5cc77ce3f805ecc67ab1a97454a0c648477a57a47d7f7aca> (286) - *M* Opcodes/fout.h <https://github.com/csound/csound/pull/1859/files#diff-c2fddd0d1910fb2f759e62030d5463274cdcf6946b3d7eb915cb6d195faba6bf> (3) - *M* Opcodes/framebuffer.c <https://github.com/csound/csound/pull/1859/files#diff-2a4ea9a5dcbb071ea0a138fe2f734e86063d9fdc18042f92c242eb55b41b5e3f> (4) - *M* Opcodes/ftgen.c <https://github.com/csound/csound/pull/1859/files#diff-21820e18dd8cf350beccf8c93ddba391a49d9a8dabe10ca179548e0e32022918> (87) - *M* Opcodes/mixer.cpp <https://github.com/csound/csound/pull/1859/files#diff-d03be28c490ca59d0bd5dc398bcd687257953dff2256a8856ae34a45fd13d757> (2) - *M* Opcodes/mp3in.c <https://github.com/csound/csound/pull/1859/files#diff-495917635609f75311cc9ca78682407e3e9f8efc08b5d1337c45a9098e1d9505> (1612) - *M* Opcodes/pvsbasic.c <https://github.com/csound/csound/pull/1859/files#diff-21e3e4289348d3320f2aa0cfaf774880a1c90772c8270970177bc244b23be4f1> (5) - *M* Opcodes/pvsops.cpp <https://github.com/csound/csound/pull/1859/files#diff-b898f773e343fb332eb630cf2e15d2e3ce1aa54d980f7d3fc82c7c3ae7667bad> (1) - *M* Opcodes/scansyn.c <https://github.com/csound/csound/pull/1859/files#diff-1a2e2ff26525bfbd8ce3882a3d8cda0505d3f00b1c2de80fde36aab130fb9587> (3) - *M* Opcodes/serial.c <https://github.com/csound/csound/pull/1859/files#diff-dff96376dae6c7808dd357b6cd619d705efb38bc403718c3eb183cb217da025e> (5) - *M* Opcodes/sfont.c <https://github.com/csound/csound/pull/1859/files#diff-5fcd787b3d9bea1b6d5056c0d49ee66e73825286606f42e48afcbe70632371a5> (2) - *M* Opcodes/signalflowgraph.cpp <https://github.com/csound/csound/pull/1859/files#diff-0ff94ec115aaadcebb23922f56194a6f2965e2eb622e291f1db780197fac366f> (12) - *M* Opcodes/sockrecv.c <https://github.com/csound/csound/pull/1859/files#diff-e28bb3ffa77083878dac7c17eec92e1b9e129f89da324840fb7c558770aea6b2> (16) - *M* Opcodes/socksend.c <https://github.com/csound/csound/pull/1859/files#diff-d4fa5c800bb67bea1afa99d6080dff631bd31eac5a297417a84611bb43371f98> (10) - *M* Opcodes/tl/fractalnoise.cpp <https://github.com/csound/csound/pull/1859/files#diff-9b9dad6b34dbfa5aaff3436014fd2328199b3d0b9a7d761d28146557a7a5d386> (6) - *M* Opcodes/urandom.c <https://github.com/csound/csound/pull/1859/files#diff-3c0a3ba4a13b3181df0d99008d597d8f0e6c72e8315560e8f906ea57b1881138> (6) - *M* Top/csound.c <https://github.com/csound/csound/pull/1859/files#diff-4f3db773e106805643aac39c6310a235b0432391453b85b3a0c4e9dbe3c61248> (50) - *M* include/csdl.h <https://github.com/csound/csound/pull/1859/files#diff-02bccfbd0fe28aacc0d8fa8a714d4979d15b71ea016917dc68d41837d3acf6cb> (2) - *M* include/csound.h <https://github.com/csound/csound/pull/1859/files#diff-2c2523152cfb4a6e2225a6f4a39419ff225911e00122ac9459f7f6e08195e285> (2) - *M* include/csoundCore.h <https://github.com/csound/csound/pull/1859/files#diff-21a7707764b5b83498187e667d2af9424a5b762af26b988ea4bcbcdfd97049ec> (15) - *M* include/plugin.h <https://github.com/csound/csound/pull/1859/files#diff-3b0b543c3a9025ae5927d00261bf8ff30b5793397ea4d17dfe107a0f83ca3bd2> (32) - *M* util/mkdb.c <https://github.com/csound/csound/pull/1859/files#diff-dc210586ceb00407c2d3bcdbd51566a314a8540f312cc2ff8d523b679224a3f7> (2) Patch Links: - https://github.com/csound/csound/pull/1859.patch - https://github.com/csound/csound/pull/1859.diff — Reply to this email directly, view it on GitHub <#1859>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ABQIGJNYLKR7BYGKGUYOUSDY3K7PFAVCNFSM6AAAAABFTRALEGVHI2DSMVQWIX3LMV43ASLTON2WKOZSGIZDANZQGQ2DIOI> . You are receiving this because you are subscribed to this thread.Message ID: ***@***.***>


          OENTRY thread has been removed

0728c8b

Member Author

vlazzarini commented Apr 4, 2024

As discussed in the developer's list, I have now removed the thread field from OENTRY.

The information it carried can be reproduced by

oentry.iopadr && oentry.kopadr  ? 3 : 
(oentry.iopadr ? 1 : 2)

vlazzarini added 3 commits

April 4, 2024 17:24


          renamed function fields in OENTRY and OPDS

0a987be


          Merge branch 'develop' into feature/deinit

0c31193


          also renamed opadr as perf

c0383da

Member Author

vlazzarini commented Apr 4, 2024

Completed the PR with renaming: iopadr to init, opadr/kopadr to perf and dopadr to deinit.

vlazzarini added 6 commits

April 8, 2024 15:50


          merged from develop

99ef64d


          fixing crash on csoundSetOption failure

c0c3378


          Merge branch 'develop' into feature/deinit

ce9cf90


          fixed merge from develop

27f14e0


          fixed merge from develop

2886f49


          merged develop

e00d62a

Member

kunstmusik commented Apr 30, 2024

@vlazzarini This looks to have conflicts now after merging in the oscils branch. Could you take a look at merging develop into this? I'll proceed to review after GH actions can build this branch again.

Member Author

vlazzarini commented Apr 30, 2024

I will. I was anticipating this.


          merged develop

3e98005

Member Author

vlazzarini commented Apr 30, 2024

This is done now.

kunstmusik reviewed

View reviewed changes

Engine/csound_orc_compile.c Outdated Show resolved Hide resolved

vlazzarini added 2 commits

May 1, 2024 06:57


          changed the test for perf time code

41fe7fc


          check for boolean

e2adf0a

kunstmusik reviewed

View reviewed changes

Engine/csound_orc_compile.c Outdated Show resolved Hide resolved

kunstmusik reviewed

View reviewed changes

Opcodes/OSC.c Outdated Show resolved Hide resolved

kunstmusik reviewed

View reviewed changes

Opcodes/OSC.c Outdated Show resolved Hide resolved

kunstmusik reviewed

View reviewed changes

Opcodes/afilters.c Outdated Show resolved Hide resolved

kunstmusik reviewed

View reviewed changes

Opcodes/cpumeter.c Outdated Show resolved Hide resolved

kunstmusik reviewed

View reviewed changes

Opcodes/date.c Outdated Show resolved Hide resolved

kunstmusik reviewed

View reviewed changes

Opcodes/dssi4cs/src/dssi4cs.c Outdated Show resolved Hide resolved

kunstmusik reviewed

View reviewed changes

Opcodes/mp3in.c Show resolved Hide resolved

kunstmusik reviewed

View reviewed changes

Opcodes/pvsops.cpp Show resolved Hide resolved

kunstmusik reviewed

View reviewed changes

Opcodes/vbap_zak.c Show resolved Hide resolved

kunstmusik reviewed

View reviewed changes

Top/argdecode.c Show resolved Hide resolved

kunstmusik reviewed

View reviewed changes

include/csoundCore.h Outdated Show resolved Hide resolved

kunstmusik reviewed

View reviewed changes

include/plugin.h Outdated Show resolved Hide resolved

kunstmusik reviewed

View reviewed changes

include/plugin.h Outdated Show resolved Hide resolved

kunstmusik reviewed

View reviewed changes

util/mkdb.c Outdated Show resolved Hide resolved

vlazzarini added 2 commits

May 9, 2024 15:32


          review

59ae6f2


          Merge branch 'develop' into feature/deinit

0f7c290

kunstmusik reviewed

View reviewed changes

Engine/csound_orc_compile.c Outdated Show resolved Hide resolved

vlazzarini added 5 commits

May 10, 2024 11:32


          review 2

cd56893


          review 2 - goto

3b12536


          working on goto issue

c4e0eb8


          continuing investigation

91884e7


          fixed all requests bar the kgoto and argdecode issues

813a301

kunstmusik reviewed

View reviewed changes

Engine/insert.c Outdated Show resolved Hide resolved

kunstmusik mentioned this pull request

Regression: Fix issue with argdecode #1878

Open

vlazzarini added 2 commits

May 12, 2024 13:18


          removed tracing

625aa38


          Merge branch 'develop' into feature/deinit

eaa2b31

kunstmusik mentioned this pull request

Regression: fix issue with loops in UDOs #1879

Open

kunstmusik approved these changes

View reviewed changes

Member

kunstmusik commented May 12, 2024

Note: a couple of regressions resulted from this PR:

We will need to address these but it's worth it to merge and move forward.

kunstmusik merged commit d7bc57c into develop

8 checks passed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment