Hi Neil,
> It looks great. I still have a few minor queries, but it's close
> enough now that I've committed this latest patch to CVS; it'll be much
> more convenient to work on the few remaining queries incrementally,
> rather than with respect to threads.c as it was prior to all these
> changes.
Hey, great! Maybe this is premature (without the Scheme
implementation being in yet), but: Thanks for your patience and
prudent counsel over these last several months.
As regards the changes below, I've attached a patch against the new
HEAD that I think resolves the issues you mentioned.
> Finally, please note that we will need a NEWS entry for this work.
> Are you happy to write that too? (You may of course prefer to defer
> this until the SRFI-18 Scheme parts are committed too - that's
> absolutely fine.)
Yes, I'm happy to write the NEWS entry, but think I would like to wait
to submit it until everything's in. And speaking of the Scheme parts,
shall I go ahead and send you a patch that includes those? I expect
that my original implementation won't need that much tweaking to
cooperate with the new core interfaces; it shouldn't take long.
Speaking of which, though, I've already run into some difficulty
implementing mutex-state -- the solution you proposed earlier depends
on mutex-owner being visible to Scheme code (it's not, at the moment),
and I can't figure out how to write mutex-state efficiently without it
(or some other way of passively inspecting the mutex). Any
suggestions would be appreciated!
Regards,
Julian
Index: doc/ref/api-scheduling.texi
===================================================================
RCS file: /sources/guile/guile/guile-core/doc/ref/api-scheduling.texi,v
retrieving revision 1.20
diff -a -u -r1.20 api-scheduling.texi
--- doc/ref/api-scheduling.texi 8 Mar 2008 16:22:39 -0000 1.20
+++ doc/ref/api-scheduling.texi 11 Mar 2008 03:38:00 -0000
@@ -377,7 +377,7 @@
@sp 1
@deffn {Scheme Procedure} make-mutex . flags
@deffnx {C Function} scm_make_mutex ()
[EMAIL PROTECTED] {C Function} scm_make_mutex_with_flags (SCM flag)
[EMAIL PROTECTED] {C Function} scm_make_mutex_with_flags (SCM flags)
Return a new mutex. It is initially unlocked. If @var{flags} is
specified, it must be a list of symbols specifying configuration flags
for the newly-created mutex. The supported flags are:
Index: libguile/threads.c
===================================================================
RCS file: /sources/guile/guile/guile-core/libguile/threads.c,v
retrieving revision 1.92
diff -a -u -r1.92 threads.c
--- libguile/threads.c 8 Mar 2008 16:22:39 -0000 1.92
+++ libguile/threads.c 11 Mar 2008 03:38:08 -0000
@@ -74,7 +74,7 @@
double sec = scm_c_truncate (time);
waittime->tv_sec = (long) sec;
- waittime->tv_nsec = (long) ((time - sec) * 1000000);
+ waittime->tv_nsec = (long) ((time - sec) * 1000000000);
}
}
@@ -1170,9 +1170,9 @@
return scm_make_mutex_with_flags (SCM_EOL);
}
-static SCM unchecked_unlock_sym;
-static SCM allow_external_unlock_sym;
-static SCM recursive_sym;
+SCM_SYMBOL (unchecked_unlock_sym, "unchecked-unlock");
+SCM_SYMBOL (allow_external_unlock_sym, "allow-external-unlock");
+SCM_SYMBOL (recursive_sym, "recursive");
SCM_DEFINE (scm_make_mutex_with_flags, "make-mutex", 0, 0, 1,
(SCM flags),
@@ -1192,7 +1192,7 @@
else if (scm_is_eq (flag, recursive_sym))
recursive = 1;
else
- SCM_MISC_ERROR ("unsupported mutex option", SCM_EOL);
+ SCM_MISC_ERROR ("unsupported mutex option: ~a", scm_list_1 (flag));
ptr = SCM_CDR (ptr);
}
return make_fat_mutex (recursive, unchecked_unlock, external_unlock);
@@ -1378,10 +1378,16 @@
if (scm_is_false (m->owner))
{
if (!m->unchecked_unlock)
- scm_misc_error (NULL, "mutex not locked", SCM_EOL);
+ {
+ scm_i_pthread_mutex_unlock (&m->lock);
+ scm_misc_error (NULL, "mutex not locked", SCM_EOL);
+ }
}
else if (!m->allow_external_unlock)
- scm_misc_error (NULL, "mutex not locked by current thread", SCM_EOL);
+ {
+ scm_i_pthread_mutex_unlock (&m->lock);
+ scm_misc_error (NULL, "mutex not locked by current thread", SCM_EOL);
+ }
}
if (! (SCM_UNBNDP (cond)))
@@ -1563,13 +1569,6 @@
}
#undef FUNC_NAME
-static int
-fat_cond_timedwait (SCM cond, SCM mutex,
- const scm_t_timespec *waittime)
-{
- return fat_mutex_unlock (mutex, cond, waittime, 1);
-}
-
SCM_DEFINE (scm_timed_wait_condition_variable, "wait-condition-variable", 2, 1, 0,
(SCM cv, SCM mx, SCM t),
"Wait until @var{cond-var} has been signalled. While waiting, "
@@ -1594,7 +1593,7 @@
waitptr = &waittime;
}
- return fat_cond_timedwait (cv, mx, waitptr) ? SCM_BOOL_T : SCM_BOOL_F;
+ return fat_mutex_unlock (mx, cv, waitptr, 1) ? SCM_BOOL_T : SCM_BOOL_F;
}
#undef FUNC_NAME
@@ -1997,12 +1996,6 @@
scm_set_smob_print (scm_tc16_mutex, fat_mutex_print);
scm_set_smob_free (scm_tc16_mutex, fat_mutex_free);
- unchecked_unlock_sym =
- scm_permanent_object (scm_from_locale_symbol ("unchecked-unlock"));
- allow_external_unlock_sym =
- scm_permanent_object (scm_from_locale_symbol ("allow-external-unlock"));
- recursive_sym = scm_permanent_object (scm_from_locale_symbol ("recursive"));
-
scm_tc16_condvar = scm_make_smob_type ("condition-variable",
sizeof (fat_cond));
scm_set_smob_mark (scm_tc16_condvar, fat_cond_mark);
