Branch: Tag:

2008-06-28

2008-06-28 16:37:03 by Martin Nilsson <mani@lysator.liu.se>

static -> protected

Rev: lib/modules/ADT.pmod/Heap.pike:1.12
Rev: lib/modules/ADT.pmod/Queue.pike:1.14
Rev: lib/modules/ADT.pmod/Relation.pmod/Binary.pike:1.15
Rev: lib/modules/ADT.pmod/Struct.pike:1.20
Rev: lib/modules/ADT.pmod/Table.pmod:1.29
Rev: lib/modules/ADT.pmod/Trie.pike:1.6
Rev: lib/modules/ADT.pmod/module.pmod:1.12
Rev: lib/modules/Arg.pmod:1.6
Rev: lib/modules/Array.pmod:1.110
Rev: lib/modules/Audio.pmod/Codec.pmod:1.11
Rev: lib/modules/Audio.pmod/Format.pmod/MP3.pike:1.4
Rev: lib/modules/Cache.pmod/Storage.pmod/Gdbm.pike:1.12
Rev: lib/modules/Cache.pmod/cache.pike:1.14
Rev: lib/modules/Calendar.pmod/Austrian.pmod:1.8
Rev: lib/modules/Calendar.pmod/Badi.pmod:1.8
Rev: lib/modules/Calendar.pmod/Coptic.pmod:1.8
Rev: lib/modules/Calendar.pmod/Discordian.pmod:1.12
Rev: lib/modules/Calendar.pmod/Event.pmod:1.24
Rev: lib/modules/Calendar.pmod/Gregorian.pmod:1.12
Rev: lib/modules/Calendar.pmod/ISO.pmod:1.11
Rev: lib/modules/Calendar.pmod/Islamic.pmod:1.11
Rev: lib/modules/Calendar.pmod/Julian.pmod:1.11
Rev: lib/modules/Calendar.pmod/Language.pmod:1.25
Rev: lib/modules/Calendar.pmod/Rule.pmod:1.3
Rev: lib/modules/Calendar.pmod/Stardate.pmod:1.17
Rev: lib/modules/Calendar.pmod/Swedish.pmod:1.9
Rev: lib/modules/Calendar.pmod/TZnames.pmod:1.16
Rev: lib/modules/Calendar.pmod/Time.pmod:1.42
Rev: lib/modules/Calendar.pmod/TimeRanges.pmod:1.35
Rev: lib/modules/Calendar.pmod/Timezone.pmod:1.44
Rev: lib/modules/Calendar.pmod/YMD.pike:1.33
Rev: lib/modules/Calendar.pmod/module.pmod:1.16
Rev: lib/modules/Calendar_I.pmod/ISO.pmod:1.12
Rev: lib/modules/Calendar_I.pmod/Stardate.pmod:1.5
Rev: lib/modules/Crypto.pmod/DSA.pike:1.8
Rev: lib/modules/Crypto.pmod/HMAC.pike:1.5
Rev: lib/modules/Crypto.pmod/Koremutake.pmod:1.4
Rev: lib/modules/Crypto.pmod/PGP.pmod:1.14
Rev: lib/modules/Crypto.pmod/Pipe.pike:1.9
Rev: lib/modules/Crypto.pmod/RSA.pike:1.11
Rev: lib/modules/Crypto.pmod/Random.pmod:1.19
Rev: lib/modules/Crypto.pmod/Substitution.pike:1.4
Rev: lib/modules/Debug.pmod/Subject.pike:1.9
Rev: lib/modules/Debug.pmod/Wrapper.pike:1.6
Rev: lib/modules/Filesystem.pmod/System.pike:1.20
Rev: lib/modules/Filesystem.pmod/Tar.pmod:1.30
Rev: lib/modules/Filesystem.pmod/module.pmod:1.26
Rev: lib/modules/GLU.pmod:1.16
Rev: lib/modules/GLUE.pmod/Driver.pmod/GTK.pike:1.6
Rev: lib/modules/GLUE.pmod/Driver.pmod/Interface.pike:1.3
Rev: lib/modules/GLUE.pmod/Driver.pmod/SDL.pike:1.6
Rev: lib/modules/GLUE.pmod/Events.pmod:1.4
Rev: lib/modules/GLUE.pmod/module.pmod:1.15
Rev: lib/modules/GTKSupport.pmod/pCtree.pike:1.8
Rev: lib/modules/GTKSupport.pmod/pDrawingArea.pike:1.9
Rev: lib/modules/Geography.pmod/Countries.pmod:1.20
Rev: lib/modules/Geography.pmod/Position.pike:1.18
Rev: lib/modules/Getopt.pmod:1.33
Rev: lib/modules/Graphics.pmod/Graph.pmod/create_graph.pike:1.20
Rev: lib/modules/Graphics.pmod/Graph.pmod/module.pmod:1.9
Rev: lib/modules/Graphics.pmod/Graph.pmod/polyline.pike:1.7
Rev: lib/modules/Int.pmod:1.10
Rev: lib/modules/Local.pmod:1.11
Rev: lib/modules/Locale.pmod/Charset.pmod/Tables.pmod/iso88591.pmod:1.3
Rev: lib/modules/Locale.pmod/Charset.pmod/module.pmod:1.57
Rev: lib/modules/Locale.pmod/Language.pmod/nld.pmod:1.2
Rev: lib/modules/Locale.pmod/module.pmod:1.25
Rev: lib/modules/MIME.pmod/ext_to_media_type.pmod:1.7
Rev: lib/modules/MIME.pmod/module.pmod:1.20
Rev: lib/modules/Mapping.pmod:1.10
Rev: lib/modules/Parser.pmod/C.pmod:1.50
Rev: lib/modules/Parser.pmod/LR.pmod/GrammarParser.pmod:1.6
Rev: lib/modules/Parser.pmod/LR.pmod/module.pmod:1.17
Rev: lib/modules/Parser.pmod/Pike.pmod:1.41
Rev: lib/modules/Parser.pmod/RCS.pike:1.39
Rev: lib/modules/Parser.pmod/SGML.pike:1.3
Rev: lib/modules/Parser.pmod/XML.pmod/DOM.pmod:1.14
Rev: lib/modules/Parser.pmod/XML.pmod/NSTree.pmod:1.20
Rev: lib/modules/Parser.pmod/XML.pmod/Tree.pmod:1.72
Rev: lib/modules/Parser.pmod/XML.pmod/Validating.pike:1.14
Rev: lib/modules/Parser.pmod/module.pmod:1.25
Rev: lib/modules/Pike.pmod/module.pmod:1.19
Rev: lib/modules/Process.pmod:1.54
Rev: lib/modules/Protocols.pmod/Bittorrent.pmod/Bencoding.pmod:1.5
Rev: lib/modules/Protocols.pmod/Bittorrent.pmod/Peer.pike:1.21
Rev: lib/modules/Protocols.pmod/Bittorrent.pmod/PeerID.pmod:1.8
Rev: lib/modules/Protocols.pmod/Bittorrent.pmod/Port.pike:1.7
Rev: lib/modules/Protocols.pmod/Bittorrent.pmod/Torrent.pike:1.36
Rev: lib/modules/Protocols.pmod/Bittorrent.pmod/module.pmod:1.4
Rev: lib/modules/Protocols.pmod/DNS.pmod:1.96
Rev: lib/modules/Protocols.pmod/DNS_SD.pmod:1.2
Rev: lib/modules/Protocols.pmod/HTTP.pmod/Query.pike:1.93
Rev: lib/modules/Protocols.pmod/HTTP.pmod/Server.pmod/Port.pike:1.9
Rev: lib/modules/Protocols.pmod/HTTP.pmod/Server.pmod/Request.pike:1.50
Rev: lib/modules/Protocols.pmod/HTTP.pmod/Server.pmod/SSLPort.pike:1.14
Rev: lib/modules/Protocols.pmod/HTTP.pmod/Session.pike:1.22
Rev: lib/modules/Protocols.pmod/HTTP.pmod/module.pmod:1.56
Rev: lib/modules/Protocols.pmod/Ident.pmod:1.12
Rev: lib/modules/Protocols.pmod/LDAP.pmod/client.pike:1.113
Rev: lib/modules/Protocols.pmod/LDAP.pmod/ldap_privates.pmod:1.15
Rev: lib/modules/Protocols.pmod/LDAP.pmod/module.pmod:1.32
Rev: lib/modules/Protocols.pmod/LDAP.pmod/protocol.pike:1.21
Rev: lib/modules/Protocols.pmod/LMTP.pmod:1.12
Rev: lib/modules/Protocols.pmod/Line.pmod:1.23
Rev: lib/modules/Protocols.pmod/LysKOM.pmod/Raw.pike:1.19
Rev: lib/modules/Protocols.pmod/OBEX.pmod:1.8
Rev: lib/modules/Protocols.pmod/SMTP.pmod/module.pmod:1.46
Rev: lib/modules/Protocols.pmod/SNMP.pmod/protocol.pike:1.19
Rev: lib/modules/Protocols.pmod/TELNET.pmod:1.28
Rev: lib/modules/Protocols.pmod/X.pmod/Extensions.pmod:1.16
Rev: lib/modules/Protocols.pmod/XMLRPC.pmod/module.pmod:1.30
Rev: lib/modules/Remote.pmod/module.pmod:1.8
Rev: lib/modules/SSL.pmod/Cipher.pmod:1.16
Rev: lib/modules/SSL.pmod/connection.pike:1.42
Rev: lib/modules/SSL.pmod/context.pike:1.37
Rev: lib/modules/SSL.pmod/session.pike:1.37
Rev: lib/modules/SSL.pmod/sslfile.pike:1.110
Rev: lib/modules/Sql.pmod/Sql.pike:1.92
Rev: lib/modules/Sql.pmod/mysql.pike:1.41
Rev: lib/modules/Sql.pmod/postgres.pike:1.28
Rev: lib/modules/Sql.pmod/rsql.pike:1.13
Rev: lib/modules/Sql.pmod/sql_result.pike:1.18
Rev: lib/modules/Sql.pmod/sql_util.pmod:1.21
Rev: lib/modules/Sql.pmod/tds.pike:1.24
Rev: lib/modules/Standards.pmod/ASN1.pmod/Decode.pmod:1.24
Rev: lib/modules/Standards.pmod/ASN1.pmod/Types.pmod:1.45
Rev: lib/modules/Standards.pmod/EXIF.pmod:1.29
Rev: lib/modules/Standards.pmod/FIPS10_4.pmod:1.4
Rev: lib/modules/Standards.pmod/ID3.pmod:1.24
Rev: lib/modules/Standards.pmod/IDNA.pmod:1.9
Rev: lib/modules/Standards.pmod/IIM.pmod:1.8
Rev: lib/modules/Standards.pmod/ISO639_2.pmod:1.19
Rev: lib/modules/Standards.pmod/URI.pike:1.28
Rev: lib/modules/Standards.pmod/UUID.pmod:1.17
Rev: lib/modules/Standards.pmod/XML.pmod/Wix.pmod:1.27
Rev: lib/modules/Stdio.pmod/FakeFile.pike:1.16
Rev: lib/modules/Stdio.pmod/Readline.pike:1.60
Rev: lib/modules/Stdio.pmod/Terminfo.pmod:1.27
Rev: lib/modules/Stdio.pmod/module.pmod:1.238
Rev: lib/modules/String.pmod/HTML.pmod:1.7
Rev: lib/modules/String.pmod/module.pmod:1.29
Rev: lib/modules/Thread.pmod:1.45
Rev: lib/modules/Tools.pmod/AutoDoc.pmod/CExtractor.pmod:1.28
Rev: lib/modules/Tools.pmod/AutoDoc.pmod/DocParser.pmod:1.62
Rev: lib/modules/Tools.pmod/AutoDoc.pmod/PikeExtractor.pmod:1.40
Rev: lib/modules/Tools.pmod/AutoDoc.pmod/PikeObjects.pmod:1.37
Rev: lib/modules/Tools.pmod/AutoDoc.pmod/PikeParser.pike:1.52
Rev: lib/modules/Tools.pmod/AutoDoc.pmod/ProcessXML.pmod:1.71
Rev: lib/modules/Tools.pmod/AutoDoc.pmod/module.pmod:1.10
Rev: lib/modules/Tools.pmod/Hilfe.pmod:1.156
Rev: lib/modules/Tools.pmod/Install.pmod:1.35
Rev: lib/modules/Tools.pmod/Legal.pmod/Copyright.pmod:1.12
Rev: lib/modules/Tools.pmod/Legal.pmod/License.pmod/GPL.pmod:1.3
Rev: lib/modules/Tools.pmod/Legal.pmod/License.pmod/LGPL.pmod:1.3
Rev: lib/modules/Tools.pmod/Legal.pmod/License.pmod/MPL.pmod:1.3
Rev: lib/modules/Tools.pmod/Monger.pmod/MongerDeveloper.pike:1.8
Rev: lib/modules/Tools.pmod/Monger.pmod/MongerUser.pike:1.8
Rev: lib/modules/Tools.pmod/Monger.pmod/module.pmod:1.3
Rev: lib/modules/Tools.pmod/PEM.pmod:1.14
Rev: lib/modules/Tools.pmod/PV.pike:1.10
Rev: lib/modules/Tools.pmod/Shoot.pmod/module.pmod:1.20
Rev: lib/modules/Tools.pmod/Standalone.pmod/assemble_autodoc.pike:1.35
Rev: lib/modules/Tools.pmod/Standalone.pmod/dump.pike:1.10
Rev: lib/modules/Tools.pmod/Standalone.pmod/join_autodoc.pike:1.19
Rev: lib/modules/Tools.pmod/Standalone.pmod/pmar_install.pike:1.8
Rev: lib/modules/Tools.pmod/Standalone.pmod/precompile.pike:1.2
Rev: lib/modules/Tools.pmod/Standalone.pmod/rsqld.pike:1.12
Rev: lib/modules/Tools.pmod/Standalone.pmod/test_pike.pike:1.136
Rev: lib/modules/Tools.pmod/Testsuite.pmod:1.9
Rev: lib/modules/Tools.pmod/sed.pmod:1.6
Rev: lib/modules/Web.pmod/CGI.pmod/Request.pike:1.4
Rev: lib/modules/Web.pmod/Crawler.pmod:1.26
Rev: lib/modules/Web.pmod/OWL.pike:1.7
Rev: lib/modules/Web.pmod/RDF.pike:1.47
Rev: lib/modules/Web.pmod/RSS.pmod:1.7
Rev: lib/modules/Yabu.pmod/module.pmod:1.30
Rev: lib/modules/_Image.pmod/Dims.pmod:1.10
Rev: lib/modules/_Image.pmod/Fonts.pmod:1.13
Rev: lib/modules/_Image.pmod/module.pmod:1.47
Rev: lib/modules/_Image_DWG.pmod:1.5
Rev: lib/modules/_Image_PS.pmod:1.15
Rev: lib/modules/_Image_XCF.pmod:1.25

34: Inside #if constant(thread_create)
  inherit Thread;      // We don't want to create a thread of the module... - static void create(mixed ... args) + protected void create(mixed ... args)   {   }   
83: Inside #if constant(thread_create)
   //!    int size() { return num; }    -  static final mixed read_unlocked() +  protected final mixed read_unlocked()    {    mixed tmp=buffer[ptr];    buffer[ptr++] = 0; // Throw away any references.
134: Inside #if constant(thread_create)
   return res;    }    -  static final array read_all_unlocked() +  protected final array read_all_unlocked()    {    array ret;   
199: Inside #if constant(thread_create)
   return ret;    }    -  static final void write_unlocked (mixed value) +  protected final void write_unlocked (mixed value)    {    buffer[(ptr + num) % sizeof(buffer)] = value;    if(write_tres)
255: Inside #if constant(thread_create)
   //! sets how many values can be written to the fifo without blocking.    //! The default @[size] is 128.    //! -  static void create(int|void size) +  protected void create(int|void size)    {    write_tres=0;    buffer=allocate(read_tres=size || 128);    }    -  static string _sprintf( int f ) +  protected string _sprintf( int f )    {    return f=='O' && sprintf( "%O(%d / %d)", this_program,    size(), read_tres );
327: Inside #if constant(thread_create)
   return tmp;    }    -  static final array read_all_unlocked() +  protected final array read_all_unlocked()    {    array ret;   
409: Inside #if constant(thread_create)
   return items;    }    -  static string _sprintf( int f ) +  protected string _sprintf( int f )    {    return f=='O' && sprintf( "%O(%d)", this_program, size() );    }
