[PATCH 21.5] ALSA support
19 years
Jerry James
Jerry James
PATCH 21.5
Thanks for all the feedback on the early version of this patch. This
version supports setting the volume with play-sound and play-sound-file.
ChangeLog addition:
2006-03-24 Jerry James <james(a)xemacs.org>
* configure.ac: Autodetect ALSA support and report it if detected.
src/ChangeLog addition:
2006-03-24 Jerry James <james(a)xemacs.org>
* alsaplay.c: New file providing support for sound with ALSA.
* config.h.in: New symbol HAVE_ALSA_SOUND
* sound.c: Add ALSA support.
xemacs-21.5 source patch:
Diff command: cvs -q diff -uN
Files affected: src/sound.c src/config.h.in src/alsaplay.c configure.ac
Index: configure.ac
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
retrieving revision 1.35
diff -d -u -u -r1.35 configure.ac
--- configure.ac 2006/02/27 16:29:06 1.35
+++ configure.ac 2006/03/24 19:31:41
＠＠ -791,16 +791,18 ＠＠
XE_HELP_SUBSECTION([Sound options])
XE_COMPLEX_ARG([sound],
AC_HELP_STRING([--enable-sound=TYPE],[Compile with sound support.
- Valid types are `native', `nas' and `esd'.
+ Valid types are `native', `alsa', `nas' and `esd'.
Prefix a type with 'no' to disable.
The first type can be `none' or `all'. `none' means
- `nonative,nonas,noesd'. `all' means `native,nas,esd'.
- Later options override earlier ones for the same TYPE.
- The default is to autodetect all sound support except
- for ESD which defaults to off.]),
+ `nonative,noalsa,nonas,noesd'. `all' means
+ `native,alsa,nas,esd'. Later options override earlier
+ ones for the same TYPE. The default is to autodetect
+ all sound support except for ESD which defaults to
+ off.]),
[],
[enable_sound_nas=""],
[XE_COMPLEX_OPTION([native],[""]),
+ XE_COMPLEX_OPTION([alsa],[""]),
XE_COMPLEX_OPTION([nas],[""]),
XE_COMPLEX_OPTION([esd],[no])])
XE_MERGED_ARG([native-sound-lib],
＠＠ -5006,9 +5008,9 ＠＠
AC_CHECK_HEADER(nlist.h, AC_DEFINE(NLIST_STRUCT), )
dnl Check for sound of various sorts.
+AC_CHECKING([for sound support])
dnl Autodetect native sound
-AC_CHECKING([for sound support])
test -n "$with_native_sound_lib" && enable_sound_native=yes
if test "$enable_sound_native" != "no"; then
＠＠ -5127,6 +5129,22 ＠＠
test -n "$with_native_sound_lib" && XE_PREPEND($with_native_sound_lib, LIBS)
fi
+dnl ALSA sound support
+if test "$enable_sound_alsa" != "no"; then
+ AC_CHECK_HEADER([alsa/pcm.h], [
+ AC_CHECK_LIB(asound, snd_pcm_open, have_alsa_sound=yes)])
+ if test "$have_alsa_sound" = "yes"; then
+ enable_sound_alsa=yes
+ AC_DEFINE(HAVE_ALSA_SOUND)
+ XE_ADD_OBJS(alsaplay.o)
+ XE_PREPEND(-lasound, LIBS)
+ else
+ test "$enable_sound_alsa" = "yes" && \
+ XE_DIE("Required ALSA sound support cannot be provided.")
+ enable_sound_alsa=no
+ fi
+fi
+
dnl NAS Sound support
if test "$enable_sound_nas" != "no"; then
AC_CHECK_HEADER(audio/audiolib.h, [
＠＠ -6053,6 +6071,7 ＠＠
echo "
Sound:"
test "$enable_sound_native" = yes && echo " Compiling in support for sound (native)."
+test "$enable_sound_alsa" = yes && echo " Compiling in support for ALSA (Advanced Linux Sound Architecture)."
test "$enable_sound_nas" = yes && echo " Compiling in support for NAS (network audio system)."
test "$old_nas" = yes && echo " - NAS library lacks error trapping; will play synchronously."
test "$enable_sound_esd" = yes && echo " Compiling in support for ESD (Enlightened Sound Daemon)."
Index: src/alsaplay.c
===================================================================
RCS file: alsaplay.c
diff -N alsaplay.c
--- /dev/null Fri Mar 24 20:31:35 2006
+++ alsaplay.c Fri Mar 24 20:31:41 2006
＠＠ -0,0 +1,404 ＠＠
+/* Play sound with the ALSA library
+ Copyright (C) 2006 Jerry James.
+
+This file is part of XEmacs.
+
+XEmacs is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs; see the file COPYING. If not, write to
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA. */
+
+/* Synched up with: Not in FSF. */
+
+/* TODO: Support asynchronous sound playing; see the NAS support in sound.c */
+
+#include <config.h>
+#include "lisp.h"
+#include "sound.h"
+#include "sysfile.h"
+
+/* We can't just include <alsa/asoundlib.h> because it tries to redefine
+ * several symbols defined by the previous header files.
+ */
+#include <alsa/input.h>
+#include <alsa/output.h>
+#include <alsa/conf.h>
+#include <alsa/global.h>
+#include <alsa/pcm.h>
+#include <alsa/error.h>
+#include <alsa/hwdep.h>
+#include <alsa/rawmidi.h>
+#include <alsa/control.h>
+#include <alsa/mixer.h>
+
+struct mixer_state
+{
+ snd_mixer_t *mixer;
+ snd_mixer_elem_t *vol_ctl;
+
+ /* Which channels need the old volume restored */
+ int reset_front_left;
+ int reset_front_center;
+ int reset_front_right;
+ int reset_rear_left;
+ int reset_rear_center;
+ int reset_rear_right;
+ int reset_side_left;
+ int reset_side_right;
+ int reset_woofer;
+
+ /* Old volumes for the channels */
+ long front_left_vol;
+ long front_center_vol;
+ long front_right_vol;
+ long rear_left_vol;
+ long rear_center_vol;
+ long rear_right_vol;
+ long side_left_vol;
+ long side_right_vol;
+ long woofer_vol;
+};
+
+/* Assemble a machine half-word in little-endian order */
+#define HALF_LE(arr,start) (arr[start] + (arr[start + 1] << 8))
+
+/* Assemble a machine word in little-endian order */
+#define WORD_LE(arr,start) (arr[start] + (arr[start + 1] << 8) + \
+ (arr[start + 2] << 16) + (arr[start + 3] << 24))
+
+/* Assemble a machine word in big-endian order */
+#define WORD_BE(arr,start) ((arr[start] << 24) + (arr[start + 1] << 16) + \
+ (arr[start + 2] << 8) + arr[start + 3])
+
+/* This function was inspired by miscplay.c.
+ * Examine sound data to determine its format.
+ *
+ * TODO: Detect other formats that ALSA can play, such as GSM and MPEG.
+ */
+static snd_pcm_format_t
+analyze_format (const Binbyte *format, int *speed, int *tracks)
+{
+ if (!memcmp (format, "Creative Voice File\x1A\x1A\x00", 22) &&
+ HALF_LE (format, 22) == ((0x1233 - HALF_LE (format, 24)) & 0xFFFF))
+ {
+ /* VOC */
+ *speed = 8000;
+ *tracks = 2;
+ return SND_PCM_FORMAT_U8;
+ }
+ else if (!memcmp (format, "RIFF", 4) && !memcmp (format + 8, "WAVEfmt ", 8))
+ {
+ /* WAVE */
+ *speed = WORD_LE (format, 24);
+ *tracks = format[22];
+ return format[32] / format[22] == 1
+ ? SND_PCM_FORMAT_U8
+ : SND_PCM_FORMAT_S16_LE;
+ }
+ else if (!memcmp (format, ".snd", 4))
+ {
+ /* Sun/NeXT Audio (big endian) */
+ if (WORD_BE (format, 4) < 24)
+ {
+ *speed = 8000;
+ *tracks = 1;
+ return SND_PCM_FORMAT_MU_LAW;
+ }
+ *speed = WORD_BE (format, 16);
+ *tracks = format[23];
+ if (!memcmp (format + 12, "\000\000\000", 3))
+ {
+ switch (format[15])
+ {
+ case 1:
+ case 17:
+ case 29:
+ return SND_PCM_FORMAT_MU_LAW;
+ case 2:
+ return SND_PCM_FORMAT_S8;
+ case 3:
+ return SND_PCM_FORMAT_S16_BE;
+ case 4:
+ return SND_PCM_FORMAT_S24_BE;
+ case 5:
+ return SND_PCM_FORMAT_S32_BE;
+ case 23:
+ case 24:
+ case 25:
+ case 26:
+ return SND_PCM_FORMAT_IMA_ADPCM;
+ case 27:
+ return SND_PCM_FORMAT_A_LAW;
+ default:
+ break;
+ }
+ }
+ return SND_PCM_FORMAT_UNKNOWN;
+ }
+ else if (!memcmp (format, ".sd", 4))
+ {
+ /* DEC Audio (little endian) */
+ if (WORD_LE (format, 4) < 24)
+ {
+ *speed = 8000;
+ *tracks = 1;
+ return SND_PCM_FORMAT_MU_LAW;
+ }
+ *speed = WORD_LE (format, 16);
+ *tracks = format[20];
+ if (!memcmp (format + 13, "\000\000\000", 3))
+ {
+ switch (format[12])
+ {
+ case 1:
+ case 17:
+ case 29:
+ return SND_PCM_FORMAT_MU_LAW;
+ case 2:
+ return SND_PCM_FORMAT_S8;
+ case 3:
+ return SND_PCM_FORMAT_S16_LE;
+ case 4:
+ return SND_PCM_FORMAT_S24_LE;
+ case 5:
+ return SND_PCM_FORMAT_S32_LE;
+ case 23:
+ case 24:
+ case 25:
+ case 26:
+ return SND_PCM_FORMAT_IMA_ADPCM;
+ case 27:
+ return SND_PCM_FORMAT_A_LAW;
+ default:
+ break;
+ }
+ }
+ return SND_PCM_FORMAT_UNKNOWN;
+ }
+ else
+ {
+ /* We don't know what it is. Guess that it is mono audio in unsigned
+ * byte format. Maybe we should error if we reach this point.
+ */
+ *speed = 8000;
+ *tracks = 1;
+ return SND_PCM_FORMAT_U8;
+ }
+}
+
+/* Set the volume: if any errors occur, we accept the existing volume */
+static void
+set_volume (struct mixer_state *mix, int volume)
+{
+ snd_mixer_selem_id_t *volume_id;
+ long min_vol, max_vol, dev_vol;
+
+ if (snd_mixer_open (&mix->mixer, 0) < 0)
+ return;
+
+ if (snd_mixer_attach (mix->mixer, "default") < 0)
+ return;
+
+ if (snd_mixer_selem_register (mix->mixer, NULL, NULL) < 0)
+ return;
+
+ if (snd_mixer_load (mix->mixer) < 0)
+ return;
+
+ snd_mixer_selem_id_alloca (&volume_id);
+ snd_mixer_selem_id_set_name (volume_id, "PCM");
+
+ if ((mix->vol_ctl = snd_mixer_find_selem (mix->mixer, volume_id)) == NULL)
+ {
+ snd_mixer_selem_id_set_name (volume_id, "Master");
+ if ((mix->vol_ctl = snd_mixer_find_selem (mix->mixer, volume_id))
+ == NULL)
+ return;
+ }
+
+ /* Translate the Lisp volume range to the device volume range */
+ if (snd_mixer_selem_get_playback_volume_range (mix->vol_ctl, &min_vol,
+ &max_vol) < 0)
+ return;
+
+ dev_vol = volume * (max_vol - min_vol) / 100 + min_vol;
+
+ /* Record the old volumes */
+ if (snd_mixer_selem_get_playback_volume
+ (mix->vol_ctl, SND_MIXER_SCHN_FRONT_LEFT, &mix->front_left_vol) >= 0)
+ mix->reset_front_left = 1;
+
+ if (snd_mixer_selem_get_playback_volume
+ (mix->vol_ctl, SND_MIXER_SCHN_FRONT_CENTER, &mix->front_center_vol) >= 0)
+ mix->reset_front_center = 1;
+
+ if (snd_mixer_selem_get_playback_volume
+ (mix->vol_ctl, SND_MIXER_SCHN_FRONT_RIGHT, &mix->front_right_vol) >= 0)
+ mix->reset_front_right = 1;
+
+ if (snd_mixer_selem_get_playback_volume
+ (mix->vol_ctl, SND_MIXER_SCHN_REAR_LEFT, &mix->rear_left_vol) >= 0)
+ mix->reset_rear_left = 1;
+
+ if (snd_mixer_selem_get_playback_volume
+ (mix->vol_ctl, SND_MIXER_SCHN_REAR_CENTER, &mix->rear_center_vol) >= 0)
+ mix->reset_rear_center = 1;
+
+ if (snd_mixer_selem_get_playback_volume
+ (mix->vol_ctl, SND_MIXER_SCHN_REAR_RIGHT, &mix->rear_right_vol) >= 0)
+ mix->reset_rear_right = 1;
+
+ if (snd_mixer_selem_get_playback_volume
+ (mix->vol_ctl, SND_MIXER_SCHN_SIDE_LEFT, &mix->side_left_vol) >= 0)
+ mix->reset_side_left = 1;
+
+ if (snd_mixer_selem_get_playback_volume
+ (mix->vol_ctl, SND_MIXER_SCHN_SIDE_RIGHT, &mix->side_right_vol) >= 0)
+ mix->reset_side_right = 1;
+
+ if (snd_mixer_selem_get_playback_volume
+ (mix->vol_ctl, SND_MIXER_SCHN_WOOFER, &mix->woofer_vol) >= 0)
+ mix->reset_woofer = 1;
+
+ /* Set the volume */
+ snd_mixer_selem_set_playback_volume_all (mix->vol_ctl, dev_vol);
+}
+
+static void
+reset_volume (const struct mixer_state *mix)
+{
+ if (mix->reset_front_left)
+ snd_mixer_selem_set_playback_volume
+ (mix->vol_ctl, SND_MIXER_SCHN_FRONT_LEFT, mix->front_left_vol);
+
+ if (mix->reset_front_center)
+ snd_mixer_selem_set_playback_volume
+ (mix->vol_ctl, SND_MIXER_SCHN_FRONT_CENTER, mix->front_center_vol);
+
+ if (mix->reset_front_right)
+ snd_mixer_selem_set_playback_volume
+ (mix->vol_ctl, SND_MIXER_SCHN_FRONT_RIGHT, mix->front_right_vol);
+
+ if (mix->reset_rear_left)
+ snd_mixer_selem_set_playback_volume
+ (mix->vol_ctl, SND_MIXER_SCHN_REAR_LEFT, mix->rear_left_vol);
+
+ if (mix->reset_rear_center)
+ snd_mixer_selem_set_playback_volume
+ (mix->vol_ctl, SND_MIXER_SCHN_REAR_CENTER, mix->rear_center_vol);
+
+ if (mix->reset_rear_right)
+ snd_mixer_selem_set_playback_volume
+ (mix->vol_ctl, SND_MIXER_SCHN_REAR_RIGHT, mix->rear_right_vol);
+
+ if (mix->reset_side_left)
+ snd_mixer_selem_set_playback_volume
+ (mix->vol_ctl, SND_MIXER_SCHN_SIDE_LEFT, mix->side_left_vol);
+
+ if (mix->reset_side_right)
+ snd_mixer_selem_set_playback_volume
+ (mix->vol_ctl, SND_MIXER_SCHN_SIDE_RIGHT, mix->side_right_vol);
+
+ if (mix->reset_woofer)
+ snd_mixer_selem_set_playback_volume
+ (mix->vol_ctl, SND_MIXER_SCHN_WOOFER, mix->woofer_vol);
+
+ snd_mixer_close (mix->mixer);
+}
+
+int
+alsa_play_sound_data (const Binbyte *data, int length, int volume)
+{
+ snd_pcm_t *pcm_handle;
+ snd_pcm_hw_params_t *hwparams;
+ snd_pcm_format_t format;
+ struct mixer_state mix;
+ int speed, tracks, err;
+
+ /* Set the PCM parameters */
+ if ((err = snd_pcm_open (&pcm_handle, "default", SND_PCM_STREAM_PLAYBACK,
+ 0)) < 0)
+ goto error_pcm_open;
+
+ snd_pcm_hw_params_alloca (&hwparams);
+
+ if ((err = snd_pcm_hw_params_any (pcm_handle, hwparams)) < 0)
+ goto error_pcm;
+
+ format = analyze_format (data, &speed, &tracks);
+
+ if ((err = snd_pcm_hw_params_set_access (pcm_handle, hwparams,
+ SND_PCM_ACCESS_RW_INTERLEAVED)) < 0)
+ goto error_pcm;
+
+ if ((err = snd_pcm_hw_params_set_format (pcm_handle, hwparams, format)) < 0)
+ goto error_pcm;
+
+ if ((err = snd_pcm_hw_params_set_rate (pcm_handle, hwparams, speed, 0)) < 0)
+ goto error_pcm;
+
+ if ((err = snd_pcm_hw_params_set_channels (pcm_handle, hwparams, tracks))
+ < 0)
+ goto error_pcm;
+
+ if ((err = snd_pcm_hw_params (pcm_handle, hwparams)) < 0)
+ goto error_pcm;
+
+ /* Set the volume */
+ memset (&mix, 0, sizeof (mix));
+ set_volume (&mix, volume);
+
+ /* Play the sound */
+ if ((err = snd_pcm_writei (pcm_handle, data, length)) < 0)
+ goto error_mixer;
+
+ /* Put the volume back the way it used to be */
+ reset_volume (&mix);
+
+ /* Release resources */
+ snd_pcm_close (pcm_handle);
+ return 1;
+
+ error_mixer:
+ reset_volume (&mix);
+ error_pcm:
+ snd_pcm_close (pcm_handle);
+ error_pcm_open:
+ sound_perror (snd_strerror (err));
+ return 0;
+}
+
+/* Read the sound file into an internal buffer, then call
+ * alsa_play_sound_data.
+ */
+int
+alsa_play_sound_file (const Extbyte *sound_file, int volume)
+{
+ Binbyte *data;
+ int fd, retval;
+ struct stat st;
+
+ fd = retry_open (sound_file, O_RDONLY, 0);
+ if (fd < 0) {
+ sound_perror (sound_file);
+ return 0;
+ }
+
+ qxe_fstat (fd, &st);
+ data = xnew_array (Binbyte, st.st_size);
+ retry_read (fd, data, st.st_size);
+ retry_close (fd);
+ retval = alsa_play_sound_data (data, st.st_size, volume);
+ xfree (data, Binbyte);
+ return retval;
+}
Index: src/config.h.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/config.h.in,v
retrieving revision 1.106
diff -d -u -u -r1.106 config.h.in
--- src/config.h.in 2006/02/27 16:29:22 1.106
+++ src/config.h.in 2006/03/24 19:31:41
＠＠ -796,6 +796,9 ＠＠
/* Native sound may be provided via soundcard.h, in various directories */
#undef SOUNDCARD_H_FILE
+/* Compile in support for ALSA (Advanced Linux Sound Architecture) */
+#undef HAVE_ALSA_SOUND
+
/* Compile in support for NAS (Network Audio System)?
NAS_NO_ERROR_JUMP means that the NAS libraries don't include some
error handling changes. */
Index: src/sound.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/sound.c,v
retrieving revision 1.25
diff -d -u -u -r1.25 sound.c
--- src/sound.c 2005/11/16 07:22:46 1.25
+++ src/sound.c 2006/03/24 19:31:41
＠＠ -70,12 +70,25 ＠＠
#define USED_IF_HAVE_ANY(decl) UNUSED (decl)
#endif
+#ifdef HAVE_ALSA_SOUND
+extern int alsa_play_sound_file (const Extbyte *file, int vol);
+extern int alsa_play_sound_data (const Binbyte *data, int length, int vol);
+# define DEVICE_CONNECTED_TO_ALSA_P(x) 1 /* #### better check */
+#endif
+
#ifdef HAVE_ESD_SOUND
extern int esd_play_sound_file (Extbyte *file, int vol);
extern int esd_play_sound_data (Binbyte *data, size_t length, int vol);
# define DEVICE_CONNECTED_TO_ESD_P(x) 1 /* #### better check */
#endif
+#ifdef HAVE_NAS_SOUND
+extern int nas_play_sound_file (Extbyte *name, int volume);
+extern int nas_play_sound_data (Binbyte *data, int length, int volume);
+extern int nas_wait_for_sounds (void);
+extern Extbyte *nas_init_play (Display *);
+#endif
+
Fixnum bell_volume;
Fixnum bell_inhibit_time;
Lisp_Object Vsound_alist;
＠＠ -84,14 +97,6 ＠＠
Lisp_Object Q_volume, Q_pitch, Q_duration, Q_sound;
Lisp_Object Qsound_error;
-
-#ifdef HAVE_NAS_SOUND
-extern int nas_play_sound_file (Extbyte *name, int volume);
-extern int nas_play_sound_data (Binbyte *data, int length, int volume);
-extern int nas_wait_for_sounds (void);
-extern Extbyte *nas_init_play (Display *);
-#endif
-
DOESNT_RETURN
report_sound_error (const Ascbyte *string, Lisp_Object data)
{
＠＠ -110,8 +115,8 ＠＠
{
/* This function can call lisp */
int vol;
-#if defined (HAVE_NATIVE_SOUND) || defined (HAVE_NAS_SOUND) \
- || defined (HAVE_ESD_SOUND)
+#if defined (HAVE_NATIVE_SOUND) || defined (HAVE_ALSA_SOUND) || \
+ defined (HAVE_NAS_SOUND) || defined (HAVE_ESD_SOUND)
struct device *d = decode_device (device);
#endif
struct gcpro gcpro1;
＠＠ -148,6 +153,18 ＠＠
}
UNGCPRO;
+#ifdef HAVE_ALSA_SOUND
+ if (DEVICE_CONNECTED_TO_ALSA_P (d))
+ {
+ Extbyte *fileext;
+
+ LISP_STRING_TO_EXTERNAL (file, fileext, Qfile_name);
+ /* #### ALSA code should allow specification of a device. */
+ if (alsa_play_sound_file (fileext, vol))
+ return Qnil;
+ }
+#endif
+
#ifdef HAVE_NAS_SOUND
if (DEVICE_CONNECTED_TO_NAS_P (d))
{
＠＠ -355,10 +372,24 ＠＠
pit = (INT_OR_FLOATP (pitch) ? (int) XFLOATINT (pitch) : -1);
dur = (INT_OR_FLOATP (duration) ? (int) XFLOATINT (duration) : -1);
- /* If the sound is a string, and we're connected to Nas, do that.
- Else if the sound is a string, and we're on console, play it natively.
- Else just beep.
+ /* If the sound is a string, and we're connected to ALSA, NAS, or ESD, do
+ that. Else if the sound is a string, and we're on console, play it
+ natively. Else just beep.
*/
+#ifdef HAVE_ALSA_SOUND
+ if (DEVICE_CONNECTED_TO_ALSA_P (d) && STRINGP (sound))
+ {
+ Binbyte *soundext;
+ Bytecount soundextlen;
+
+ TO_EXTERNAL_FORMAT (LISP_STRING, sound,
+ ALLOCA, (soundext, soundextlen),
+ Qbinary);
+ if (alsa_play_sound_data (soundext, soundextlen, vol))
+ return Qnil;
+ }
+#endif /* HAVE_ALSA_SOUND */
+
#ifdef HAVE_NAS_SOUND
if (DEVICE_CONNECTED_TO_NAS_P (d) && STRINGP (sound))
{
＠＠ -423,6 +454,10 ＠＠
*/
(USED_IF_HAVE_NATIVE_OR_NAS (device)))
{
+#ifdef HAVE_ALSA_SOUND
+ if (DEVICE_CONNECTED_TO_ALSA_P (decode_device (device)))
+ return Qt;
+#endif
#ifdef HAVE_NAS_SOUND
if (DEVICE_CONNECTED_TO_NAS_P (decode_device (device)))
return Qt;
＠＠ -654,6 +689,9 ＠＠
void
vars_of_sound (void)
{
+#ifdef HAVE_ALSA_SOUND
+ Fprovide (intern ("alsa-sound"));
+#endif
#ifdef HAVE_NATIVE_SOUND
Fprovide (intern ("native-sound"));
#endif
--
Jerry James, Assistant Professor james(a)xemacs.org
Computer Science Department http://www.cs.usu.edu/~jerry/
Utah State University
- 1 participants
- 1 comments
[AC21.5] fix wrong use of memset
19 years
Marcus Crestani
Marcus Crestani
APPROVE COMMIT 21.5
>>>>>"MF" == Mike FABIAN <mfabian(a)suse.de> writes:
MF> It looks like memset () is not used correctly in
MF> xemacs-21.5.25/src/vdb-posix.c.
Good catch, thanks.
Committed this:
src/ChangeLog addition:
2006-03-27 Mike Fabian <mfabian(a)suse.de>
* vdb-posix.c (vdb_install_signal_handler): Correct memset.
xemacs-21.5 source patch:
Diff command: cvs -q diff -u
Files affected: src/vdb-posix.c
Index: src/vdb-posix.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/vdb-posix.c,v
retrieving revision 1.1
diff -u -r1.1 vdb-posix.c
--- src/vdb-posix.c 25 Nov 2005 01:42:07 -0000 1.1
+++ src/vdb-posix.c 27 Mar 2006 15:18:25 -0000
＠＠ -118,7 +118,7 ＠＠
}
#ifdef USE_SIGACTION
- memset(&act, sizeof(struct sigaction), 0);
+ memset(&act, 0, sizeof(struct sigaction));
act.sa_sigaction = vdb_fault_handler;
sigemptyset (&act.sa_mask);
act.sa_flags = SA_SIGINFO;
--
Marcus
- 1 participants
- 0 comments
[AC21.5] NEWGC: initialize string with direct data
19 years
Marcus Crestani
Marcus Crestani
APPROVE COMMIT 21.5
NOTE: This patch has been committed.
This is one of the minor fixes I have in my workspace for a while:
Initialize strings with direct data correctly, instead of assuming
that the memory is zeroed out before.
src/ChangeLog addition:
2006-03-26 Marcus Crestani <crestani(a)xemacs.org>
* alloc.c (make_uninit_string): Use set_lispstringp_direct.
* lisp.h (set_lispstringp_direct): New.
manual-mc-xemacs-21.5 source patch:
Diff command: cvs -q diff -u
Files affected: src/lisp.h src/alloc.c
Index: src/alloc.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/alloc.c,v
retrieving revision 1.123
diff -u -r1.123 alloc.c
--- src/alloc.c 27 Feb 2006 16:29:21 -0000 1.123
+++ src/alloc.c 26 Mar 2006 14:29:15 -0000
＠＠ -2500,6 +2500,7 ＠＠
XSET_STRING_ASCII_BEGIN (wrap_string (s), 0);
#ifdef NEW_GC
+ set_lispstringp_direct (s);
STRING_DATA_OBJECT (s) =
wrap_string_direct_data (alloc_lrecord (fullsize,
&lrecord_string_direct_data));
Index: src/lisp.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lisp.h,v
retrieving revision 1.139
diff -u -r1.139 lisp.h
--- src/lisp.h 20 Mar 2006 21:20:29 -0000 1.139
+++ src/lisp.h 26 Mar 2006 14:29:19 -0000
＠＠ -2475,6 +2475,7 ＠＠
/* Operations on Lisp_String *'s; only ones left */
#ifdef NEW_GC
+#define set_lispstringp_direct(s) ((s)->indirect = 0)
#define set_lispstringp_indirect(s) ((s)->indirect = 1)
#define set_lispstringp_length(s, len) XSET_STRING_DATA_SIZE (s, len)
#define set_lispstringp_data(s, ptr) XSET_STRING_DATA_DATA (s, ptr)
--
Marcus
- 1 participants
- 0 comments
[PATCH21.5] regex_malloc_disallowed fix
19 years
Marcus Crestani
Marcus Crestani
PATCH 21.5
>>>>>"JJ" == Jerry James <james(a)xemacs.org> writes:
JJ> From the backtrace below, it looks like the problem is triggered like
JJ> this:
JJ> (1) re_match_2_internal sets regex_malloc_disallowed, then calls
JJ> (2) offset_to_charxpos, which calls
JJ> (3) bytebpos_to_charbpos_func, at which point
JJ> (4) a signal arrives, throwing us into
JJ> (5) vdb_fault_handler, which mallocs
Jerry, thank you for providing detailed diagnosis.
Here is my solution to the problem: My approach is to fully avoid
allocation in the write barrier's signal handler. Basically this
means to make the page_fault_table large enough beforehand. Luckily
the upper bound of the page_fault_table's size can be determined prior
to each write-barrier cycle. The upper bound corresponds to the
number of pages that are watched by the write barrier. These are all
the pages that contain BLACK objects. This patch includes minimal
modifications to determine the number of processed pages, and the call
to resize the page_fault_table. Please test.
I don't know if this is the best way to deal with it. I read through
the comments in regex.c that talk about the connection of REL_ALLOC
and regex_malloc_disallowed. I was relieved to read that even Ben had
trouble understanding it all. Is somebody around who understands it
and can shed light on the regular expressions engine?
Would it be better to "be prepared for malloc()", as the comments in
regex.c state? Does anybody know how to "prepare"? Can you do this
with RE_MATCH_RELOCATE_MOVEABLE_DATA_POINTERS and/or
RE_SEARCH_RELOCATE_MOVEABLE_DATA_POINTERS? How expensive is this? Is
it more elegant than avoiding malloc in the signal handler and causing
memory overhead? Comments welcome!
If nobody objects to the patch as it is right now (and comes up with a
better solution), I'll commit it in a couple of days.
src/ChangeLog addition:
2006-03-21 Marcus Crestani <crestani(a)xemacs.org>
* mc-alloc.c (visit_all_used_page_headers):
* mc-alloc.c (finalize_page_for_disksave):
* mc-alloc.c (mc_finalize_for_disksave):
* mc-alloc.c (sweep_page):
* mc-alloc.c (mc_sweep):
* mc-alloc.c (protect_heap_page):
* mc-alloc.c (protect_heap_pages):
* mc-alloc.c (unprotect_heap_page):
* mc-alloc.c (unprotect_heap_pages):
* mc-alloc.h: Return number of pages processed.
* vdb.c (vdb_start_dirty_bits_recording): Adjust size of
page_fault_table to its upper bound (= number of pages that
contain BLACK objects) in advance, to avoid malloc in the signal
handler.
xemacs-21.5 source patch:
Diff command: cvs -q diff -u
Files affected: src/vdb.c src/mc-alloc.h src/mc-alloc.c
Index: src/mc-alloc.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/mc-alloc.c,v
retrieving revision 1.8
diff -u -r1.8 mc-alloc.c
--- src/mc-alloc.c 27 Feb 2006 16:29:27 -0000 1.8
+++ src/mc-alloc.c 21 Mar 2006 16:39:39 -0000
＠＠ -430,10 +430,11 ＠＠
/* Visits all pages (page_headers) hooked into the used heap pages
list and executes f with the current page header as
- argument. Needed for sweep. */
-static void
-visit_all_used_page_headers (void (*f) (page_header *ph))
+ argument. Needed for sweep. Returns number of processed pages. */
+static EMACS_INT
+visit_all_used_page_headers (EMACS_INT (*f) (page_header *ph))
{
+ EMACS_INT number_of_pages_processed = 0;
EMACS_INT i;
for (i = 0; i < N_USED_PAGE_LISTS; i++)
if (PLH_FIRST (USED_HEAP_PAGES (i)))
＠＠ -442,11 +443,12 ＠＠
while (PH_NEXT (ph))
{
page_header *next = PH_NEXT (ph); /* in case f removes the page */
- f (ph);
+ number_of_pages_processed += f (ph);
ph = next;
}
- f (ph);
+ number_of_pages_processed += f (ph);
}
+ return number_of_pages_processed;
}
＠＠ -1485,8 +1487,9 ＠＠
object's finalizer for disksave. Therefore, you have to define the
macro MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE(ptr). This macro should
do nothing else then test if there is a finalizer and call it on
- the given argument, which is the heap address of the object. */
-static void
+ the given argument, which is the heap address of the object.
+ Returns number of processed pages. */
+static EMACS_INT
finalize_page_for_disksave (page_header *ph)
{
EMACS_INT heap_space = (EMACS_INT) PH_HEAP_SPACE (ph);
＠＠ -1499,21 +1502,24 ＠＠
EMACS_INT ptr = (heap_space + (heap_space_step * mark_bit));
MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE ((void *) ptr);
}
+ return 1;
}
-/* Finalizes the heap for disksave. */
-void
+/* Finalizes the heap for disksave. Returns number of processed
+ pages. */
+EMACS_INT
mc_finalize_for_disksave (void)
{
- visit_all_used_page_headers (finalize_page_for_disksave);
+ return visit_all_used_page_headers (finalize_page_for_disksave);
}
-/* Sweeps a page: all the non-marked cells are freed. If the page is empty
- in the end, it is removed. If some cells are free, it is moved to the
- front of its page header list. Full pages stay where they are. */
-static void
+/* Sweeps a page: all the non-marked cells are freed. If the page is
+ empty in the end, it is removed. If some cells are free, it is
+ moved to the front of its page header list. Full pages stay where
+ they are. Returns number of processed pages.*/
+static EMACS_INT
sweep_page (page_header *ph)
{
Rawbyte *heap_space = (Rawbyte *) PH_HEAP_SPACE (ph);
＠＠ -1533,7 +1539,7 ＠＠
{
zero_mark_bits (ph);
PH_BLACK_BIT (ph) = 0;
- return;
+ return 1;
}
}
＠＠ -1552,14 +1558,16 ＠＠
remove_page_from_used_list (ph);
else if (PH_CELLS_USED (ph) < PH_CELLS_ON_PAGE (ph))
move_page_header_to_front (ph);
+
+ return 1;
}
-/* Sweeps the heap. */
-void
+/* Sweeps the heap. Returns number of processed pages. */
+EMACS_INT
mc_sweep (void)
{
- visit_all_used_page_headers (sweep_page);
+ return visit_all_used_page_headers (sweep_page);
}
＠＠ -1860,8 +1868,8 ＠＠
/* Protect the heap page of given page header ph if black objects are
- on the page. */
-static void
+ on the page. Returns number of processed pages. */
+static EMACS_INT
protect_heap_page (page_header *ph)
{
if (PH_BLACK_BIT (ph))
＠＠ -1870,20 +1878,23 ＠＠
EMACS_INT heap_space_size = PH_N_PAGES (ph) * PAGE_SIZE;
vdb_protect ((void *) heap_space, heap_space_size);
PH_PROTECTION_BIT (ph) = 1;
+ return 1;
}
+ return 0;
}
-/* Protect all heap pages with black objects. */
-void
+/* Protect all heap pages with black objects. Returns number of
+ processed pages.*/
+EMACS_INT
protect_heap_pages (void)
{
- visit_all_used_page_headers (protect_heap_page);
+ return visit_all_used_page_headers (protect_heap_page);
}
/* Remove protection (if there) of heap page of given page header
- ph. */
-static void
+ ph. Returns number of processed pages. */
+static EMACS_INT
unprotect_heap_page (page_header *ph)
{
if (PH_PROTECTION_BIT (ph))
＠＠ -1892,14 +1903,17 ＠＠
EMACS_INT heap_space_size = PH_N_PAGES (ph) * PAGE_SIZE;
vdb_unprotect (heap_space, heap_space_size);
PH_PROTECTION_BIT (ph) = 0;
+ return 1;
}
+ return 0;
}
-/* Remove protection for all heap pages which are protected. */
-void
+/* Remove protection for all heap pages which are protected. Returns
+ number of processed pages. */
+EMACS_INT
unprotect_heap_pages (void)
{
- visit_all_used_page_headers (unprotect_heap_page);
+ return visit_all_used_page_headers (unprotect_heap_page);
}
/* Remove protection and mark page dirty. */
Index: src/mc-alloc.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/mc-alloc.h,v
retrieving revision 1.4
diff -u -r1.4 mc-alloc.h
--- src/mc-alloc.h 27 Feb 2006 16:29:27 -0000 1.4
+++ src/mc-alloc.h 21 Mar 2006 16:39:39 -0000
＠＠ -105,11 +105,12 ＠＠
/* The finalizer of every not marked object is called. The macro
MC_ALLOC_CALL_FINALIZER has to be defined and call the finalizer of
- the object. */
-void mc_finalize (void);
+ the object. Returns number of processed pages. */
+EMACS_INT mc_finalize (void);
-/* All not marked objects of the used heap are freed. */
-void mc_sweep (void);
+/* All not marked objects of the used heap are freed. Returns number
+ of processed pages. */
+EMACS_INT mc_sweep (void);
＠＠ -117,8 +118,9 ＠＠
/* The finalizer for disksave of every object is called to shrink the
dump image. The macro MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE has to
- be defined and call the finalizer for disksave of the object. */
-void mc_finalize_for_disksave (void);
+ be defined and call the finalizer for disksave of the object.
+ Returns number of processed pages. */
+EMACS_INT mc_finalize_for_disksave (void);
＠＠ -141,12 +143,13 ＠＠
/* Is the fault at ptr on a protected page? */
EMACS_INT fault_on_protected_page (void *ptr);
-/* Remove protection (if there) of heap page of given page header
- ph. */
-void protect_heap_pages (void);
-
-/* Remove protection for all heap pages which are protected. */
-void unprotect_heap_pages (void);
+/* Remove protection (if there) of heap page of given page header ph.
+ Returns number of processed pages. */
+EMACS_INT protect_heap_pages (void);
+
+/* Remove protection for all heap pages which are protected. Returns
+ number of processed pages. */
+EMACS_INT unprotect_heap_pages (void);
/* Remove protection and mark page dirty. */
void unprotect_page_and_mark_dirty (void *ptr);
Index: src/vdb.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/vdb.c,v
retrieving revision 1.1
diff -u -r1.1 vdb.c
--- src/vdb.c 25 Nov 2005 01:42:08 -0000 1.1
+++ src/vdb.c 21 Mar 2006 16:39:39 -0000
＠＠ -38,8 +38,9 ＠＠
void
vdb_start_dirty_bits_recording (void)
{
+ Elemcount protected_pages = (Elemcount) protect_heap_pages ();
page_fault_table = Dynarr_new2 (void_ptr_dynarr, void *);
- protect_heap_pages ();
+ Dynarr_resize (page_fault_table, protected_pages);
}
/* Remove heap protection. */
--
Marcus
- 2 participants
- 2 comments
[C] xemacsweb: Comment out decommissioned "Survit's Home Page" in About/created.content
19 years
Adrian Aichner
Adrian Aichner
COMMIT
The page has not come back since, so here we go ...
xemacsweb ChangeLog patch:
Diff command: cvs -q diff -U 0
Files affected: About/ChangeLog
Index: About/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/About/ChangeLog,v
retrieving revision 1.194
diff -u -U0 -r1.194 ChangeLog
--- About/ChangeLog 20 Mar 2006 21:13:56 -0000 1.194
+++ About/ChangeLog 25 Mar 2006 13:23:57 -0000
＠＠ -0,0 +1,5 ＠＠
+2006-03-25 Adrian Aichner <adrian(a)xemacs.org>
+
+ * created.content: Comment out decommissioned "Survit's Home
+ Page".
+
xemacsweb source patch:
Diff command: cvs -f -z3 -q diff -u -w -N
Files affected: About/created.content
Index: About/created.content
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/About/created.content,v
retrieving revision 1.86
diff -u -w -r1.86 created.content
--- About/created.content 17 Oct 2005 18:25:17 -0000 1.86
+++ About/created.content 25 Mar 2006 13:23:26 -0000
＠＠ -43,7 +43,12 ＠＠
<li><a href="http://www.kcte.org">Kentucky Council of Teachers of English</a></li>
<li><a href="http://www.Jochen-Kuepper.de">Jochen-Küpper</a></li>
<li><a href="http://rt-com.sourceforge.net">rt_com</a></li>
- <li><a href="http://www.crosswinds.net/~suvrit">Survit's Home Page</a></li>
+ <!-- file: urlmoved.txt -->
+ <!-- date: Tue, 07 Feb 2006 03:11:40 (local) -->
+ <!-- Linklint version: 2.3.6 -->
+ <!-- http://www.crosswinds.net/~suvrit -->
+ <!-- => http://www.crosswinds.net/decommissioned.php -->
+ <!-- <li><a href="http://www.crosswinds.net/~suvrit">Survit's Home Page</a></li> -->
<li><a href="http://www.kloek-und-stroehle.de/">Autohaus Klök & Ströhle GmbH</a></li>
<li><a href="http://eicq.sourceforge.net/">eicq - An XEmacs ICQ Client</a></li>
<li><a href="http://valkyrie.aarg.net/">valkyrie.aarg.net</a></li>
--
Adrian Aichner
mailto:adrian＠xemacs.org
http://www.xemacs.org/
- 1 participants
- 0 comments
[PATCH] Fixing next-error in 21.5.
19 years
Malcolm Purvis
Malcolm Purvis
When I performed a sync of occur-mode for 21.5 I included a new core list
file, next-error.el, which is GNU Emacs' new next-error framework.
Unfortunately this broke compile.el in XEmacs due to name clashes.
This patch renames the clashing functions but does so in a makes it possible
that someday, perhaps, GNU Emacs compile.el and other users of next-error.el
can be used by 21.5 while the existing modes can be used with 21.4.
Malcolm
lisp/ChangeLog addition:
2006-03-20 Malcolm Purvis <malcolmp(a)xemacs.org>
* next-error.el: Rename functions that clash with the next-error
family in compile.el
* occur.el (occur-next-error): Use new names
* occur.el (multi-occur): Fix compiler warnings.
xemacs-21.5-micro-patches source patch:
Diff command: cvs -q diff -u
Files affected: lisp/occur.el lisp/next-error.el
Index: lisp/next-error.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/next-error.el,v
retrieving revision 1.2
diff -u -r1.2 next-error.el
--- lisp/next-error.el 2005/10/24 10:07:26 1.2
+++ lisp/next-error.el 2006/03/20 12:29:23
＠＠ -24,6 +24,9 ＠＠
;; Boston, MA 02110-1301, USA.
;;; Synched up with: FSF 22.0.50.1 (CVS)
+;;; Some functions renamed with the next-error-framework prefix to avoid
+;;; clashes with the next-error code in compile.el. One day compile.el
+;;; will use this framework.
(defgroup next-error nil
"`next-error' support framework."
＠＠ -175,8 +178,8 ＠＠
(error "No next-error capable buffer found")))
;;;###autoload
-(defun next-error (&optional arg reset)
- "Visit next `next-error' message and corresponding source code.
+(defun next-error-framework-next-error (&optional arg reset)
+ "Visit next `next-error-framework-next-error' message and corresponding source code.
If all the error messages parsed so far have been processed already,
the message buffer is checked for new ones.
＠＠ -188,17 +191,17 ＠＠
The RESET argument specifies that we should restart from the beginning.
-\\[next-error] normally uses the most recently started
+\\[next-error-framework-next-error] normally uses the most recently started
compilation, grep, or occur buffer. It can also operate on any
buffer with output from the \\[compile], \\[grep] commands, or,
more generally, on any buffer in Compilation mode or with
Compilation Minor mode enabled, or any buffer in which
`next-error-function' is bound to an appropriate function.
To specify use of a particular buffer for error messages, type
-\\[next-error] in that buffer when it is the only one displayed
+\\[next-error-framework-next-error] in that buffer when it is the only one displayed
in the current frame.
-Once \\[next-error] has chosen the buffer for error messages, it
+Once \\[next-error-framework-next-error] has chosen the buffer for error messages, it
runs `next-error-hook' with `run-hooks', and stays with that buffer
until you use it in some other buffer which uses Compilation mode
or Compilation Minor mode.
＠＠ -213,26 +216,26 ＠＠
(funcall next-error-function (prefix-numeric-value arg) reset)
(run-hooks 'next-error-hook))))
-(defalias 'goto-next-locus 'next-error)
-(defalias 'next-match 'next-error)
+(defalias 'goto-next-locus 'next-error-framework-next-error)
+(defalias 'next-match 'next-error-framework-next-error)
-(defun previous-error (&optional n)
- "Visit previous `next-error' message and corresponding source code.
+(defun next-error-framework-previous-error (&optional n)
+ "Visit previous `next-error-framework-next-error' message and corresponding source code.
Prefix arg N says how many error messages to move backwards (or
forwards, if negative).
This operates on the output from the \\[compile] and \\[grep] commands."
(interactive "p")
- (next-error (- (or n 1))))
+ (next-error-framework-next-error (- (or n 1))))
-(defun first-error (&optional n)
+(defun next-error-framework-first-error (&optional n)
"Restart at the first error.
Visit corresponding source code.
With prefix arg N, visit the source code of the Nth error.
This operates on the output from the \\[compile] command, for instance."
(interactive "p")
- (next-error n t))
+ (next-error-framework-next-error n t))
(defun next-error-no-select (&optional n)
"Move point to the next error in the `next-error' buffer and highlight match.
＠＠ -242,7 +245,7 ＠＠
select the source buffer."
(interactive "p")
(let ((next-error-highlight next-error-highlight-no-select))
- (next-error n))
+ (next-error-framework-next-error n))
(pop-to-buffer next-error-last-buffer))
(defun previous-error-no-select (&optional n)
Index: lisp/occur.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/occur.el,v
retrieving revision 1.3
diff -u -r1.3 occur.el
--- lisp/occur.el 2005/11/29 12:33:47 1.3
+++ lisp/occur.el 2006/03/20 12:29:24
＠＠ -177,7 +177,7 ＠＠
(defun occur-next-error (&optional argp reset)
"Move to the Nth (default 1) next match in an Occur mode buffer.
-Compatibility function for \\[next-error] invocations."
+Compatibility function for \\[next-error-framework-next-error] invocations."
(interactive "p")
;; we need to run occur-find-match from within the Occur buffer
(with-current-buffer
＠＠ -325,13 +325,13 ＠＠
"Show all lines in buffers BUFS containing a match for REGEXP.
This function acts on multiple buffers; otherwise, it is exactly like
`occur'."
- (defvar ido-ignore-item-temp-list)
(interactive
(cons
(let* ((bufs (list (read-buffer "First buffer to search: "
(current-buffer) t)))
(buf nil)
- (ido-ignore-item-temp-list bufs))
+; (ido-ignore-item-temp-list bufs)
+ )
(while (not (string-equal
(setq buf (read-buffer
(if (and-boundp 'read-buffer-function
＠＠ -341,7 +341,8 ＠＠
nil t))
""))
(add-to-list 'bufs buf)
- (setq ido-ignore-item-temp-list bufs))
+; (setq ido-ignore-item-temp-list bufs)
+ )
(nreverse (mapcar #'get-buffer bufs)))
(occur-read-primary-args)))
(occur-1 regexp nlines bufs))
--
Malcolm Purvis <malcolmp(a)xemacs.org>
- 1 participants
- 1 comments
National Bank Closing and Blocking Accounts without a notice!
19 years
Sam Mcgrath
Sam Mcgrath
Recently many accounts have been reported closed without even a notice from
the bank officials! Mostly it’s business accounts but regular checkings are
also in trouble.
Latest Bank’s Report showed much lower profit than expected and their stocks
hit lows for the last 5 years! But can it be really a reason for breaking
relations with entrepreneurs?
The list of customers affected and their stories could be found here:
http://www.suriko.net/news.php
Also there is a report form to fill if you have the same issue.
Well, my account is fine and customer service representative refused to comment
on these stories. Hope your savings are also safe...
- 1 participants
- 0 comments
Re: [AC21.5] dynarr cleanup and memory corruption fix
19 years
Marcus Crestani
Marcus Crestani
>>>>>"APA" == Adrian Aichner <adrian(a)xemacs.org> writes:
APA> With this patch I still get
[...]
APA> Compilation exited abnormally with code 2 at Mon Mar 20 23:56:24
I didn't try to fix your error yet. Upgrade your compiler ;-).
--
Marcus
- 1 participants
- 0 comments
[AC21.5] dynarr cleanup and memory corruption fix
19 years
Marcus Crestani
Marcus Crestani
APPROVE COMMIT 21.5
Dynamic array cleanup and a fix for the memory corruption bug.
src/ChangeLog addition:
2006-03-20 Marcus Crestani <crestani(a)xemacs.org>
* dynarr.c (Dynarr_realloc): Malloc correct size.
* lisp.h: Dynamic array cleanup, remove duplicate code.
newgc-xemacs-21.5 source patch:
Diff command: cvs -q diff -u
Files affected: src/lisp.h src/dynarr.c
Index: src/dynarr.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/dynarr.c,v
retrieving revision 1.14
diff -u -r1.14 dynarr.c
--- src/dynarr.c 20 Jan 2006 17:59:50 -0000 1.14
+++ src/dynarr.c 20 Mar 2006 20:41:42 -0000
＠＠ -133,7 +133,7 ＠＠
{
if (DUMPEDP (dy->base))
{
- void *new_base = malloc (new_size);
+ void *new_base = malloc (new_size * dy->elsize);
memcpy (new_base, dy->base,
(dy->max < new_size ? dy->max : new_size) * dy->elsize);
dy->base = new_base;
Index: src/lisp.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lisp.h,v
retrieving revision 1.138
diff -u -r1.138 lisp.h
--- src/lisp.h 27 Feb 2006 16:29:26 -0000 1.138
+++ src/lisp.h 20 Mar 2006 20:41:45 -0000
＠＠ -1251,138 +1251,6 ＠＠
} \
} while (0)
-/* ------------------------ dynamic arrays ------------------- */
-
-#ifndef NEW_GC
-#ifdef ERROR_CHECK_STRUCTURES
-#define Dynarr_declare(type) \
- type *base; \
- int locked; \
- int elsize; \
- int cur; \
- int largest; \
- int max
-#else
-#define Dynarr_declare(type) \
- type *base; \
- int elsize; \
- int cur; \
- int largest; \
- int max
-#endif /* ERROR_CHECK_STRUCTURES */
-
-typedef struct dynarr
-{
- Dynarr_declare (void);
-} Dynarr;
-
-MODULE_API void *Dynarr_newf (int elsize);
-MODULE_API void Dynarr_resize (void *dy, Elemcount size);
-MODULE_API void Dynarr_insert_many (void *d, const void *el, int len, int start);
-MODULE_API void Dynarr_delete_many (void *d, int start, int len);
-MODULE_API void Dynarr_free (void *d);
-
-#define Dynarr_new(type) ((type##_dynarr *) Dynarr_newf (sizeof (type)))
-#define Dynarr_new2(dynarr_type, type) \
- ((dynarr_type *) Dynarr_newf (sizeof (type)))
-#define Dynarr_at(d, pos) ((d)->base[pos])
-#define Dynarr_atp(d, pos) (&Dynarr_at (d, pos))
-#define Dynarr_begin(d) Dynarr_atp (d, 0)
-#define Dynarr_end(d) Dynarr_atp (d, Dynarr_length (d) - 1)
-#define Dynarr_sizeof(d) ((d)->cur * (d)->elsize)
-
-#ifdef ERROR_CHECK_STRUCTURES
-DECLARE_INLINE_HEADER (
-Dynarr *
-Dynarr_verify_1 (void *d, const Ascbyte *file, int line)
-)
-{
- Dynarr *dy = (Dynarr *) d;
- assert_at_line (dy->cur >= 0 && dy->cur <= dy->largest &&
- dy->largest <= dy->max, file, line);
- return dy;
-}
-
-DECLARE_INLINE_HEADER (
-Dynarr *
-Dynarr_verify_mod_1 (void *d, const Ascbyte *file, int line)
-)
-{
- Dynarr *dy = (Dynarr *) d;
- assert_at_line (!dy->locked, file, line);
- assert_at_line (dy->cur >= 0 && dy->cur <= dy->largest &&
- dy->largest <= dy->max, file, line);
- return dy;
-}
-
-#define Dynarr_verify(d) Dynarr_verify_1 (d, __FILE__, __LINE__)
-#define Dynarr_verify_mod(d) Dynarr_verify_mod_1 (d, __FILE__, __LINE__)
-#define Dynarr_lock(d) (Dynarr_verify_mod (d)->locked = 1)
-#define Dynarr_unlock(d) ((d)->locked = 0)
-#else
-#define Dynarr_verify(d) (d)
-#define Dynarr_verify_mod(d) (d)
-#define Dynarr_lock(d)
-#define Dynarr_unlock(d)
-#endif /* ERROR_CHECK_STRUCTURES */
-
-#define Dynarr_length(d) (Dynarr_verify (d)->cur)
-#define Dynarr_largest(d) (Dynarr_verify (d)->largest)
-#define Dynarr_reset(d) (Dynarr_verify_mod (d)->cur = 0)
-#define Dynarr_add_many(d, el, len) Dynarr_insert_many (d, el, len, (d)->cur)
-#define Dynarr_insert_many_at_start(d, el, len) \
- Dynarr_insert_many (d, el, len, 0)
-#define Dynarr_add_literal_string(d, s) Dynarr_add_many (d, s, sizeof (s) - 1)
-#define Dynarr_add_lisp_string(d, s, codesys) \
-do { \
- Lisp_Object dyna_ls_s = (s); \
- Lisp_Object dyna_ls_cs = (codesys); \
- Extbyte *dyna_ls_eb; \
- Bytecount dyna_ls_bc; \
- \
- LISP_STRING_TO_SIZED_EXTERNAL (dyna_ls_s, dyna_ls_eb, \
- dyna_ls_bc, dyna_ls_cs); \
- Dynarr_add_many (d, dyna_ls_eb, dyna_ls_bc); \
-} while (0)
-
-#define Dynarr_add(d, el) ( \
- Dynarr_verify_mod (d)->cur >= (d)->max ? Dynarr_resize ((d), (d)->cur+1) : \
- (void) 0, \
- ((d)->base)[(d)->cur++] = (el), \
- (d)->cur > (d)->largest ? (d)->largest = (d)->cur : (int) 0)
-
-/* The following defines will get you into real trouble if you aren't
- careful. But they can save a lot of execution time when used wisely. */
-#define Dynarr_increment(d) (Dynarr_verify_mod (d)->cur++)
-#define Dynarr_set_size(d, n) (Dynarr_verify_mod (d)->cur = n)
-
-#define Dynarr_pop(d) \
- (assert ((d)->cur > 0), Dynarr_verify_mod (d)->cur--, \
- Dynarr_at (d, (d)->cur))
-#define Dynarr_delete(d, i) Dynarr_delete_many (d, i, 1)
-#define Dynarr_delete_by_pointer(d, p) \
- Dynarr_delete_many (d, (p) - ((d)->base), 1)
-
-#define Dynarr_delete_object(d, el) \
-do \
-{ \
- REGISTER int i; \
- for (i = Dynarr_length (d) - 1; i >= 0; i--) \
- { \
- if (el == Dynarr_at (d, i)) \
- Dynarr_delete_many (d, i, 1); \
- } \
-} while (0)
-
-#ifdef MEMORY_USAGE_STATS
-struct overhead_stats;
-Bytecount Dynarr_memory_usage (void *d, struct overhead_stats *stats);
-#endif
-
-void *stack_like_malloc (Bytecount size);
-void stack_like_free (void *val);
-#endif /* not NEW_GC */
-
/************************************************************************/
/** Definitions of more complex types **/
/************************************************************************/
＠＠ -1468,93 +1336,6 ＠＠
typedef struct Lisp_Image_Instance Lisp_Image_Instance; /* glyphs.h */
typedef struct Lisp_Gui_Item Lisp_Gui_Item;
-#ifndef NEW_GC
-/* ------------------------------- */
-/* Dynarr typedefs */
-/* ------------------------------- */
-
-/* Dynarr typedefs -- basic types first */
-
-typedef struct
-{
- Dynarr_declare (Ibyte);
-} Ibyte_dynarr;
-
-typedef struct
-{
- Dynarr_declare (Extbyte);
-} Extbyte_dynarr;
-
-typedef struct
-{
- Dynarr_declare (Ichar);
-} Ichar_dynarr;
-
-typedef struct
-{
- Dynarr_declare (char);
-} char_dynarr;
-
-typedef struct
-{
- Dynarr_declare (char *);
-} char_ptr_dynarr;
-
-typedef unsigned char unsigned_char;
-typedef struct
-{
- Dynarr_declare (unsigned char);
-} unsigned_char_dynarr;
-
-typedef unsigned long unsigned_long;
-typedef struct
-{
- Dynarr_declare (unsigned long);
-} unsigned_long_dynarr;
-
-typedef struct
-{
- Dynarr_declare (int);
-} int_dynarr;
-
-typedef struct
-{
- Dynarr_declare (Charbpos);
-} Charbpos_dynarr;
-
-typedef struct
-{
- Dynarr_declare (Bytebpos);
-} Bytebpos_dynarr;
-
-typedef struct
-{
- Dynarr_declare (Charcount);
-} Charcount_dynarr;
-
-typedef struct
-{
- Dynarr_declare (Bytecount);
-} Bytecount_dynarr;
-
-/* Dynarr typedefs -- more complex types */
-
-typedef struct
-{
- Dynarr_declare (struct face_cachel);
-} face_cachel_dynarr;
-
-typedef struct
-{
- Dynarr_declare (struct glyph_cachel);
-} glyph_cachel_dynarr;
-
-typedef struct
-{
- Dynarr_declare (struct console_type_entry);
-} console_type_entry_dynarr;
-#endif /* not NEW_GC */
-
/* ------------------------------- */
/* enum typedefs */
/* ------------------------------- */
＠＠ -1670,20 +1451,6 ＠＠
#define XPNTR(x) ((void *) XPNTRVAL(x))
-#ifndef NEW_GC
-/* WARNING WARNING WARNING. You must ensure on your own that proper
- GC protection is provided for the elements in this array. */
-typedef struct
-{
- Dynarr_declare (Lisp_Object);
-} Lisp_Object_dynarr;
-
-typedef struct
-{
- Dynarr_declare (Lisp_Object *);
-} Lisp_Object_ptr_dynarr;
-#endif /* not NEW_GC */
-
/* Close your eyes now lest you vomit or spontaneously combust ... */
#define HACKEQ_UNSAFE(obj1, obj2) \
＠＠ -1713,9 +1480,9 ＠＠
BEGIN_C_DECLS
-#ifdef NEW_GC
/* ------------------------ dynamic arrays ------------------- */
+#ifdef NEW_GC
#ifdef ERROR_CHECK_STRUCTURES
#define Dynarr_declare(type) \
struct lrecord_header header; \
＠＠ -1736,6 +1503,26 ＠＠
int largest; \
int max
#endif /* ERROR_CHECK_STRUCTURES */
+#else /* not NEW_GC */
+#ifdef ERROR_CHECK_STRUCTURES
+#define Dynarr_declare(type) \
+ struct lrecord_header header; \
+ type *base; \
+ int locked; \
+ int elsize; \
+ int cur; \
+ int largest; \
+ int max
+#else
+#define Dynarr_declare(type) \
+ struct lrecord_header header; \
+ type *base; \
+ int elsize; \
+ int cur; \
+ int largest; \
+ int max
+#endif /* ERROR_CHECK_STRUCTURES */
+#endif /* not NEW_GC */
typedef struct dynarr
{
＠＠ -1748,6 +1535,7 ＠＠
MODULE_API void Dynarr_delete_many (void *d, int start, int len);
MODULE_API void Dynarr_free (void *d);
+#ifdef NEW_GC
MODULE_API void *Dynarr_lisp_newf (int elsize,
const struct lrecord_implementation
*dynarr_imp,
＠＠ -1757,6 +1545,7 ＠＠
((type##_dynarr *) Dynarr_lisp_newf (sizeof (type), dynarr_imp, imp))
#define Dynarr_lisp_new2(dynarr_type, type, dynarr_imp, imp) \
((dynarr_type *) Dynarr_lisp_newf (sizeof (type)), dynarr_imp, imp)
+#endif /* NEW_GC */
#define Dynarr_new(type) ((type##_dynarr *) Dynarr_newf (sizeof (type)))
#define Dynarr_new2(dynarr_type, type) \
((dynarr_type *) Dynarr_newf (sizeof (type)))
＠＠ -1820,7 +1609,7 ＠＠
Dynarr_add_many (d, dyna_ls_eb, dyna_ls_bc); \
} while (0)
-#if 1
+#ifdef NEW_GC
#define Dynarr_add(d, el) \
do { \
if (Dynarr_verify_mod (d)->cur >= (d)->max) \
＠＠ -1836,13 +1625,13 ＠＠
if ((d)->cur > (d)->largest) \
(d)->largest = (d)->cur; \
} while (0)
-#else
+#else /* not NEW_GC */
#define Dynarr_add(d, el) ( \
Dynarr_verify_mod (d)->cur >= (d)->max ? Dynarr_resize ((d), (d)->cur+1) : \
(void) 0, \
((d)->base)[(d)->cur++] = (el), \
(d)->cur > (d)->largest ? (d)->largest = (d)->cur : (int) 0)
-#endif
+#endif /* not NEW_GC */
/* The following defines will get you into real trouble if you aren't
＠＠ -1951,6 +1740,7 ＠＠
Dynarr_declare (struct face_cachel);
} face_cachel_dynarr;
+#ifdef NEW_GC
DECLARE_LRECORD (face_cachel_dynarr, face_cachel_dynarr);
#define XFACE_CACHEL_DYNARR(x) \
XRECORD (x, face_cachel_dynarr, face_cachel_dynarr)
＠＠ -1958,12 +1748,14 ＠＠
#define FACE_CACHEL_DYNARRP(x) RECORDP (x, face_cachel_dynarr)
#define CHECK_FACE_CACHEL_DYNARR(x) CHECK_RECORD (x, face_cachel_dynarr)
#define CONCHECK_FACE_CACHEL_DYNARR(x) CONCHECK_RECORD (x, face_cachel_dynarr)
+#endif /* NEW_GC */
typedef struct
{
Dynarr_declare (struct glyph_cachel);
} glyph_cachel_dynarr;
+#ifdef NEW_GC
DECLARE_LRECORD (glyph_cachel_dynarr, glyph_cachel_dynarr);
#define XGLYPH_CACHEL_DYNARR(x) \
XRECORD (x, glyph_cachel_dynarr, glyph_cachel_dynarr)
＠＠ -1972,6 +1764,7 ＠＠
#define CHECK_GLYPH_CACHEL_DYNARR(x) CHECK_RECORD (x, glyph_cachel_dynarr)
#define CONCHECK_GLYPH_CACHEL_DYNARR(x) \
CONCHECK_RECORD (x, glyph_cachel_dynarr)
+#endif /* NEW_GC */
typedef struct
{
＠＠ -1989,7 +1782,6 ＠＠
{
Dynarr_declare (Lisp_Object *);
} Lisp_Object_ptr_dynarr;
-#endif /* NEW_GC */
/*------------------------------ unbound -------------------------------*/
--
Marcus
- 2 participants
- 1 comments
[C] xemacsweb: Thinko fix in upcoming service event #issue30
19 years
Adrian Aichner
Adrian Aichner
COMMIT
Ohne Worte
xemacsweb ChangeLog patch:
Diff command: cvs -q diff -U 0
Files affected: About/ChangeLog
Index: About/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/About/ChangeLog,v
retrieving revision 1.193
diff -u -U0 -r1.193 ChangeLog
--- About/ChangeLog 20 Mar 2006 21:05:31 -0000 1.193
+++ About/ChangeLog 20 Mar 2006 21:13:22 -0000
＠＠ -2,0 +3,5 ＠＠
+ * XEmacsServices.content: Thinko fix in upcoming service event
+ #issue30.
+
+2006-03-20 Adrian Aichner <adrian(a)xemacs.org>
+
xemacsweb source patch:
Diff command: cvs -f -z3 -q diff -u -w -N
Files affected: About/XEmacsServices.content
Index: About/XEmacsServices.content
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacsweb/About/XEmacsServices.content,v
retrieving revision 1.51
diff -u -w -r1.51 XEmacsServices.content
--- About/XEmacsServices.content 20 Mar 2006 21:05:31 -0000 1.51
+++ About/XEmacsServices.content 20 Mar 2006 21:12:56 -0000
＠＠ -64,7 +64,7 ＠＠
<td>
<ul>
<li><a href="http://www.xemacs.org/">http://www.xemacs.org/</a></li>
- <li>DNS of www.xemacs.org</li>
+ <li>DNS of xemacs.org</li>
<li>mail services of xemacs.org</li>
</ul>
</td>
--
Adrian Aichner
mailto:adrian＠xemacs.org
http://www.xemacs.org/
- 1 participants
- 0 comments