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.544 by root, Thu May 6 21:58:07 2010 UTC vs.
Revision 1.563 by root, Sat Apr 23 04:56:51 2011 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
… …
93our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS 94our @REFLECT; # set by XS
95our %REFLECT; # set by us 95our %REFLECT; # set by us
96 96
97our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
98our $DATADIR = datadir; 99our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
102our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
… …
233from wherever your confdir points to. 235from wherever your confdir points to.
234 236
235=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
236 238
237These 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
238returns 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
239per 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();
240 247
241=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
242 249
243This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
244C<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
… …
307} 314}
308 315
309$EV::DIED = sub { 316$EV::DIED = sub {
310 Carp::cluck "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
311}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
312 324
313############################################################################# 325#############################################################################
314 326
315=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
316 328
… …
337 $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;
338 $d 350 $d
339 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
340} 352}
341 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
342=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
343 369
344Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
345 371
346=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
… …
352our $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
353 379
354sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
355sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
356 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
357=item cf::post_init { BLOCK } 414=item cf::post_init { BLOCK }
358 415
359Execute the given codeblock, I<after> all extensions have been (re-)loaded, 416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again. 417but I<before> the server starts ticking again.
361 418
362The cdoeblock will have a single boolean argument to indicate whether this 419The codeblock will have a single boolean argument to indicate whether this
363is a reload or not. 420is a reload or not.
364 421
365=cut 422=cut
366 423
367sub post_init(&) { 424sub post_init(&) {
368 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 }
369} 443}
370 444
371=item cf::lock_wait $string 445=item cf::lock_wait $string
372 446
373Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
… …
426 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
427} 501}
428 502
429=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
430 504
431Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
432This 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
433of 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.
434 512
435The 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
436used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
437 515
438Useful for short background jobs. 516Useful for short background jobs.
… …
578 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
579 657
580 $coro 658 $coro
581} 659}
582 660
583=item fork_call { }, $args 661=item fork_call { }, @args
584 662
585Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
586process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
587Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
588never block itself or use any form of event handling. 666never block itself or use any form of event handling.
589 667
590=cut 668=cut
591 669
670sub post_fork {
671 reset_signals;
672}
673
592sub fork_call(&@) { 674sub fork_call(&@) {
593 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
594 676
595 # 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,
596 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
597 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
598 680
599 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
600 reset_signals; 682 cf::post_fork;
601 &$cb 683 &$cb
602 }, @args; 684 } @args;
603 685
604 wantarray ? @res : $res[-1] 686 wantarray ? @res : $res[-1]
605} 687}
606 688
607sub objinfo { 689sub objinfo {
… …
729 811
730 my @data; 812 my @data;
731 my $md5; 813 my $md5;
732 814
733 for (0 .. $#$src) { 815 for (0 .. $#$src) {
734 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
735 or Carp::croak "$src->[$_]: $!";
736 } 817 }
737 818
738 # if processing is expensive, check 819 # if processing is expensive, check
739 # checksum first 820 # checksum first
740 if (1) { 821 if (1) {
… …
1474 1555
1475 while (my ($k, $v) = each %todo) { 1556 while (my ($k, $v) = each %todo) {
1476 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477 if exists $v->{meta}{mandatory}; 1558 if exists $v->{meta}{mandatory};
1478 } 1559 }
1560
1561 last;
1479 } 1562 }
1480 } 1563 }
1481 }; 1564 };
1482} 1565}
1483 1566
… …
1641 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1642 1725
1643 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1644 $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
1645 1728
1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1647 $pl->deactivate; 1730 $pl->deactivate;
1731
1648 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;
1649 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1650 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1651 1737
1652 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1653 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1654 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
… …
1820sub generate_random_map { 1906sub generate_random_map {
1821 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1822 1908
1823 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
1824 1910
1825 # mit "rum" bekleckern, nicht
1826 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1830 $rmp->{exit_on_final_map},
1831 $rmp->{xsize}, $rmp->{ysize},
1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1834 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1835 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1836 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1837 (cf::region::find $rmp->{region}), $rmp->{custom}
1838 )
1839} 1912}
1840 1913
1841=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1842 1915
1843Register 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
… …
1894 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1895 $path = "$base/$path"; 1968 $path = "$base/$path";
1896 } 1969 }
1897 1970
1898 for ($path) { 1971 for ($path) {
1899 redo if s{//}{/};
1900 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1901 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1902 } 1974 }
1903 1975
1904 $path 1976 $path
… …
1922 1994
1923 Carp::cluck "unable to resolve path '$path' (base '$base')"; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1924 () 1996 ()
1925} 1997}
1926 1998
1999# may re-bless or do other evil things
1927sub init { 2000sub init {
1928 my ($self) = @_; 2001 my ($self) = @_;
1929 2002
1930 $self 2003 $self
1931} 2004}
… …
2103 $self->alloc; 2176 $self->alloc;
2104 2177
2105 $self->pre_load; 2178 $self->pre_load;
2106 cf::cede_to_tick; 2179 cf::cede_to_tick;
2107 2180
2181 if (exists $self->{load_path}) {
2108 my $f = new_from_file cf::object::thawer $self->{load_path}; 2182 my $f = new_from_file cf::object::thawer $self->{load_path};
2109 $f->skip_block; 2183 $f->skip_block;
2110 $self->_load_objects ($f) 2184 $self->_load_objects ($f)
2111 or return; 2185 or return;
2112 2186
2113 $self->post_load_original 2187 $self->post_load_original
2114 if delete $self->{load_original}; 2188 if delete $self->{load_original};
2115 2189
2116 if (my $uniq = $self->uniq_path) { 2190 if (my $uniq = $self->uniq_path) {
2117 utf8::encode $uniq; 2191 utf8::encode $uniq;
2118 unless (aio_stat $uniq) { 2192 unless (aio_stat $uniq) {
2119 if (my $f = new_from_file cf::object::thawer $uniq) { 2193 if (my $f = new_from_file cf::object::thawer $uniq) {
2120 $self->clear_unique_items; 2194 $self->clear_unique_items;
2121 $self->_load_objects ($f); 2195 $self->_load_objects ($f);
2122 $f->resolve_delayed_derefs; 2196 $f->resolve_delayed_derefs;
2197 }
2123 } 2198 }
2124 } 2199 }
2125 }
2126 2200
2127 $f->resolve_delayed_derefs; 2201 $f->resolve_delayed_derefs;
2202 }
2128 2203
2129 cf::cede_to_tick; 2204 cf::cede_to_tick;
2130 # now do the right thing for maps 2205 # now do the right thing for maps
2131 $self->link_multipart_objects; 2206 $self->link_multipart_objects;
2132 $self->difficulty ($self->estimate_difficulty) 2207 $self->difficulty ($self->estimate_difficulty)
… …
2146 2221
2147 $self->in_memory (cf::MAP_ACTIVE); 2222 $self->in_memory (cf::MAP_ACTIVE);
2148 } 2223 }
2149 2224
2150 $self->post_load; 2225 $self->post_load;
2226
2227 1
2151} 2228}
2152 2229
2153# customize the map for a given player, i.e. 2230# customize the map for a given player, i.e.
2154# return the _real_ map. used by e.g. per-player 2231# return the _real_ map. used by e.g. per-player
2155# maps to change the path to ~playername/mappath 2232# maps to change the path to ~playername/mappath
… …
3370 3447
3371 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3448 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3372 3449
3373 trace "loading facedata from $path\n"; 3450 trace "loading facedata from $path\n";
3374 3451
3375 my $facedata; 3452 my $facedata = decode_storable load_file $path;
3376 0 < aio_load $path, $facedata
3377 or die "$path: $!";
3378
3379 $facedata = Coro::Storable::thaw $facedata;
3380 3453
3381 $facedata->{version} == 2 3454 $facedata->{version} == 2
3382 or cf::cleanup "$path: version mismatch, cannot proceed."; 3455 or cf::cleanup "$path: version mismatch, cannot proceed.";
3383 3456
3384 # patch in the exptable 3457 # patch in the exptable
… …
3398 3471
3399 cf::face::set_visibility $idx, $info->{visibility}; 3472 cf::face::set_visibility $idx, $info->{visibility};
3400 cf::face::set_magicmap $idx, $info->{magicmap}; 3473 cf::face::set_magicmap $idx, $info->{magicmap};
3401 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3474 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3402 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} ;
3403 3477
3404 cf::cede_to_tick; 3478 cf::cede_to_tick;
3405 } 3479 }
3406 3480
3407 while (my ($face, $info) = each %$faces) { 3481 while (my ($face, $info) = each %$faces) {
… …
3499sub reload_treasures { 3573sub reload_treasures {
3500 load_resource_file "$DATADIR/treasures" 3574 load_resource_file "$DATADIR/treasures"
3501 or die "unable to load treasurelists\n"; 3575 or die "unable to load treasurelists\n";
3502} 3576}
3503 3577
3504sub reload_exp {
3505 cf::init_experience;
3506}
3507
3508sub reload_sound { 3578sub reload_sound {
3509 trace "loading sound config from $DATADIR/sound\n"; 3579 trace "loading sound config from $DATADIR/sound\n";
3510 3580
3511 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3512 or die "$DATADIR/sound $!";
3513
3514 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3581 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3515 3582
3516 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3583 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3517 my $sound = $soundconf->{compat}[$_] 3584 my $sound = $soundconf->{compat}[$_]
3518 or next; 3585 or next;
3519 3586
… …
3529} 3596}
3530 3597
3531sub reload_resources { 3598sub reload_resources {
3532 trace "reloading resource files...\n"; 3599 trace "reloading resource files...\n";
3533 3600
3534 reload_exp; 3601 reload_exp_table;
3602 reload_materials;
3535 reload_facedata; 3603 reload_facedata;
3536 reload_sound; 3604 reload_sound;
3537 reload_archetypes; 3605 reload_archetypes;
3538 reload_regions; 3606 reload_regions;
3539 reload_treasures; 3607 reload_treasures;
… …
3542} 3610}
3543 3611
3544sub reload_config { 3612sub reload_config {
3545 trace "reloading config file...\n"; 3613 trace "reloading config file...\n";
3546 3614
3547 open my $fh, "<:utf8", "$CONFDIR/config" 3615 my $config = load_file "$CONFDIR/config";
3548 or return; 3616 utf8::decode $config;
3549 3617 *CFG = decode_yaml $config;
3550 local $/;
3551 *CFG = YAML::XS::Load scalar <$fh>;
3552 3618
3553 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3619 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3554 3620
3555 $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};
3556 $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};
… …
3560 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3626 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3561 and die "WARNING: m(un)lockall failed: $!\n"; 3627 and die "WARNING: m(un)lockall failed: $!\n";
3562 }; 3628 };
3563 warn $@ if $@; 3629 warn $@ if $@;
3564 } 3630 }
3565
3566 trace "finished reloading resource files\n";
3567} 3631}
3568 3632
3569sub pidfile() { 3633sub pidfile() {
3570 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3634 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3571 or die "$PIDFILE: $!"; 3635 or die "$PIDFILE: $!";
… …
3596 3660
3597sub main { 3661sub main {
3598 cf::init_globals; # initialise logging 3662 cf::init_globals; # initialise logging
3599 3663
3600 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3664 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3601 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3665 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3602 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3666 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3603 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3667 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3604 3668
3605 $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
3606 3670
… …
3621 cf::init_anim; 3685 cf::init_anim;
3622 cf::init_attackmess; 3686 cf::init_attackmess;
3623 cf::init_dynamic; 3687 cf::init_dynamic;
3624 3688
3625 cf::load_settings; 3689 cf::load_settings;
3626 cf::load_materials;
3627 3690
3628 reload_resources; 3691 reload_resources;
3629 reload_config; 3692 reload_config;
3630 db_init; 3693 db_init;
3631 3694
… …
3643 3706
3644 # no (long-running) fork's whatsoever before this point(!) 3707 # no (long-running) fork's whatsoever before this point(!)
3645 use POSIX (); 3708 use POSIX ();
3646 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};
3647 3710
3648 (pop @POST_INIT)->(0) while @POST_INIT; 3711 cf::_post_init 0;
3649 }; 3712 };
3650 3713
3651 cf::object::thawer::errors_are_fatal 0; 3714 cf::object::thawer::errors_are_fatal 0;
3652 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";
3653 3716
… …
3876 3939
3877 my $t1 = AE::time; 3940 my $t1 = AE::time;
3878 3941
3879 while ($RELOAD) { 3942 while ($RELOAD) {
3880 cf::get_slot 0.1, -1, "reload_perl"; 3943 cf::get_slot 0.1, -1, "reload_perl";
3881 info "reloading..."; 3944 info "perl_reload: reloading...";
3882 3945
3883 trace "entering sync_job"; 3946 trace "perl_reload: entering sync_job";
3884 3947
3885 cf::sync_job { 3948 cf::sync_job {
3886 #cf::emergency_save; 3949 #cf::emergency_save;
3887 3950
3888 trace "cancelling all extension coros"; 3951 trace "perl_reload: cancelling all extension coros";
3889 $_->cancel for values %EXT_CORO; 3952 $_->cancel for values %EXT_CORO;
3890 %EXT_CORO = (); 3953 %EXT_CORO = ();
3891 3954
3892 trace "removing commands"; 3955 trace "perl_reload: removing commands";
3893 %COMMAND = (); 3956 %COMMAND = ();
3894 3957
3895 trace "removing ext/exti commands"; 3958 trace "perl_reload: removing ext/exti commands";
3896 %EXTCMD = (); 3959 %EXTCMD = ();
3897 %EXTICMD = (); 3960 %EXTICMD = ();
3898 3961
3899 trace "unloading/nuking all extensions"; 3962 trace "perl_reload: unloading/nuking all extensions";
3900 for my $pkg (@EXTS) { 3963 for my $pkg (@EXTS) {
3901 trace "... unloading $pkg"; 3964 trace "... unloading $pkg";
3902 3965
3903 if (my $cb = $pkg->can ("unload")) { 3966 if (my $cb = $pkg->can ("unload")) {
3904 eval { 3967 eval {
… …
3909 3972
3910 trace "... clearing $pkg"; 3973 trace "... clearing $pkg";
3911 clear_package $pkg; 3974 clear_package $pkg;
3912 } 3975 }
3913 3976
3914 trace "unloading all perl modules loaded from $LIBDIR"; 3977 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3915 while (my ($k, $v) = each %INC) { 3978 while (my ($k, $v) = each %INC) {
3916 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3979 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3917 3980
3918 trace "... unloading $k"; 3981 trace "... unloading $k";
3919 delete $INC{$k}; 3982 delete $INC{$k};
… …
3926 } 3989 }
3927 3990
3928 clear_package $k; 3991 clear_package $k;
3929 } 3992 }
3930 3993
3931 trace "getting rid of safe::, as good as possible"; 3994 trace "perl_reload: getting rid of safe::, as good as possible";
3932 clear_package "safe::$_" 3995 clear_package "safe::$_"
3933 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);
3934 3997
3935 trace "unloading cf.pm \"a bit\""; 3998 trace "perl_reload: unloading cf.pm \"a bit\"";
3936 delete $INC{"cf.pm"}; 3999 delete $INC{"cf.pm"};
3937 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4000 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3938 4001
3939 # don't, removes xs symbols, too, 4002 # don't, removes xs symbols, too,
3940 # and global variables created in xs 4003 # and global variables created in xs
3941 #clear_package __PACKAGE__; 4004 #clear_package __PACKAGE__;
3942 4005
3943 info "unload completed, starting to reload now"; 4006 info "perl_reload: unload completed, starting to reload now";
3944 4007
3945 trace "reloading cf.pm"; 4008 trace "perl_reload: reloading cf.pm";
3946 require cf; 4009 require cf;
3947 cf::_connect_to_perl_1; 4010 cf::_connect_to_perl_1;
3948 4011
3949 trace "loading config and database again"; 4012 trace "perl_reload: loading config and database again";
3950 cf::reload_config; 4013 cf::reload_config;
3951 4014
3952 trace "loading extensions"; 4015 trace "perl_reload: loading extensions";
3953 cf::load_extensions; 4016 cf::load_extensions;
3954 4017
3955 if ($REATTACH_ON_RELOAD) { 4018 if ($REATTACH_ON_RELOAD) {
3956 trace "reattaching attachments to objects/players"; 4019 trace "perl_reload: reattaching attachments to objects/players";
3957 _global_reattach; # objects, sockets 4020 _global_reattach; # objects, sockets
3958 trace "reattaching attachments to maps"; 4021 trace "perl_reload: reattaching attachments to maps";
3959 reattach $_ for values %MAP; 4022 reattach $_ for values %MAP;
3960 trace "reattaching attachments to players"; 4023 trace "perl_reload: reattaching attachments to players";
3961 reattach $_ for values %PLAYER; 4024 reattach $_ for values %PLAYER;
3962 } 4025 }
3963 4026
3964 trace "running post_init jobs"; 4027 cf::_post_init 1;
3965 (pop @POST_INIT)->(1) while @POST_INIT;
3966 4028
3967 trace "leaving sync_job"; 4029 trace "perl_reload: leaving sync_job";
3968 4030
3969 1 4031 1
3970 } or do { 4032 } or do {
3971 error $@; 4033 error $@;
3972 cf::cleanup "error while reloading, exiting."; 4034 cf::cleanup "perl_reload: error, exiting.";
3973 }; 4035 };
3974 4036
3975 info "reloaded";
3976 --$RELOAD; 4037 --$RELOAD;
3977 } 4038 }
3978 4039
3979 $t1 = AE::time - $t1; 4040 $t1 = AE::time - $t1;
3980 info "reload completed in ${t1}s\n"; 4041 info "perl_reload: completed in ${t1}s\n";
3981}; 4042};
3982 4043
3983our $RELOAD_WATCHER; # used only during reload 4044our $RELOAD_WATCHER; # used only during reload
3984 4045
3985sub reload_perl() { 4046sub reload_perl() {
… …
4013my $bug_warning = 0; 4074my $bug_warning = 0;
4014 4075
4015our @WAIT_FOR_TICK; 4076our @WAIT_FOR_TICK;
4016our @WAIT_FOR_TICK_BEGIN; 4077our @WAIT_FOR_TICK_BEGIN;
4017 4078
4018sub wait_for_tick { 4079sub wait_for_tick() {
4019 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4080 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
4020 4081
4021 my $signal = new Coro::Signal; 4082 my $signal = new Coro::Signal;
4022 push @WAIT_FOR_TICK, $signal; 4083 push @WAIT_FOR_TICK, $signal;
4023 $signal->wait; 4084 $signal->wait;
4024} 4085}
4025 4086
4026sub wait_for_tick_begin { 4087sub wait_for_tick_begin() {
4027 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4088 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
4028 4089
4029 my $signal = new Coro::Signal; 4090 my $signal = new Coro::Signal;
4030 push @WAIT_FOR_TICK_BEGIN, $signal; 4091 push @WAIT_FOR_TICK_BEGIN, $signal;
4031 $signal->wait; 4092 $signal->wait;
… …
4118 IO::AIO::min_parallel 8; 4179 IO::AIO::min_parallel 8;
4119 IO::AIO::max_poll_time $TICK * 0.1; 4180 IO::AIO::max_poll_time $TICK * 0.1;
4120 undef $AnyEvent::AIO::WATCHER; 4181 undef $AnyEvent::AIO::WATCHER;
4121} 4182}
4122 4183
4123my $_log_backtrace; 4184our $_log_backtrace;
4185our $_log_backtrace_last;
4124 4186
4125sub _log_backtrace { 4187sub _log_backtrace {
4126 my ($msg, @addr) = @_; 4188 my ($msg, @addr) = @_;
4127 4189
4128 $msg =~ s/\n//; 4190 $msg =~ s/\n$//;
4129 4191
4192 if ($_log_backtrace_last eq $msg) {
4193 LOG llevInfo, "[ABT] $msg\n";
4194 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4130 # limit the # of concurrent backtraces 4195 # limit the # of concurrent backtraces
4131 if ($_log_backtrace < 2) { 4196 } elsif ($_log_backtrace < 2) {
4197 $_log_backtrace_last = $msg;
4132 ++$_log_backtrace; 4198 ++$_log_backtrace;
4133 my $perl_bt = Carp::longmess $msg; 4199 my $perl_bt = Carp::longmess $msg;
4134 async { 4200 async {
4135 $Coro::current->{desc} = "abt $msg"; 4201 $Coro::current->{desc} = "abt $msg";
4136 4202
… …
4156 LOG llevInfo, "[ABT] $_\n" for @bt; 4222 LOG llevInfo, "[ABT] $_\n" for @bt;
4157 --$_log_backtrace; 4223 --$_log_backtrace;
4158 }; 4224 };
4159 } else { 4225 } else {
4160 LOG llevInfo, "[ABT] $msg\n"; 4226 LOG llevInfo, "[ABT] $msg\n";
4161 LOG llevInfo, "[ABT] [suppressed]\n"; 4227 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4162 } 4228 }
4163} 4229}
4164 4230
4165# load additional modules 4231# load additional modules
4166require "cf/$_.pm" for @EXTRA_MODULES; 4232require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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