419: Inside #if constant(thread_create)
     optional class Farm   { -  static Mutex mutex = Mutex(); -  static Condition ft_cond = Condition(); -  static Queue job_queue = Queue(); +  protected Mutex mutex = Mutex(); +  protected Condition ft_cond = Condition(); +  protected Queue job_queue = Queue();       class Result    {
473: Inside #if constant(thread_create)
   }       -  static string _sprintf( int f ) +  protected string _sprintf( int f )    {    switch( f )    {
485: Inside #if constant(thread_create)
   }    }    -  static class Handler +  protected class Handler    {    Mutex job_mutex = Mutex();    Condition cond = Condition();
495: Inside #if constant(thread_create)
   float total_time;    int handled, max_time;    -  static int ready; +  protected int ready;       void handler()    {
559: Inside #if constant(thread_create)
   +"\n\n");    }    -  static void create() +  protected void create()    {    thread = thread_create( handler );    }       -  static string _sprintf( int f ) +  protected string _sprintf( int f )    {    switch( f )    {
578: Inside #if constant(thread_create)
   }    }    -  static array(Handler) threads = ({}); -  static array(Handler) free_threads = ({}); -  static int max_num_threads = 20; +  protected array(Handler) threads = ({}); +  protected array(Handler) free_threads = ({}); +  protected int max_num_threads = 20;    -  static Handler aquire_thread() +  protected Handler aquire_thread()    {    object lock = mutex->lock();    while( !sizeof(free_threads) )
601: Inside #if constant(thread_create)
   }       -  static void dispatcher() +  protected void dispatcher()    {    while( array q = [array]job_queue->read() )    aquire_thread()->run( q[1], q[0] );    }    -  static class ValueAdjuster( object r, object r2, int i, mapping v ) +  protected class ValueAdjuster( object r, object r2, int i, mapping v )    {    void go(mixed vn, int err)    {
690: Inside #if constant(thread_create)
   return res;    }    -  static string _sprintf( int f ) +  protected string _sprintf( int f )    {    return f=='O' && sprintf( "%O(/* %s */)", this_program, debug_status() );    }    -  static void create() +  protected void create()    {    thread_create( dispatcher );    }
708:   /* Fallback implementation of Thread.Local */   optional class Local   { -  static mixed data; +  protected mixed data;    mixed get() {return data;}    mixed set (mixed val) {return data = val;}   }      /* Fallback implementation of Thread.MutexKey */ - optional class MutexKey (static function(:void) dec_locks) + optional class MutexKey (protected function(:void) dec_locks)   {    int `!()    {
725:    return 1;    }    -  static void destroy() +  protected void destroy()    {    if (dec_locks) dec_locks();    }
734:   /* Fallback implementation of Thread.Mutex */   optional class Mutex   { -  static int locks = 0; -  static void dec_locks() {locks--;} +  protected int locks = 0; +  protected void dec_locks() {locks--;}       MutexKey lock (int|void type)    {
847:    return num;    }    -  static void create(int|void size) +  protected void create(int|void size)    {    write_tres=0;    buffer=allocate(read_tres=size || 128);    }    -  static string _sprintf( int f ) +  protected string _sprintf( int f )    {    return f=='O' && sprintf( "%O(%d / %d)", this_program,    size(), read_tres );
925:    return w_ptr - r_ptr;    }    -  static string _sprintf( int f ) +  protected string _sprintf( int f )    {    return f=='O' && sprintf( "%O(%d)", this_program, size() );    }   }      #endif /* !constant(thread_create) */ -  +