ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.539 by root, Tue May 4 22:49:21 2010 UTC vs.
Revision 1.562 by root, Sat Apr 23 04:46:26 2011 UTC

… …
76# strictly for debugging 76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
78 78
79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80 80
81our @ORIG_INC;
82
81our %COMMAND = (); 83our %COMMAND = ();
82our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
83 85
84our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
85our %EXTCMD = (); 87our %EXTCMD = ();
… …
91our @EVENT; 93our @EVENT;
92our @REFLECT; # set by XS 94our @REFLECT; # set by XS
93our %REFLECT; # set by us 95our %REFLECT; # set by us
94 96
95our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
96our $DATADIR = datadir; 99our $DATADIR = datadir;
97our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
98our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
99our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
100our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
101our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
102our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
103our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
104our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
… …
122our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
123our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
124our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
125our $DB_ENV; 129our $DB_ENV;
126 130
127our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
128 132
129our %CFG; 133our %CFG;
130 134
131our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
132our $RUNTIME; 136our $RUNTIME;
… …
231from wherever your confdir points to. 235from wherever your confdir points to.
232 236
233=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
234 238
235These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
236returns directly I<after> the tick processing (and consequently, can only wake one process 240returns directly I<after> the tick processing (and consequently, can only wake one thread
237per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 241per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
238 247
239=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
240 249
241This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
242C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 251C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
305} 314}
306 315
307$EV::DIED = sub { 316$EV::DIED = sub {
308 Carp::cluck "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
309}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
310 324
311############################################################################# 325#############################################################################
312 326
313=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
314 328
… …
335 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
336 $d 350 $d
337 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
338} 352}
339 353
354=item $scalar = load_file $path
355
356Loads the given file from path and returns its contents. Croaks on error
357and can block.
358
359=cut
360
361sub load_file($) {
362 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!";
364
365 $data
366}
367
340=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
341 369
342Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
343 371
344=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
… …
350our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 378our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
351 379
352sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
353sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
354 382
383=item $ref = cf::decode_storable $scalar
384
385Same as Coro::Storable::thaw, so blocks.
386
387=cut
388
389BEGIN { *decode_storable = \&Coro::Storable::thaw }
390
391=item $ref = cf::decode_yaml $scalar
392
393Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
394
395=cut
396
397sub decode_yaml($) {
398 fork_call { YAML::XS::Load $_[0] } @_
399}
400
401=item $scalar = cf::unlzf $scalar
402
403Same as Compress::LZF::compress, but takes server ticks into account, so
404blocks.
405
406=cut
407
408sub unlzf($) {
409 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
410 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
411 Compress::LZF::decompress $_[0]
412}
413
355=item cf::post_init { BLOCK } 414=item cf::post_init { BLOCK }
356 415
357Execute the given codeblock, I<after> all extensions have been (re-)loaded, 416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
358but I<before> the server starts ticking again. 417but I<before> the server starts ticking again.
359 418
360The cdoeblock will have a single boolean argument to indicate whether this 419The codeblock will have a single boolean argument to indicate whether this
361is a reload or not. 420is a reload or not.
362 421
363=cut 422=cut
364 423
365sub post_init(&) { 424sub post_init(&) {
366 push @POST_INIT, shift; 425 push @POST_INIT, shift;
426}
427
428sub _post_init {
429 trace "running post_init jobs";
430
431 # run them in parallel...
432
433 my @join;
434
435 while () {
436 push @join, map &Coro::async ($_, 0), @POST_INIT;
437 @POST_INIT = ();
438
439 @join or last;
440
441 (pop @join)->join;
442 }
367} 443}
368 444
369=item cf::lock_wait $string 445=item cf::lock_wait $string
370 446
371Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
… …
424 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
425} 501}
426 502
427=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
428 504
429Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
430This call blocks and returns only when you have at least C<$time> seconds 506(default: 0): This call blocks and returns only when you have at least
431of cpu time till the next tick. The slot is only valid till the next cede. 507C<$time> seconds of cpu time till the next tick. The slot is only valid
508till the next cede.
509
510Background jobs should use a priority les than zero, interactive jobs
511should use 100 or more.
432 512
433The optional C<$name> can be used to identify the job to run. It might be 513The optional C<$name> can be used to identify the job to run. It might be
434used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
435 515
436Useful for short background jobs. 516Useful for short background jobs.
… …
576 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
577 657
578 $coro 658 $coro
579} 659}
580 660
581=item fork_call { }, $args 661=item fork_call { }, @args
582 662
583Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
584process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
585Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
586never block itself or use any form of event handling. 666never block itself or use any form of event handling.
587 667
588=cut 668=cut
589 669
670sub post_fork {
671 reset_signals;
672}
673
590sub fork_call(&@) { 674sub fork_call(&@) {
591 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
592 676
593 # we seemingly have to make a local copy of the whole thing, 677 # we seemingly have to make a local copy of the whole thing,
594 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
595 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
596 680
597 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
598 reset_signals; 682 cf::post_fork;
599 &$cb 683 &$cb
600 }, @args; 684 } @args;
601 685
602 wantarray ? @res : $res[-1] 686 wantarray ? @res : $res[-1]
603} 687}
604 688
605sub objinfo { 689sub objinfo {
… …
727 811
728 my @data; 812 my @data;
729 my $md5; 813 my $md5;
730 814
731 for (0 .. $#$src) { 815 for (0 .. $#$src) {
732 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
733 or Carp::croak "$src->[$_]: $!";
734 } 817 }
735 818
736 # if processing is expensive, check 819 # if processing is expensive, check
737 # checksum first 820 # checksum first
738 if (1) { 821 if (1) {
… …
1449 1532
1450 my $active = eval $v->{source}; 1533 my $active = eval $v->{source};
1451 1534
1452 if (length $@) { 1535 if (length $@) {
1453 error "$v->{path}: $@\n"; 1536 error "$v->{path}: $@\n";
1454 undef $@; # work around perl 5.10.0 utf-8 caching bug
1455 1537
1456 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1457 if exists $v->{meta}{mandatory}; 1539 if exists $v->{meta}{mandatory};
1458 1540
1459 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1473 1555
1474 while (my ($k, $v) = each %todo) { 1556 while (my ($k, $v) = each %todo) {
1475 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1476 if exists $v->{meta}{mandatory}; 1558 if exists $v->{meta}{mandatory};
1477 } 1559 }
1560
1561 last;
1478 } 1562 }
1479 } 1563 }
1480 }; 1564 };
1481} 1565}
1482 1566
… …
1640 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1641 1725
1642 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1643 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1727 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1644 1728
1645 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1646 $pl->deactivate; 1730 $pl->deactivate;
1731
1647 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1648 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1649 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1650 1737
1651 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1652 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1653 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
… …
1819sub generate_random_map { 1906sub generate_random_map {
1820 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1821 1908
1822 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1823 1910
1824 # mit "rum" bekleckern, nicht
1825 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1826 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1827 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1828 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1829 $rmp->{exit_on_final_map},
1830 $rmp->{xsize}, $rmp->{ysize},
1831 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1832 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1833 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1834 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1835 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1836 (cf::region::find $rmp->{region}), $rmp->{custom}
1837 )
1838} 1912}
1839 1913
1840=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1841 1915
1842Register a handler for the map path matching the given regex at the 1916Register a handler for the map path matching the given regex at the
… …
1868} 1942}
1869 1943
1870sub normalise { 1944sub normalise {
1871 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1872 1946
1873 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1874 1948
1875 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1876 1950
1877 # map plan: 1951 # map plan:
1878 # 1952 #
… …
1893 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1894 $path = "$base/$path"; 1968 $path = "$base/$path";
1895 } 1969 }
1896 1970
1897 for ($path) { 1971 for ($path) {
1898 redo if s{//}{/};
1899 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1900 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1901 } 1974 }
1902 1975
1903 $path 1976 $path
… …
1917 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1918 return $self; 1991 return $self;
1919 } 1992 }
1920 } 1993 }
1921 1994
1922 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1923 () 1996 ()
1924} 1997}
1925 1998
1999# may re-bless or do other evil things
1926sub init { 2000sub init {
1927 my ($self) = @_; 2001 my ($self) = @_;
1928 2002
1929 $self 2003 $self
1930} 2004}
… …
2049} 2123}
2050 2124
2051sub find; 2125sub find;
2052sub find { 2126sub find {
2053 my ($path, $origin) = @_; 2127 my ($path, $origin) = @_;
2128
2129 cf::cede_to_tick;
2054 2130
2055 $path = normalise $path, $origin && $origin->path; 2131 $path = normalise $path, $origin && $origin->path;
2056 2132
2057 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2133 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2058 my $guard2 = cf::lock_acquire "map_find:$path"; 2134 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2100 $self->alloc; 2176 $self->alloc;
2101 2177
2102 $self->pre_load; 2178 $self->pre_load;
2103 cf::cede_to_tick; 2179 cf::cede_to_tick;
2104 2180
2181 if (exists $self->{load_path}) {
2105 my $f = new_from_file cf::object::thawer $self->{load_path}; 2182 my $f = new_from_file cf::object::thawer $self->{load_path};
2106 $f->skip_block; 2183 $f->skip_block;
2107 $self->_load_objects ($f) 2184 $self->_load_objects ($f)
2108 or return; 2185 or return;
2109 2186
2110 $self->post_load_original 2187 $self->post_load_original
2111 if delete $self->{load_original}; 2188 if delete $self->{load_original};
2112 2189
2113 if (my $uniq = $self->uniq_path) { 2190 if (my $uniq = $self->uniq_path) {
2114 utf8::encode $uniq; 2191 utf8::encode $uniq;
2115 unless (aio_stat $uniq) { 2192 unless (aio_stat $uniq) {
2116 if (my $f = new_from_file cf::object::thawer $uniq) { 2193 if (my $f = new_from_file cf::object::thawer $uniq) {
2117 $self->clear_unique_items; 2194 $self->clear_unique_items;
2118 $self->_load_objects ($f); 2195 $self->_load_objects ($f);
2119 $f->resolve_delayed_derefs; 2196 $f->resolve_delayed_derefs;
2197 }
2120 } 2198 }
2121 } 2199 }
2122 }
2123 2200
2124 $f->resolve_delayed_derefs; 2201 $f->resolve_delayed_derefs;
2202 }
2125 2203
2126 cf::cede_to_tick; 2204 cf::cede_to_tick;
2127 # now do the right thing for maps 2205 # now do the right thing for maps
2128 $self->link_multipart_objects; 2206 $self->link_multipart_objects;
2129 $self->difficulty ($self->estimate_difficulty) 2207 $self->difficulty ($self->estimate_difficulty)
… …
2143 2221
2144 $self->in_memory (cf::MAP_ACTIVE); 2222 $self->in_memory (cf::MAP_ACTIVE);
2145 } 2223 }
2146 2224
2147 $self->post_load; 2225 $self->post_load;
2226
2227 1
2148} 2228}
2149 2229
2150# customize the map for a given player, i.e. 2230# customize the map for a given player, i.e.
2151# return the _real_ map. used by e.g. per-player 2231# return the _real_ map. used by e.g. per-player
2152# maps to change the path to ~playername/mappath 2232# maps to change the path to ~playername/mappath
… …
3367 3447
3368 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3448 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3369 3449
3370 trace "loading facedata from $path\n"; 3450 trace "loading facedata from $path\n";
3371 3451
3372 my $facedata; 3452 my $facedata = decode_storable load_file $path;
3373 0 < aio_load $path, $facedata
3374 or die "$path: $!";
3375
3376 $facedata = Coro::Storable::thaw $facedata;
3377 3453
3378 $facedata->{version} == 2 3454 $facedata->{version} == 2
3379 or cf::cleanup "$path: version mismatch, cannot proceed."; 3455 or cf::cleanup "$path: version mismatch, cannot proceed.";
3380 3456
3381 # patch in the exptable 3457 # patch in the exptable
… …
3395 3471
3396 cf::face::set_visibility $idx, $info->{visibility}; 3472 cf::face::set_visibility $idx, $info->{visibility};
3397 cf::face::set_magicmap $idx, $info->{magicmap}; 3473 cf::face::set_magicmap $idx, $info->{magicmap};
3398 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3474 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3399 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3475 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3476 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3400 3477
3401 cf::cede_to_tick; 3478 cf::cede_to_tick;
3402 } 3479 }
3403 3480
3404 while (my ($face, $info) = each %$faces) { 3481 while (my ($face, $info) = each %$faces) {
… …
3499} 3576}
3500 3577
3501sub reload_sound { 3578sub reload_sound {
3502 trace "loading sound config from $DATADIR/sound\n"; 3579 trace "loading sound config from $DATADIR/sound\n";
3503 3580
3504 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3505 or die "$DATADIR/sound $!";
3506
3507 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3581 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3508 3582
3509 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3583 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3510 my $sound = $soundconf->{compat}[$_] 3584 my $sound = $soundconf->{compat}[$_]
3511 or next; 3585 or next;
3512 3586
… …
3522} 3596}
3523 3597
3524sub reload_resources { 3598sub reload_resources {
3525 trace "reloading resource files...\n"; 3599 trace "reloading resource files...\n";
3526 3600
3601 reload_exp_table;
3602 reload_materials;
3527 reload_facedata; 3603 reload_facedata;
3528 reload_sound; 3604 reload_sound;
3529 reload_archetypes; 3605 reload_archetypes;
3530 reload_regions; 3606 reload_regions;
3531 reload_treasures; 3607 reload_treasures;
… …
3534} 3610}
3535 3611
3536sub reload_config { 3612sub reload_config {
3537 trace "reloading config file...\n"; 3613 trace "reloading config file...\n";
3538 3614
3539 open my $fh, "<:utf8", "$CONFDIR/config" 3615 my $config = load_file "$CONFDIR/config";
3540 or return; 3616 utf8::decode $config;
3541 3617 *CFG = decode_yaml $config;
3542 local $/;
3543 *CFG = YAML::XS::Load scalar <$fh>;
3544 3618
3545 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3619 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3546 3620
3547 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3621 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3548 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3622 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3552 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3626 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3553 and die "WARNING: m(un)lockall failed: $!\n"; 3627 and die "WARNING: m(un)lockall failed: $!\n";
3554 }; 3628 };
3555 warn $@ if $@; 3629 warn $@ if $@;
3556 } 3630 }
3557
3558 trace "finished reloading resource files\n";
3559} 3631}
3560 3632
3561sub pidfile() { 3633sub pidfile() {
3562 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3634 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3563 or die "$PIDFILE: $!"; 3635 or die "$PIDFILE: $!";
… …
3588 3660
3589sub main { 3661sub main {
3590 cf::init_globals; # initialise logging 3662 cf::init_globals; # initialise logging
3591 3663
3592 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3664 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3593 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3665 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3594 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3666 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3595 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3667 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3596 3668
3597 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3669 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3598 3670
… …
3606 }; 3678 };
3607 3679
3608 evthread_start IO::AIO::poll_fileno; 3680 evthread_start IO::AIO::poll_fileno;
3609 3681
3610 cf::sync_job { 3682 cf::sync_job {
3611 cf::init_experience; 3683 cf::incloader::init ();
3684
3612 cf::init_anim; 3685 cf::init_anim;
3613 cf::init_attackmess; 3686 cf::init_attackmess;
3614 cf::init_dynamic; 3687 cf::init_dynamic;
3615 3688
3616 cf::load_settings; 3689 cf::load_settings;
3617 cf::load_materials;
3618 3690
3619 reload_resources; 3691 reload_resources;
3620 reload_config; 3692 reload_config;
3621 db_init; 3693 db_init;
3622 3694
… …
3634 3706
3635 # no (long-running) fork's whatsoever before this point(!) 3707 # no (long-running) fork's whatsoever before this point(!)
3636 use POSIX (); 3708 use POSIX ();
3637 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3709 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3638 3710
3639 (pop @POST_INIT)->(0) while @POST_INIT; 3711 cf::_post_init 0;
3640 }; 3712 };
3641 3713
3642 cf::object::thawer::errors_are_fatal 0; 3714 cf::object::thawer::errors_are_fatal 0;
3643 info "parse errors in files are no longer fatal from this point on.\n"; 3715 info "parse errors in files are no longer fatal from this point on.\n";
3644 3716
3717 my $free_main; $free_main = EV::idle sub {
3718 undef $free_main;
3719 undef &main; # free gobs of memory :)
3720 };
3721
3645 main_loop; 3722 goto &main_loop;
3646} 3723}
3647 3724
3648############################################################################# 3725#############################################################################
3649# initialisation and cleanup 3726# initialisation and cleanup
3650 3727
… …
3851 } 3928 }
3852} 3929}
3853 3930
3854sub do_reload_perl() { 3931sub do_reload_perl() {
3855 # can/must only be called in main 3932 # can/must only be called in main
3856 if (in_main) { 3933 unless (in_main) {
3857 error "can only reload from main coroutine"; 3934 error "can only reload from main coroutine";
3858 return; 3935 return;
3859 } 3936 }
3860 3937
3861 return if $RELOAD++; 3938 return if $RELOAD++;
3862 3939
3863 my $t1 = AE::time; 3940 my $t1 = AE::time;
3864 3941
3865 while ($RELOAD) { 3942 while ($RELOAD) {
3943 cf::get_slot 0.1, -1, "reload_perl";
3866 info "reloading..."; 3944 info "perl_reload: reloading...";
3867 3945
3868 trace "entering sync_job"; 3946 trace "perl_reload: entering sync_job";
3869 3947
3870 cf::sync_job { 3948 cf::sync_job {
3871 cf::emergency_save; 3949 #cf::emergency_save;
3872 3950
3873 trace "cancelling all extension coros"; 3951 trace "perl_reload: cancelling all extension coros";
3874 $_->cancel for values %EXT_CORO; 3952 $_->cancel for values %EXT_CORO;
3875 %EXT_CORO = (); 3953 %EXT_CORO = ();
3876 3954
3877 trace "removing commands"; 3955 trace "perl_reload: removing commands";
3878 %COMMAND = (); 3956 %COMMAND = ();
3879 3957
3880 trace "removing ext/exti commands"; 3958 trace "perl_reload: removing ext/exti commands";
3881 %EXTCMD = (); 3959 %EXTCMD = ();
3882 %EXTICMD = (); 3960 %EXTICMD = ();
3883 3961
3884 trace "unloading/nuking all extensions"; 3962 trace "perl_reload: unloading/nuking all extensions";
3885 for my $pkg (@EXTS) { 3963 for my $pkg (@EXTS) {
3886 trace "... unloading $pkg"; 3964 trace "... unloading $pkg";
3887 3965
3888 if (my $cb = $pkg->can ("unload")) { 3966 if (my $cb = $pkg->can ("unload")) {
3889 eval { 3967 eval {
… …
3894 3972
3895 trace "... clearing $pkg"; 3973 trace "... clearing $pkg";
3896 clear_package $pkg; 3974 clear_package $pkg;
3897 } 3975 }
3898 3976
3899 trace "unloading all perl modules loaded from $LIBDIR"; 3977 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3900 while (my ($k, $v) = each %INC) { 3978 while (my ($k, $v) = each %INC) {
3901 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3979 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3902 3980
3903 trace "... unloading $k"; 3981 trace "... unloading $k";
3904 delete $INC{$k}; 3982 delete $INC{$k};
… …
3911 } 3989 }
3912 3990
3913 clear_package $k; 3991 clear_package $k;
3914 } 3992 }
3915 3993
3916 trace "getting rid of safe::, as good as possible"; 3994 trace "perl_reload: getting rid of safe::, as good as possible";
3917 clear_package "safe::$_" 3995 clear_package "safe::$_"
3918 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3996 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3919 3997
3920 trace "unloading cf.pm \"a bit\""; 3998 trace "perl_reload: unloading cf.pm \"a bit\"";
3921 delete $INC{"cf.pm"}; 3999 delete $INC{"cf.pm"};
3922 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4000 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3923 4001
3924 # don't, removes xs symbols, too, 4002 # don't, removes xs symbols, too,
3925 # and global variables created in xs 4003 # and global variables created in xs
3926 #clear_package __PACKAGE__; 4004 #clear_package __PACKAGE__;
3927 4005
3928 info "unload completed, starting to reload now"; 4006 info "perl_reload: unload completed, starting to reload now";
3929 4007
3930 trace "reloading cf.pm"; 4008 trace "perl_reload: reloading cf.pm";
3931 require cf; 4009 require cf;
3932 cf::_connect_to_perl_1; 4010 cf::_connect_to_perl_1;
3933 4011
3934 trace "loading config and database again"; 4012 trace "perl_reload: loading config and database again";
3935 cf::reload_config; 4013 cf::reload_config;
3936 4014
3937 trace "loading extensions"; 4015 trace "perl_reload: loading extensions";
3938 cf::load_extensions; 4016 cf::load_extensions;
3939 4017
3940 if ($REATTACH_ON_RELOAD) { 4018 if ($REATTACH_ON_RELOAD) {
3941 trace "reattaching attachments to objects/players"; 4019 trace "perl_reload: reattaching attachments to objects/players";
3942 _global_reattach; # objects, sockets 4020 _global_reattach; # objects, sockets
3943 trace "reattaching attachments to maps"; 4021 trace "perl_reload: reattaching attachments to maps";
3944 reattach $_ for values %MAP; 4022 reattach $_ for values %MAP;
3945 trace "reattaching attachments to players"; 4023 trace "perl_reload: reattaching attachments to players";
3946 reattach $_ for values %PLAYER; 4024 reattach $_ for values %PLAYER;
3947 } 4025 }
3948 4026
3949 trace "running post_init jobs"; 4027 cf::_post_init 1;
3950 (pop @POST_INIT)->(1) while @POST_INIT;
3951 4028
3952 trace "leaving sync_job"; 4029 trace "perl_reload: leaving sync_job";
3953 4030
3954 1 4031 1
3955 } or do { 4032 } or do {
3956 error $@; 4033 error $@;
3957 cf::cleanup "error while reloading, exiting."; 4034 cf::cleanup "perl_reload: error, exiting.";
3958 }; 4035 };
3959 4036
3960 info "reloaded";
3961 --$RELOAD; 4037 --$RELOAD;
3962 } 4038 }
3963 4039
3964 $t1 = AE::time - $t1; 4040 $t1 = AE::time - $t1;
3965 info "reload completed in ${t1}s\n"; 4041 info "perl_reload: completed in ${t1}s\n";
3966}; 4042};
3967 4043
3968our $RELOAD_WATCHER; # used only during reload 4044our $RELOAD_WATCHER; # used only during reload
3969 4045
3970sub reload_perl() { 4046sub reload_perl() {
… …
3991 reload_perl; 4067 reload_perl;
3992 }; 4068 };
3993 } 4069 }
3994}; 4070};
3995 4071
3996unshift @INC, $LIBDIR; 4072#############################################################################
3997 4073
3998my $bug_warning = 0; 4074my $bug_warning = 0;
3999 4075
4000our @WAIT_FOR_TICK; 4076our @WAIT_FOR_TICK;
4001our @WAIT_FOR_TICK_BEGIN; 4077our @WAIT_FOR_TICK_BEGIN;
4002 4078
4003sub wait_for_tick { 4079sub wait_for_tick() {
4004 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4080 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
4005 4081
4006 my $signal = new Coro::Signal; 4082 my $signal = new Coro::Signal;
4007 push @WAIT_FOR_TICK, $signal; 4083 push @WAIT_FOR_TICK, $signal;
4008 $signal->wait; 4084 $signal->wait;
4009} 4085}
4010 4086
4011sub wait_for_tick_begin { 4087sub wait_for_tick_begin() {
4012 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4088 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
4013 4089
4014 my $signal = new Coro::Signal; 4090 my $signal = new Coro::Signal;
4015 push @WAIT_FOR_TICK_BEGIN, $signal; 4091 push @WAIT_FOR_TICK_BEGIN, $signal;
4016 $signal->wait; 4092 $signal->wait;
… …
4103 IO::AIO::min_parallel 8; 4179 IO::AIO::min_parallel 8;
4104 IO::AIO::max_poll_time $TICK * 0.1; 4180 IO::AIO::max_poll_time $TICK * 0.1;
4105 undef $AnyEvent::AIO::WATCHER; 4181 undef $AnyEvent::AIO::WATCHER;
4106} 4182}
4107 4183
4108my $_log_backtrace; 4184our $_log_backtrace;
4185our $_log_backtrace_last;
4109 4186
4110sub _log_backtrace { 4187sub _log_backtrace {
4111 my ($msg, @addr) = @_; 4188 my ($msg, @addr) = @_;
4112 4189
4113 $msg =~ s/\n//; 4190 $msg =~ s/\n$//;
4114 4191
4192 if ($_log_backtrace_last eq $msg) {
4193 LOG llevInfo, "[ABT] $msg\n";
4194 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4115 # limit the # of concurrent backtraces 4195 # limit the # of concurrent backtraces
4116 if ($_log_backtrace < 2) { 4196 } elsif ($_log_backtrace < 2) {
4197 $_log_backtrace_last = $msg;
4117 ++$_log_backtrace; 4198 ++$_log_backtrace;
4118 my $perl_bt = Carp::longmess $msg; 4199 my $perl_bt = Carp::longmess $msg;
4119 async { 4200 async {
4120 $Coro::current->{desc} = "abt $msg"; 4201 $Coro::current->{desc} = "abt $msg";
4121 4202
… …
4141 LOG llevInfo, "[ABT] $_\n" for @bt; 4222 LOG llevInfo, "[ABT] $_\n" for @bt;
4142 --$_log_backtrace; 4223 --$_log_backtrace;
4143 }; 4224 };
4144 } else { 4225 } else {
4145 LOG llevInfo, "[ABT] $msg\n"; 4226 LOG llevInfo, "[ABT] $msg\n";
4146 LOG llevInfo, "[ABT] [suppressed]\n"; 4227 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4147 } 4228 }
4148} 4229}
4149 4230
4150# load additional modules 4231# load additional modules
4151require "cf/$_.pm" for @EXTRA_MODULES; 4232require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines