Mercurial > octave-nkf
changeset 14603:fa6809bbc3a6 gui
Backout revision 136ee6bcadc0 (no mutexing the symbol table)
| author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
|---|---|
| date | Sun, 06 May 2012 21:06:18 -0400 |
| parents | c8453a013000 |
| children | eeddf586cf0f |
| files | src/symtab.h |
| diffstat | 1 files changed, 0 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/src/symtab.h Mon May 07 02:36:49 2012 +0200 +++ b/src/symtab.h Sun May 06 21:06:18 2012 -0400 @@ -40,8 +40,6 @@ #include "oct-refcount.h" #include "ov.h" -#include "oct-mutex.h" - class OCTINTERP_API symbol_table @@ -2167,14 +2165,12 @@ void insert_symbol_record (const symbol_record& sr) { - octave_autolock lock (table_mutex); table[sr.name ()] = sr; } void do_dup_scope (symbol_table& new_symbol_table) const { - octave_autolock lock (table_mutex); for (table_const_iterator p = table.begin (); p != table.end (); p++) new_symbol_table.insert_symbol_record (p->second.dup (new_symbol_table.my_scope)); } @@ -2191,7 +2187,6 @@ void do_inherit (symbol_table& donor_table, context_id donor_context) { - octave_autolock lock (table_mutex); for (table_iterator p = table.begin (); p != table.end (); p++) { symbol_record& sr = p->second; @@ -2229,7 +2224,6 @@ symbol_record& do_insert (const std::string& name) { - octave_autolock lock (table_mutex); table_iterator p = table.find (name); if (p == table.end ()) @@ -2247,7 +2241,6 @@ void do_force_variable (const std::string& name, context_id context) { - octave_autolock lock (table_mutex); table_iterator p = table.find (name); if (p == table.end ()) @@ -2262,7 +2255,6 @@ octave_value& do_varref (const std::string& name, context_id context) { - octave_autolock lock (table_mutex); table_iterator p = table.find (name); if (p == table.end ()) @@ -2277,7 +2269,6 @@ octave_value do_varval (const std::string& name, context_id context) const { - octave_autolock lock (table_mutex); table_const_iterator p = table.find (name); return (p != table.end ()) ? p->second.varval (context) : octave_value (); @@ -2293,7 +2284,6 @@ octave_value do_persistent_varval (const std::string& name) { - octave_autolock lock (table_mutex); persistent_table_const_iterator p = persistent_table.find (name); return (p != persistent_table.end ()) ? p->second : octave_value (); @@ -2301,7 +2291,6 @@ void do_erase_persistent (const std::string& name) { - octave_autolock lock (table_mutex); persistent_table_iterator p = persistent_table.find (name); if (p != persistent_table.end ()) @@ -2310,7 +2299,6 @@ bool do_is_variable (const std::string& name) const { - octave_autolock lock (table_mutex); bool retval = false; table_const_iterator p = table.find (name); @@ -2327,14 +2315,12 @@ void do_push_context (void) { - octave_autolock lock (table_mutex); for (table_iterator p = table.begin (); p != table.end (); p++) p->second.push_context (my_scope); } void do_pop_context (void) { - octave_autolock lock (table_mutex); for (table_iterator p = table.begin (); p != table.end (); ) { if (p->second.pop_context (my_scope) == 0) @@ -2346,14 +2332,12 @@ void do_clear_variables (void) { - octave_autolock lock (table_mutex); for (table_iterator p = table.begin (); p != table.end (); p++) p->second.clear (my_scope); } void do_clear_objects (void) { - octave_autolock lock (table_mutex); for (table_iterator p = table.begin (); p != table.end (); p++) { symbol_record& sr = p->second; @@ -2365,14 +2349,12 @@ void do_unmark_forced_variables (void) { - octave_autolock lock (table_mutex); for (table_iterator p = table.begin (); p != table.end (); p++) p->second.unmark_forced (); } void do_clear_global (const std::string& name) { - octave_autolock lock (table_mutex); table_iterator p = table.find (name); if (p != table.end ()) @@ -2392,7 +2374,6 @@ void do_clear_variable (const std::string& name) { - octave_autolock lock (table_mutex); table_iterator p = table.find (name); if (p != table.end ()) @@ -2401,7 +2382,6 @@ void do_clear_global_pattern (const std::string& pat) { - octave_autolock lock (table_mutex); glob_match pattern (pat); for (table_iterator p = table.begin (); p != table.end (); p++) @@ -2428,7 +2408,6 @@ void do_clear_variable_pattern (const std::string& pat) { - octave_autolock lock (table_mutex); glob_match pattern (pat); for (table_iterator p = table.begin (); p != table.end (); p++) @@ -2445,7 +2424,6 @@ void do_clear_variable_regexp (const std::string& pat) { - octave_autolock lock (table_mutex); ::regexp pattern (pat); for (table_iterator p = table.begin (); p != table.end (); p++) @@ -2478,7 +2456,6 @@ std::list<symbol_record> do_all_variables (context_id context, bool defined_only) const { - octave_autolock lock (table_mutex); std::list<symbol_record> retval; for (table_const_iterator p = table.begin (); p != table.end (); p++) @@ -2497,7 +2474,6 @@ std::list<symbol_record> do_glob (const std::string& pattern, bool vars_only = false) const { - octave_autolock lock (table_mutex); std::list<symbol_record> retval; glob_match pat (pattern); @@ -2521,7 +2497,6 @@ std::list<symbol_record> do_regexp (const std::string& pattern, bool vars_only = false) const { - octave_autolock lock (table_mutex); std::list<symbol_record> retval; ::regexp pat (pattern); @@ -2544,7 +2519,6 @@ std::list<std::string> do_variable_names (void) { - octave_autolock lock (table_mutex); std::list<std::string> retval; for (table_const_iterator p = table.begin (); p != table.end (); p++) @@ -2580,7 +2554,6 @@ bool do_is_local_variable (const std::string& name) const { - octave_autolock lock (table_mutex); table_const_iterator p = table.find (name); return (p != table.end () @@ -2590,7 +2563,6 @@ bool do_is_global (const std::string& name) const { - octave_autolock lock (table_mutex); table_const_iterator p = table.find (name); return p != table.end () && p->second.is_global ();