Update of /cvsroot/alsa/alsa-lib/src/alisp
In directory sc8-pr-cvs1:/tmp/cvs-serv10642/src/alisp
Modified Files:
alisp.c alisp_snd.c
Log Message:
More alisp changes
Index: alisp.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/alisp/alisp.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- alisp.c 29 Jul 2003 13:19:19 -0000 1.5
+++ alisp.c 1 Aug 2003 18:21:19 -0000 1.6
@@ -683,6 +683,7 @@
case ALISP_OBJ_FLOAT: return "float";
case ALISP_OBJ_IDENTIFIER: return "identifier";
case ALISP_OBJ_STRING: return "string";
+ case ALISP_OBJ_POINTER: return "pointer";
case ALISP_OBJ_CONS: return "cons";
default: assert(0);
}
@@ -777,10 +778,14 @@
lisp_debug(instance, "** collecting cons %p", p);
free_object(p);
- p->next = instance->free_objs_list;
- instance->free_objs_list = p;
+ if (instance->free_objs < 1000) {
+ p->next = instance->free_objs_list;
+ instance->free_objs_list = p;
+ ++instance->free_objs;
+ } else {
+ free(p);
+ }
- ++instance->free_objs;
--instance->used_objs;
} else {
/* The object is referenced somewhere. */
@@ -1884,6 +1889,17 @@
return &alsa_lisp_nil;
}
+static struct alisp_object * F_stat_memory(struct alisp_instance *instance, struct
alisp_object * args ATTRIBUTE_UNUSED)
+{
+ snd_output_printf(instance->out, "*** Memory stats\n");
+ snd_output_printf(instance->out, " used_objs = %i, free_objs = %i, obj_size =
%i (total = %i)\n",
+ instance->used_objs,
+ instance->free_objs,
+ sizeof(struct alisp_object),
+ (instance->used_objs + instance->free_objs) * sizeof(struct
alisp_object));
+ return &alsa_lisp_nil;
+}
+
static struct alisp_object * F_dump_objects(struct alisp_instance *instance, struct
alisp_object * args)
{
struct alisp_object * p = car(args);
@@ -1909,6 +1925,7 @@
{ "%", F_mod },
{ "&dump-memory", F_dump_memory },
{ "&dump-objects", F_dump_objects },
+ { "&stat-memory", F_stat_memory },
{ "*", F_mul },
{ "+", F_add },
{ "-", F_sub },
Index: alisp_snd.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/alisp/alisp_snd.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- alisp_snd.c 30 Jul 2003 19:14:01 -0000 1.3
+++ alisp_snd.c 1 Aug 2003 18:21:20 -0000 1.4
@@ -137,6 +137,30 @@
return lexpr;
}
+static struct alisp_object * add_cons1(struct alisp_instance * instance, struct
alisp_object *lexpr, int cdr, int id, struct alisp_object *obj)
+{
+ struct alisp_object * p1;
+
+ if (lexpr == NULL || obj == NULL)
+ return NULL;
+ if (cdr) {
+ p1 = lexpr->value.c.cdr = new_object(instance, ALISP_OBJ_CONS);
+ } else {
+ p1 = lexpr->value.c.car = new_object(instance, ALISP_OBJ_CONS);
+ }
+ lexpr = p1;
+ if (p1 == NULL)
+ return NULL;
+ p1->value.c.car = new_object(instance, ALISP_OBJ_CONS);
+ if ((p1 = p1->value.c.car) == NULL)
+ return NULL;
+ p1->value.c.car = new_integer(instance, id);
+ if (p1->value.c.car == NULL)
+ return NULL;
+ p1->value.c.cdr = obj;
+ return lexpr;
+}
+
static inline struct alisp_object * new_result(struct alisp_instance * instance, int
err)
{
return new_integer(instance, err);
@@ -361,7 +385,7 @@
static struct alisp_object * create_ctl_elem_id(struct alisp_instance * instance,
snd_ctl_elem_id_t * id, struct alisp_object * cons)
{
cons = add_cons(instance, cons, 0, "numid", new_integer(instance,
snd_ctl_elem_id_get_numid(id)));
- cons = add_cons(instance, cons, 1, "iface", new_string(instance,
snd_ctl_elem_iface_name(snd_ctl_elem_id_get_numid(id))));
+ cons = add_cons(instance, cons, 1, "iface", new_string(instance,
snd_ctl_elem_iface_name(snd_ctl_elem_id_get_interface(id))));
cons = add_cons(instance, cons, 1, "dev", new_integer(instance,
snd_ctl_elem_id_get_device(id)));
cons = add_cons(instance, cons, 1, "subdev", new_integer(instance,
snd_ctl_elem_id_get_subdevice(id)));
cons = add_cons(instance, cons, 1, "name", new_string(instance,
snd_ctl_elem_id_get_name(id)));
@@ -402,8 +426,21 @@
p1 = add_cons(instance, p1, 1, "isowner", new_integer(instance,
snd_ctl_elem_info_is_owner(info)));
p1 = add_cons(instance, p1, 1, "owner", new_integer(instance,
snd_ctl_elem_info_get_owner(info)));
p1 = add_cons(instance, p1, 1, "count", new_integer(instance,
snd_ctl_elem_info_get_count(info)));
- if (type == SND_CTL_ELEM_TYPE_ENUMERATED)
- p1 = add_cons(instance, p1, 1, "items", new_integer(instance,
snd_ctl_elem_info_get_items(info)));
+ if (type == SND_CTL_ELEM_TYPE_ENUMERATED) {
+ unsigned int items, item;
+ items = snd_ctl_elem_info_get_items(info);
+ p1 = add_cons(instance, p1, 1, "items", new_integer(instance, items));
+ p1 = add_cons(instance, p1, 1, "inames", p2 = new_object(instance,
ALISP_OBJ_CONS));
+ for (item = 0; item < items; item++) {
+ snd_ctl_elem_info_set_item(info, item);
+ err = snd_hctl_elem_info(handle, info);
+ if (err < 0) {
+ p2 = add_cons1(instance, p2, item > 0, item,
&alsa_lisp_nil);
+ } else {
+ p2 = add_cons1(instance, p2, item > 0, item,
new_string(instance, snd_ctl_elem_info_get_item_name(info)));
+ }
+ }
+ }
if (p1 == NULL)
return NULL;
return lexpr;
-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
