1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-21 14:50:06 +02:00
Leland Lucius 15b9bb96cd Update nyquist to SVN r331 (r3.16+)
------------------------------------------------------------------------
   r331 | rbd | 2020-10-13 12:40:12 -0500 (Tue, 13 Oct 2020) | 2 lines

   Also forgot to install NyquistWords.txt

   ------------------------------------------------------------------------
   r330 | rbd | 2020-10-13 12:34:06 -0500 (Tue, 13 Oct 2020) | 2 lines

   Forgot to move nyquistman.pdf from docsrc/s2h to release

   ------------------------------------------------------------------------
   r329 | rbd | 2020-10-13 11:32:33 -0500 (Tue, 13 Oct 2020) | 2 lines

   Updated some version numbers for 3.16.

   ------------------------------------------------------------------------
   r328 | rbd | 2020-10-13 11:20:52 -0500 (Tue, 13 Oct 2020) | 2 lines

   Fixed NyquistIDE antialiasing for plot text, fix format of message.

   ------------------------------------------------------------------------
   r327 | rbd | 2020-10-12 21:01:53 -0500 (Mon, 12 Oct 2020) | 2 lines

   Fixed a couple of format problems in manual. This version of Nyquist has been tested wtih macOS, Linux, 32&64-bit Windows.

   ------------------------------------------------------------------------
   r326 | rbd | 2020-10-12 20:21:38 -0500 (Mon, 12 Oct 2020) | 1 line

   Modified WIN32 32-bit XLisp to use 64-bit FIXNUMs. This allows XLisp and Nyquist to handle big sounds even on 32-bit machines. Probably at some cost, but inner loops are mostly float and int32, and the Nyquist release is 64-bit anyway. Maybe we'll have to run some benchmarks on Audacity, which is still 32-bit on Windows.
   ------------------------------------------------------------------------
   r325 | rbd | 2020-10-12 13:16:57 -0500 (Mon, 12 Oct 2020) | 1 line

   Win64 passes bigfiletest.lsp now. This version should work on all 64-bit systems now. These changes untested on Linux and macOS.
   ------------------------------------------------------------------------
   r324 | rbd | 2020-10-11 21:31:53 -0500 (Sun, 11 Oct 2020) | 2 lines

   I couldn't free enough space on my linux box, so I adjusted the bigfiletest to write 8-bit ulaw. It's still >4GB and >4G samples. Works on Linux.

   ------------------------------------------------------------------------
   r323 | rbd | 2020-10-11 19:41:25 -0500 (Sun, 11 Oct 2020) | 2 lines

   Missing file from last commit.

   ------------------------------------------------------------------------
   r322 | rbd | 2020-10-11 19:36:08 -0500 (Sun, 11 Oct 2020) | 1 line

   Found another case where WIN64 needs int64_t instead of long for sample count.
   ------------------------------------------------------------------------
   r321 | rbd | 2020-10-11 19:33:25 -0500 (Sun, 11 Oct 2020) | 3 lines

   Fixed s-save to	handle optional	and keyword parameters (which should never have	been mixed in the first	place).	Documentation cleanup - should be final for this version.

   ------------------------------------------------------------------------
   r320 | rbd | 2020-10-11 14:44:37 -0500 (Sun, 11 Oct 2020) | 2 lines

   Fixes to handle IRCAM sound format and tests for big file io working on macOS.

   ------------------------------------------------------------------------
   r319 | rbd | 2020-10-10 21:31:58 -0500 (Sat, 10 Oct 2020) | 2 lines

   Changes for linux and to avoid compiler warnings on linux.

   ------------------------------------------------------------------------
   r318 | rbd | 2020-10-10 20:50:23 -0500 (Sat, 10 Oct 2020) | 1 line

   This is the test used for Win64 version.
   ------------------------------------------------------------------------
   r317 | rbd | 2020-10-10 20:34:34 -0500 (Sat, 10 Oct 2020) | 1 line

   This version works on Win64. Need to test changes on macOS and linux.
   ------------------------------------------------------------------------
   r316 | rbd | 2020-10-10 19:59:15 -0500 (Sat, 10 Oct 2020) | 2 lines

   PWL changes to avoid compiler warning.

   ------------------------------------------------------------------------
   r315 | rbd | 2020-10-10 19:34:04 -0500 (Sat, 10 Oct 2020) | 2 lines

   A few more changes for 64-bit sample counts on Win64

   ------------------------------------------------------------------------
   r314 | rbd | 2020-10-10 13:19:42 -0500 (Sat, 10 Oct 2020) | 2 lines

   Fixed int64_t declaration in gate.alg

   ------------------------------------------------------------------------
   r313 | rbd | 2020-10-10 12:07:40 -0500 (Sat, 10 Oct 2020) | 2 lines

   Fixes to gate for long sounds

   ------------------------------------------------------------------------
   r312 | rbd | 2020-10-10 11:47:29 -0500 (Sat, 10 Oct 2020) | 2 lines

   Fixed sound_save types for intgen

   ------------------------------------------------------------------------
   r311 | rbd | 2020-10-10 11:09:01 -0500 (Sat, 10 Oct 2020) | 2 lines

   Fixed a 64-bit sample count problem in siosc.alg

   ------------------------------------------------------------------------
   r310 | rbd | 2020-10-10 11:03:12 -0500 (Sat, 10 Oct 2020) | 2 lines

   Fixed sndmax to handle 64-bit sample counts.

   ------------------------------------------------------------------------
   r309 | rbd | 2020-10-10 10:57:04 -0500 (Sat, 10 Oct 2020) | 2 lines

   Forgot to re-translate all tran/*.alg files with fix for int64 cast to int32. This version compiles on macOS and ready for test on Win64.

   ------------------------------------------------------------------------
   r308 | rbd | 2020-10-10 10:16:05 -0500 (Sat, 10 Oct 2020) | 2 lines

   Everything seems to compile and run on macOS now. Moving changes to Windows for test.

   ------------------------------------------------------------------------
   r307 | rbd | 2020-10-10 09:23:45 -0500 (Sat, 10 Oct 2020) | 1 line

   Added casts to avoid compiler warnings and to review changes to support 64-bit sample counts on Windows. Still not complete, and waiting to regenerate and compile tran directory code after updates to translation code that will insert more casts.
   ------------------------------------------------------------------------
   r306 | rbd | 2020-10-09 21:55:15 -0500 (Fri, 09 Oct 2020) | 2 lines

   Rebuilt seqfnint.c from header files.

   ------------------------------------------------------------------------
   r305 | rbd | 2020-10-09 21:53:33 -0500 (Fri, 09 Oct 2020) | 1 line

   Changed some FIXNUMS to LONG to avoid compiler warnings in seqfnint.c
   ------------------------------------------------------------------------
   r304 | rbd | 2020-10-09 21:44:03 -0500 (Fri, 09 Oct 2020) | 2 lines

   I discovered forgotten regression-test.lsp and added test that requires 64-bit sample counts to pass. Fixed a few bugs revealed by running the type-checking regression tests.

   ------------------------------------------------------------------------
   r303 | rbd | 2020-10-09 12:28:58 -0500 (Fri, 09 Oct 2020) | 2 lines

   Changes for 64-bit sample counts broke mult-channel s-save. Fixed in the commit for macOS.

   ------------------------------------------------------------------------
   r302 | rbd | 2020-10-09 10:03:39 -0500 (Fri, 09 Oct 2020) | 2 lines

   Changed snd-play to return samples computed and used that to make a test for computing long sounds that would overflow 32-bit length counts.

   ------------------------------------------------------------------------
   r301 | rbd | 2020-10-09 09:11:26 -0500 (Fri, 09 Oct 2020) | 2 lines

   corrected mistake in delaycv.alg and re-translated

   ------------------------------------------------------------------------
   r300 | rbd | 2020-10-09 09:09:06 -0500 (Fri, 09 Oct 2020) | 2 lines

   Fix to delaycv.alg -- "s" changed to "input" to avoid matching "s" in "sample_type".

   ------------------------------------------------------------------------
   r299 | rbd | 2020-10-09 09:03:33 -0500 (Fri, 09 Oct 2020) | 4 lines

   To avoid compiler warnings, XLisp interfaces to C int and long are now
   specified as LONG rather than FIXNUM, and the stubs that call the C
   functions cast FIXNUMs from XLisp into longs before calling C functions.

   ------------------------------------------------------------------------
   r298 | rbd | 2020-10-08 22:20:26 -0500 (Thu, 08 Oct 2020) | 2 lines

   This commit has many more fixes to handle long (64-bit) sounds, including a lot of fixes for warnings by Visual Studio assigning int64_t to long (works on macOS, doesn't work on VS). This was compiled and tested on macOS, and even computed a 27.1-hour sound using OSC, LP, SUM and MULT (haven't tested I/O yet).

   ------------------------------------------------------------------------
   r297 | rbd | 2020-10-07 13:04:02 -0500 (Wed, 07 Oct 2020) | 2 lines

   This is a major cleanup. It started with the goal of changing long to int64_t for sample counts so that on 64-bit windows, where long is only 32-bits, the sample counts would nevertheless be 64-bit allowing long sounds, which was a limitation for long recordings in Audacity. Since I was using compiler warnings to track possible loss-of-precision conversions from 64-bit sample counts, and there were *many* warnings, I started cleaning up *all* the warnings and ended up with a very large set of changes, including "modernizing" C declarations that date back to XLisp and CMU MIDI Toolkit code and were never changed. This version runs all the examples.sal code on macOS, but will surely have problems on Windows and Linux given the number of changes.

   ------------------------------------------------------------------------
   r296 | rbd | 2020-10-06 13:34:20 -0500 (Tue, 06 Oct 2020) | 2 lines

   More changes from long to int64_t for sample counts.

   ------------------------------------------------------------------------
   r295 | rbd | 2020-10-06 11:53:49 -0500 (Tue, 06 Oct 2020) | 2 lines

   More work on using 64-bit sample counts. Changed MAX_STOP from 32-bit to 64-bit limit.

   ------------------------------------------------------------------------
   r294 | rbd | 2020-10-06 11:48:05 -0500 (Tue, 06 Oct 2020) | 2 lines

   Made some changes so that sample counts are int64_t (for windows) instead of long to support sample counts above 31 bits.

   ------------------------------------------------------------------------
   r293 | rbd | 2020-10-04 21:30:55 -0500 (Sun, 04 Oct 2020) | 2 lines

   Fixed a few minor things for Linux and tested on Linux.

   ------------------------------------------------------------------------
   r292 | rbd | 2020-10-04 21:00:28 -0500 (Sun, 04 Oct 2020) | 2 lines

   Update extensions: all are minor changes.

   ------------------------------------------------------------------------
   r291 | rbd | 2020-09-24 13:59:31 -0500 (Thu, 24 Sep 2020) | 2 lines

   New implementation of seq and seqrep, added get-real-time, documented get-real-time, fixed examples.sal and examples.lsp which are now in lib rather than extensions (so they are now back in the basic installation), other cleanup.

   ------------------------------------------------------------------------
   r290 | rbd | 2020-08-16 16:24:52 -0500 (Sun, 16 Aug 2020) | 2 lines

   Fixed bug in snd-gate, revised GATE and NOISE-GATE to handle multi-channel sound. RMS now handles multi-channel input. S-AVG added to take multichannel input (but not used, because RMS could not be written without making SND-SRATE convert multichannel sound to vector of floats. That seems to be going toward a fully vectorized model. Not going there for now.

   ------------------------------------------------------------------------
   r289 | rbd | 2020-07-09 16:27:45 -0500 (Thu, 09 Jul 2020) | 2 lines

   Added GET-REAL-TIME function to XLISP. May not work yet on Windows. Various fixes for compiler warnings. I noticed FLAC doesn't work (I guess it never did) and I cannot figure out how this even links because flac_min seems to be undefined. Something to look at later.
2021-01-27 23:45:25 -06:00

251 lines
7.3 KiB
C

/*
* falloc.h
* nyquist memory allocation data structures and macros
*
* there is an falloc and ffree for each major type of data structure
* there is an falloc and ffree for generic (not so common) structures
* there is an frelease for some structures. this reduces the
* reference count for the particular structure by 1; it
* does not continue recursively.
*/
/* Debugging support:
* When DEBUG_MEM is set, each piece of allocated storage will contain
* a pointer to a string naming the caller or other allocation info,
* and a sequence number. (8 extra bytes are allocated for this info).
*
* When storage is freed, the ID is set to NULL, and the routine
* dbg_mem_check(ptr) will abort if ID is NULL. Call this routine to
* avoid following a pointer to data that was previously freed.
*
* The goal of this support is to allow you to "go back" to the point
* where memory is corrupted; specifically where a memory block is freed
* too early.
*
* When a memory-related bug is crashing the system:
* (1) Recompile with DEBUG_MEM on.
* (2) Develop some Nyquist code that will predictably crash the system.
* (3) When Nyquist crashes, use a debugger to find where the bad
* pointer came from. See if the source of the pointer was freed.
* (4) If the source of the pointer was freed, then notice the sequence
* number.
* (5) Rerun with dbg_mem_seq_num set to the number noted in (4).
* (6) Nyquist will print when the storage in question was allocated and
* freed. Use the debugger to find out why the storage is
* freed too early and who did it.
* (7) If the source of the pointer in (3) was not freed, you're on your
* own.
*
* The DEBUG_MEM related routines are:
* dbg_mem_allocated: called when memory is allocated
* dbg_mem_freed: called when memory is freed
* dbg_mem_released: called when memory is released
* dbg_mem_check: called to check memory
*
* see also xldmem.c:
* by setting xldmem_trace to a pointer, you can trace when the
* pointer is referenced by anything in the heap
*/
/* to get size_t on pmax: */
#ifdef pmax
#include "sys/types.h"
#endif
#include "cque.h"
#include "debug.h"
#define DEBUG_MEM 0
#define DEBUG_MEM_INFO_SIZE (sizeof(long) + sizeof(char *))
/* special free lists */
extern CQUE *sample_block_free; /* really a sample_block_type */
/* special counts */
extern int sample_block_total;
extern int sample_block_used;
extern int snd_list_used;
extern int sound_used;
extern long table_memory;
/* generic free lists */
#define MAXLISTS 128
extern CQUE *generic_free[MAXLISTS];
/* general memory pool */
#define MAXPOOLSIZE 1000000
extern char *poolp;
extern char *poolend;
/* sample block memory pool */
#define MAXSPOOLSIZE (256 * round_size(sizeof(sample_block_node)))
extern char *spoolp;
extern char *spoolend;
extern int npools;
extern int sample_blocks_since_gc;
#if !defined(TRACK_POOLS)
#define TRACK_POOLS 1
#endif
#if defined(TRACK_POOLS) && TRACK_POOLS
// extern CQUE *pools;
void falloc_gc(void);
#endif
void falloc_init(void);
void new_pool(void);
void new_spool(void);
void find_sample_block(sample_block_type *sp);
char *get_from_pool(size_t siz);
#define round_size(n) (((n) + 7) & ~7)
/* check_pool -- returns true if enough bytes are available */
#if DEBUG_MEM
#define check_pool(size) (poolp + (size) + DEBUG_MEM_INFO_SIZE <= poolend)
#define check_spool(size) (spoolp + (size) + DEBUG_MEM_INFO_SIZE <= spoolend)
#define DBG_MEM_ALLOCATED(p, who) dbg_mem_allocated(p, who)
#define DBG_MEM_FREED(p, who) dbg_mem_freed(p, who)
#define DBG_MEM_RELEASED(p, who) dbg_mem_released(p, who)
#else
#define check_pool(size) (poolp + (size) <= poolend)
#define check_spool(size) (spoolp + (size) <= spoolend)
#define DBG_MEM_ALLOCATED(p, who)
#define DBG_MEM_FREED(p, who)
#define DBG_MEM_RELEASED(p, who)
#endif
#define BLOCKS_PER_GC 100
/* There used to be a lot of code in this macro. I moved it to
* find_sample_block, but kept the macro mainly in order to pass sp
* by reference.
*/
#define falloc_sample_block(sp, who) { \
find_sample_block(&sp); \
DBG_MEM_ALLOCATED(sp, who); }
#define ffree_sample_block(sp, who) { \
/* printf("freeing sample_block@%x\n", sp); */ \
DBG_MEM_FREED(sp, who); \
Qenter(sample_block_free, sp); \
sample_block_used--; \
}
#define frelease_sample_block(sp, who) { \
sp->refcnt--; \
DBG_MEM_RELEASED(sp, who); \
if (sp->refcnt <= 0) { \
ffree_sample_block(sp); \
} \
}
/* NOTE: This must not cause garbage collection.
* LVAL parameters to snd_make_? functions are not
* protected and falloc_sound is invoked there.
*/
#define snd_list_free (generic_free[round_size(sizeof(snd_list_node)) >> 3])
#define falloc_snd_list(sp, who) { \
if (!Qempty(snd_list_free)) \
Qget(snd_list_free, snd_list_type, sp) \
else \
sp = (snd_list_type)get_from_pool(round_size(sizeof(snd_list_node)));\
snd_list_used++; \
DBG_MEM_ALLOCATED(sp, who); \
}
#define ffree_snd_list(sp, who) { \
DBG_MEM_FREED(sp, who); \
Qenter(snd_list_free, sp); \
snd_list_used--; \
}
#define frelease_snd_list(sp, who) { \
sp->refcnt--; \
DBG_MEM_RELEASED(sp, who); \
if (sp->refcnt <= 0) { \
ffree_snd_list(sp, who); \
} \
}
#define sound_free (generic_free[round_size(sizeof(sound_node)) >> 3])
#define NORMALSOUNDALLOC
#ifdef NORMALSOUNDALLOC
#define falloc_sound(sp, who) { \
if (!Qempty(sound_free)) { \
Qget(sound_free, sound_type, sp); \
} else { \
sp = (sound_type) get_from_pool(round_size(sizeof(sound_node))); \
} \
sound_used++; \
DBG_MEM_ALLOCATED(sp, who); \
}
#else
#define falloc_sound(sp) \
sp =(sound_type) \
get_from_pool(round_size(sizeof(sound_node)))
#endif
/* note: usually you call sound_unref, not this macro */
#define ffree_sound(sp, who) { \
/* sound_already_free_test(); */ \
DBG_MEM_FREED(sp, who); \
Qenter(sound_free, sp); \
sound_used--; \
}
/* falloc_generic -- sp gets new node of type sptype */
/**/
#define falloc_generic(sp, sptype, who) { \
int size = round_size(sizeof(sptype)); \
falloc_generic_bytes(sp, sptype, size, who) }
/* falloc_generic_n -- sp gets new array of n sptype's */
/**/
#define falloc_generic_n(sp, sptype, n, who) { \
int min_size = sizeof(sptype) * (n); \
int size = round_size(min_size); \
falloc_generic_bytes(sp, sptype, size, who) }
#define falloc_generic_bytes(sp, sptype, size, who) \
if ((size >> 3) >= MAXLISTS) { \
stdputstr("falloc_generic problem\n"); \
sp = (sptype *) malloc(size); \
} else if (!Qempty(generic_free[size >> 3])) { \
Qget(generic_free[size >> 3], sptype *, sp); \
} else { \
sp = (sptype *) get_from_pool(size); \
} \
DBG_MEM_ALLOCATED(sp, who); \
/* printf("GENERIC ALLOC %x\n", sp); */
/* ffree_generic puts an item back on proper freelist */
/* NOTE: sIzE is capitalized funny so that it will not
* match an actual parameter, e.g. if the caller writes
* ffree_generic(ptr, size), we don't want the expanded
* code to include: "int size = round_size(size) >> 3"!
*/
#define ffree_generic(sp, nn, who) { \
int sIzE = round_size(nn) >> 3; \
DBG_MEM_FREED(sp, who); \
/* printf("GENERIC FREE %x SIZE %d\n", sp, nnn); */ \
if ((sIzE) >= MAXLISTS) { \
free(sp); \
} else { \
Qenter(generic_free[sIzE], sp); \
} \
}