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.532 by root, Thu Apr 29 07:32:34 2010 UTC vs.
Revision 1.567 by root, Mon May 2 16:16:00 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.
… …
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
… …
78# strictly for debugging 76# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 78
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 80
81our @ORIG_INC;
82
83our %COMMAND = (); 83our %COMMAND = ();
84our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
85 85
86our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 87our %EXTCMD = ();
… …
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";
… …
124our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
126our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
127our $DB_ENV; 129our $DB_ENV;
128 130
129our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 132
131our %CFG; 133our %CFG;
132 134
133our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 136our $RUNTIME;
… …
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.
… …
518=cut 596=cut
519 597
520sub sync_job(&) { 598sub sync_job(&) {
521 my ($job) = @_; 599 my ($job) = @_;
522 600
523 if ($Coro::current == $Coro::main) { 601 if (in_main) {
524 my $time = AE::time; 602 my $time = AE::time;
525 603
526 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
527 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
528 606
529 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
530 608
531 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
532 610
533 my $busy = 1; 611 my $busy = 1;
534 my @res; 612 my @res;
… …
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 {
… …
657within each server. 739within each server.
658 740
659=cut 741=cut
660 742
661sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
662 my ($name) = @_; 747 my ($name) = @_;
663 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
664 749
665 eval { 750 eval {
666 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
… …
676} 761}
677 762
678our $DB; 763our $DB;
679 764
680sub db_init { 765sub db_init {
681 cf::sync_job {
682 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
683 };
684} 767}
685 768
686sub db_get($$) { 769sub db_get($$) {
687 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
688 771
689 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
690 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
691 776
692 $! ? () 777 $! ? ()
693 : $data 778 : $data
694 }
695} 779}
696 780
697sub db_put($$$) { 781sub db_put($$$) {
698 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
699 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
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) {
… …
1421 1504
1422 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1423 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1424 1507
1425 $ext{source} = 1508 $ext{source} =
1426 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1427 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1428 . $source 1511 . $source
1429 . "\n};\n1"; 1512 . "\n};\n1";
1430 1513
1431 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
… …
1472 1555
1473 while (my ($k, $v) = each %todo) { 1556 while (my ($k, $v) = each %todo) {
1474 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1475 if exists $v->{meta}{mandatory}; 1558 if exists $v->{meta}{mandatory};
1476 } 1559 }
1560
1561 last;
1477 } 1562 }
1478 } 1563 }
1479 }; 1564 };
1480} 1565}
1481 1566
… …
1639 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1640 1725
1641 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1642 $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
1643 1728
1644 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1645 $pl->deactivate; 1730 $pl->deactivate;
1731
1646 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;
1647 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1648 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1649 1737
1650 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1651 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1652 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
… …
1818sub generate_random_map { 1906sub generate_random_map {
1819 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1820 1908
1821 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
1822 1910
1823 # mit "rum" bekleckern, nicht
1824 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1825 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1826 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1827 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1828 $rmp->{exit_on_final_map},
1829 $rmp->{xsize}, $rmp->{ysize},
1830 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1831 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1832 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1833 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1834 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1835 (cf::region::find $rmp->{region}), $rmp->{custom}
1836 )
1837} 1912}
1838 1913
1839=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1840 1915
1841Register 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
… …
1846 1921
1847sub register { 1922sub register {
1848 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1849 my $pkg = caller; 1924 my $pkg = caller;
1850 1925
1851 no strict;
1852 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1853 1927
1854 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1855} 1929}
1856 1930
… …
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}
… …
1995 $self->{load_path} = $path; 2069 $self->{load_path} = $path;
1996 2070
1997 1 2071 1
1998} 2072}
1999 2073
2074# used to laod the header of an original map
2000sub load_header_orig { 2075sub load_header_orig {
2001 my ($self) = @_; 2076 my ($self) = @_;
2002 2077
2003 $self->load_header_from ($self->load_path) 2078 $self->load_header_from ($self->load_path)
2004} 2079}
2005 2080
2081# used to laod the header of an instantiated map
2006sub load_header_temp { 2082sub load_header_temp {
2007 my ($self) = @_; 2083 my ($self) = @_;
2008 2084
2009 $self->load_header_from ($self->save_path) 2085 $self->load_header_from ($self->save_path)
2010} 2086}
2011 2087
2088# called after loading the header from an instantiated map
2012sub prepare_temp { 2089sub prepare_temp {
2013 my ($self) = @_; 2090 my ($self) = @_;
2014 2091
2015 $self->last_access ((delete $self->{last_access}) 2092 $self->last_access ((delete $self->{last_access})
2016 || $cf::RUNTIME); #d# 2093 || $cf::RUNTIME); #d#
2017 # safety 2094 # safety
2018 $self->{instantiate_time} = $cf::RUNTIME 2095 $self->{instantiate_time} = $cf::RUNTIME
2019 if $self->{instantiate_time} > $cf::RUNTIME; 2096 if $self->{instantiate_time} > $cf::RUNTIME;
2020} 2097}
2021 2098
2099# called after loading the header from an original map
2022sub prepare_orig { 2100sub prepare_orig {
2023 my ($self) = @_; 2101 my ($self) = @_;
2024 2102
2025 $self->{load_original} = 1; 2103 $self->{load_original} = 1;
2026 $self->{instantiate_time} = $cf::RUNTIME; 2104 $self->{instantiate_time} = $cf::RUNTIME;
… …
2050 2128
2051sub find; 2129sub find;
2052sub find { 2130sub find {
2053 my ($path, $origin) = @_; 2131 my ($path, $origin) = @_;
2054 2132
2133 cf::cede_to_tick;
2134
2055 $path = normalise $path, $origin && $origin->path; 2135 $path = normalise $path, $origin;
2056 2136
2057 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2137 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2058 my $guard2 = cf::lock_acquire "map_find:$path"; 2138 my $guard2 = cf::lock_acquire "map_find:$path";
2059 2139
2060 $cf::MAP{$path} || do { 2140 $cf::MAP{$path} || do {
… …
2100 $self->alloc; 2180 $self->alloc;
2101 2181
2102 $self->pre_load; 2182 $self->pre_load;
2103 cf::cede_to_tick; 2183 cf::cede_to_tick;
2104 2184
2185 if (exists $self->{load_path}) {
2105 my $f = new_from_file cf::object::thawer $self->{load_path}; 2186 my $f = new_from_file cf::object::thawer $self->{load_path};
2106 $f->skip_block; 2187 $f->skip_block;
2107 $self->_load_objects ($f) 2188 $self->_load_objects ($f)
2108 or return; 2189 or return;
2109 2190
2110 $self->post_load_original 2191 $self->post_load_original
2111 if delete $self->{load_original}; 2192 if delete $self->{load_original};
2112 2193
2113 if (my $uniq = $self->uniq_path) { 2194 if (my $uniq = $self->uniq_path) {
2114 utf8::encode $uniq; 2195 utf8::encode $uniq;
2115 unless (aio_stat $uniq) { 2196 unless (aio_stat $uniq) {
2116 if (my $f = new_from_file cf::object::thawer $uniq) { 2197 if (my $f = new_from_file cf::object::thawer $uniq) {
2117 $self->clear_unique_items; 2198 $self->clear_unique_items;
2118 $self->_load_objects ($f); 2199 $self->_load_objects ($f);
2119 $f->resolve_delayed_derefs; 2200 $f->resolve_delayed_derefs;
2201 }
2120 } 2202 }
2121 } 2203 }
2122 }
2123 2204
2124 $f->resolve_delayed_derefs; 2205 $f->resolve_delayed_derefs;
2206 } else {
2207 $self->post_load_original
2208 if delete $self->{load_original};
2209 }
2125 2210
2126 cf::cede_to_tick; 2211 cf::cede_to_tick;
2127 # now do the right thing for maps 2212 # now do the right thing for maps
2128 $self->link_multipart_objects; 2213 $self->link_multipart_objects;
2129 $self->difficulty ($self->estimate_difficulty) 2214 $self->difficulty ($self->estimate_difficulty)
… …
2143 2228
2144 $self->in_memory (cf::MAP_ACTIVE); 2229 $self->in_memory (cf::MAP_ACTIVE);
2145 } 2230 }
2146 2231
2147 $self->post_load; 2232 $self->post_load;
2233
2234 1
2148} 2235}
2149 2236
2150# customize the map for a given player, i.e. 2237# customize the map for a given player, i.e.
2151# return the _real_ map. used by e.g. per-player 2238# return the _real_ map. used by e.g. per-player
2152# maps to change the path to ~playername/mappath 2239# maps to change the path to ~playername/mappath
… …
2190} 2277}
2191 2278
2192sub find_sync { 2279sub find_sync {
2193 my ($path, $origin) = @_; 2280 my ($path, $origin) = @_;
2194 2281
2195 cf::sync_job { find $path, $origin } 2282 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2283 if $Coro::current == $Coro::main;
2284
2285 find $path, $origin
2196} 2286}
2197 2287
2198sub do_load_sync { 2288sub do_load_sync {
2199 my ($map) = @_; 2289 my ($map) = @_;
2200 2290
2201 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2291 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2202 if $Coro::current == $Coro::main; 2292 if $Coro::current == $Coro::main;
2203 2293
2204 cf::sync_job { $map->load }; 2294 $map->load;
2205} 2295}
2206 2296
2207our %MAP_PREFETCH; 2297our %MAP_PREFETCH;
2208our $MAP_PREFETCHER = undef; 2298our $MAP_PREFETCHER = undef;
2209 2299
2210sub find_async { 2300sub find_async {
2211 my ($path, $origin, $load) = @_; 2301 my ($path, $origin, $load) = @_;
2212 2302
2213 $path = normalise $path, $origin && $origin->{path}; 2303 $path = normalise $path, $origin;
2214 2304
2215 if (my $map = $cf::MAP{$path}) { 2305 if (my $map = $cf::MAP{$path}) {
2216 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2306 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2217 } 2307 }
2218 2308
… …
2729 ($path, $x, $y) = (undef, undef, undef); 2819 ($path, $x, $y) = (undef, undef, undef);
2730 } 2820 }
2731 } 2821 }
2732 2822
2733 my $map = eval { 2823 my $map = eval {
2734 my $map = defined $path ? cf::map::find $path : undef; 2824 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2735 2825
2736 if ($map) { 2826 if ($map) {
2737 $map = $map->customise_for ($self); 2827 $map = $map->customise_for ($self);
2738 $map = $check->($map, $x, $y, $self) if $check && $map; 2828 $map = $check->($map, $x, $y, $self) if $check && $map;
2739 } else { 2829 } else {
… …
2829 $Coro::current->{desc} = "enter_exit"; 2919 $Coro::current->{desc} = "enter_exit";
2830 2920
2831 unless (eval { 2921 unless (eval {
2832 $self->deactivate_recursive; # just to be sure 2922 $self->deactivate_recursive; # just to be sure
2833 2923
2834 # random map handling
2835 {
2836 my $guard = cf::lock_acquire "exit_prepare:$exit";
2837
2838 prepare_random_map $exit
2839 if $exit->slaying eq "/!";
2840 }
2841
2842 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2924 my $map = cf::map::normalise $exit->slaying, $exit->map;
2843 my $x = $exit->stats->hp; 2925 my $x = $exit->stats->hp;
2844 my $y = $exit->stats->sp; 2926 my $y = $exit->stats->sp;
2927
2928 # special map handling
2929 my $slaying = $exit->slaying;
2930
2931 # special map handling
2932 if ($slaying eq "/!") {
2933 my $guard = cf::lock_acquire "exit_prepare:$exit";
2934
2935 prepare_random_map $exit
2936 if $slaying eq "/!"; # need to re-check after getting the lock
2937
2938 } elsif ($slaying eq '!up') {
2939 $map = $exit->map->tile_path (cf::TILE_UP);
2940 $x = $exit->x;
2941 $y = $exit->y;
2942
2943 } elsif ($slaying eq '!down') {
2944 $map = $exit->map->tile_path (cf::TILE_DOWN);
2945 $x = $exit->x;
2946 $y = $exit->y;
2947 }
2845 2948
2846 $self->goto ($map, $x, $y); 2949 $self->goto ($map, $x, $y);
2847 2950
2848 # if exit is damned, update players death & WoR home-position 2951 # if exit is damned, update players death & WoR home-position
2849 $self->contr->savebed ($map, $x, $y) 2952 $self->contr->savebed ($map, $x, $y)
… …
3268 decrease split destroy change_exp value msg lore send_msg)], 3371 decrease split destroy change_exp value msg lore send_msg)],
3269 ["cf::object::player" => qw(player)], 3372 ["cf::object::player" => qw(player)],
3270 ["cf::player" => qw(peaceful send_msg)], 3373 ["cf::player" => qw(peaceful send_msg)],
3271 ["cf::map" => qw(trigger)], 3374 ["cf::map" => qw(trigger)],
3272) { 3375) {
3273 no strict 'refs';
3274 my ($pkg, @funs) = @$_; 3376 my ($pkg, @funs) = @$_;
3275 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3377 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3276 for @funs; 3378 for @funs;
3277} 3379}
3278 3380
… …
3365 3467
3366 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3468 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3367 3469
3368 trace "loading facedata from $path\n"; 3470 trace "loading facedata from $path\n";
3369 3471
3370 my $facedata; 3472 my $facedata = decode_storable load_file $path;
3371 0 < aio_load $path, $facedata
3372 or die "$path: $!";
3373
3374 $facedata = Coro::Storable::thaw $facedata;
3375 3473
3376 $facedata->{version} == 2 3474 $facedata->{version} == 2
3377 or cf::cleanup "$path: version mismatch, cannot proceed."; 3475 or cf::cleanup "$path: version mismatch, cannot proceed.";
3378 3476
3379 # patch in the exptable 3477 # patch in the exptable
… …
3393 3491
3394 cf::face::set_visibility $idx, $info->{visibility}; 3492 cf::face::set_visibility $idx, $info->{visibility};
3395 cf::face::set_magicmap $idx, $info->{magicmap}; 3493 cf::face::set_magicmap $idx, $info->{magicmap};
3396 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3494 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3397 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3495 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3496 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3398 3497
3399 cf::cede_to_tick; 3498 cf::cede_to_tick;
3400 } 3499 }
3401 3500
3402 while (my ($face, $info) = each %$faces) { 3501 while (my ($face, $info) = each %$faces) {
… …
3497} 3596}
3498 3597
3499sub reload_sound { 3598sub reload_sound {
3500 trace "loading sound config from $DATADIR/sound\n"; 3599 trace "loading sound config from $DATADIR/sound\n";
3501 3600
3502 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3503 or die "$DATADIR/sound $!";
3504
3505 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3601 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3506 3602
3507 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3603 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3508 my $sound = $soundconf->{compat}[$_] 3604 my $sound = $soundconf->{compat}[$_]
3509 or next; 3605 or next;
3510 3606
… …
3520} 3616}
3521 3617
3522sub reload_resources { 3618sub reload_resources {
3523 trace "reloading resource files...\n"; 3619 trace "reloading resource files...\n";
3524 3620
3621 reload_exp_table;
3622 reload_materials;
3525 reload_facedata; 3623 reload_facedata;
3526 reload_sound; 3624 reload_sound;
3527 reload_archetypes; 3625 reload_archetypes;
3528 reload_regions; 3626 reload_regions;
3529 reload_treasures; 3627 reload_treasures;
… …
3532} 3630}
3533 3631
3534sub reload_config { 3632sub reload_config {
3535 trace "reloading config file...\n"; 3633 trace "reloading config file...\n";
3536 3634
3537 open my $fh, "<:utf8", "$CONFDIR/config" 3635 my $config = load_file "$CONFDIR/config";
3538 or return; 3636 utf8::decode $config;
3539 3637 *CFG = decode_yaml $config;
3540 local $/;
3541 *CFG = YAML::XS::Load scalar <$fh>;
3542 3638
3543 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3639 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3544 3640
3545 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3641 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3546 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3642 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3550 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3646 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3551 and die "WARNING: m(un)lockall failed: $!\n"; 3647 and die "WARNING: m(un)lockall failed: $!\n";
3552 }; 3648 };
3553 warn $@ if $@; 3649 warn $@ if $@;
3554 } 3650 }
3555
3556 trace "finished reloading resource files\n";
3557} 3651}
3558 3652
3559sub pidfile() { 3653sub pidfile() {
3560 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3654 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3561 or die "$PIDFILE: $!"; 3655 or die "$PIDFILE: $!";
… …
3586 3680
3587sub main { 3681sub main {
3588 cf::init_globals; # initialise logging 3682 cf::init_globals; # initialise logging
3589 3683
3590 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3684 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3591 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3685 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3592 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3686 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3593 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3687 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3594 3688
3595 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3689 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3596 3690
… …
3604 }; 3698 };
3605 3699
3606 evthread_start IO::AIO::poll_fileno; 3700 evthread_start IO::AIO::poll_fileno;
3607 3701
3608 cf::sync_job { 3702 cf::sync_job {
3609 cf::init_experience; 3703 cf::incloader::init ();
3704
3610 cf::init_anim; 3705 cf::init_anim;
3611 cf::init_attackmess; 3706 cf::init_attackmess;
3612 cf::init_dynamic; 3707 cf::init_dynamic;
3613 3708
3614 cf::load_settings; 3709 cf::load_settings;
3615 cf::load_materials;
3616 3710
3617 reload_resources; 3711 reload_resources;
3618 reload_config; 3712 reload_config;
3619 db_init; 3713 db_init;
3620 3714
… …
3632 3726
3633 # no (long-running) fork's whatsoever before this point(!) 3727 # no (long-running) fork's whatsoever before this point(!)
3634 use POSIX (); 3728 use POSIX ();
3635 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3729 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3636 3730
3637 (pop @POST_INIT)->(0) while @POST_INIT; 3731 cf::_post_init 0;
3638 }; 3732 };
3639 3733
3640 cf::object::thawer::errors_are_fatal 0; 3734 cf::object::thawer::errors_are_fatal 0;
3641 info "parse errors in files are no longer fatal from this point on.\n"; 3735 info "parse errors in files are no longer fatal from this point on.\n";
3642 3736
3737 my $free_main; $free_main = EV::idle sub {
3738 undef $free_main;
3739 undef &main; # free gobs of memory :)
3740 };
3741
3643 main_loop; 3742 goto &main_loop;
3644} 3743}
3645 3744
3646############################################################################# 3745#############################################################################
3647# initialisation and cleanup 3746# initialisation and cleanup
3648 3747
… …
3747sub emergency_save() { 3846sub emergency_save() {
3748 my $freeze_guard = cf::freeze_mainloop; 3847 my $freeze_guard = cf::freeze_mainloop;
3749 3848
3750 info "emergency_perl_save: enter\n"; 3849 info "emergency_perl_save: enter\n";
3751 3850
3851 # this is a trade-off: we want to be very quick here, so
3852 # save all maps without fsync, and later call a global sync
3853 # (which in turn might be very very slow)
3854 local $USE_FSYNC = 0;
3855
3752 cf::sync_job { 3856 cf::sync_job {
3753 # this is a trade-off: we want to be very quick here, so 3857 cf::write_runtime_sync; # external watchdog should not bark
3754 # save all maps without fsync, and later call a global sync
3755 # (which in turn might be very very slow)
3756 local $USE_FSYNC = 0;
3757 3858
3758 # use a peculiar iteration method to avoid tripping on perl 3859 # use a peculiar iteration method to avoid tripping on perl
3759 # refcount bugs in for. also avoids problems with players 3860 # refcount bugs in for. also avoids problems with players
3760 # and maps saved/destroyed asynchronously. 3861 # and maps saved/destroyed asynchronously.
3761 info "emergency_perl_save: begin player save\n"; 3862 info "emergency_perl_save: begin player save\n";
… …
3765 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3866 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3766 $pl->save; 3867 $pl->save;
3767 } 3868 }
3768 info "emergency_perl_save: end player save\n"; 3869 info "emergency_perl_save: end player save\n";
3769 3870
3871 cf::write_runtime_sync; # external watchdog should not bark
3872
3770 info "emergency_perl_save: begin map save\n"; 3873 info "emergency_perl_save: begin map save\n";
3771 for my $path (keys %cf::MAP) { 3874 for my $path (keys %cf::MAP) {
3772 my $map = $cf::MAP{$path} or next; 3875 my $map = $cf::MAP{$path} or next;
3773 $map->valid or next; 3876 $map->valid or next;
3774 $map->save; 3877 $map->save;
3775 } 3878 }
3776 info "emergency_perl_save: end map save\n"; 3879 info "emergency_perl_save: end map save\n";
3777 3880
3881 cf::write_runtime_sync; # external watchdog should not bark
3882
3778 info "emergency_perl_save: begin database checkpoint\n"; 3883 info "emergency_perl_save: begin database checkpoint\n";
3779 BDB::db_env_txn_checkpoint $DB_ENV; 3884 BDB::db_env_txn_checkpoint $DB_ENV;
3780 info "emergency_perl_save: end database checkpoint\n"; 3885 info "emergency_perl_save: end database checkpoint\n";
3781 3886
3782 info "emergency_perl_save: begin write uuid\n"; 3887 info "emergency_perl_save: begin write uuid\n";
3783 write_uuid_sync 1; 3888 write_uuid_sync 1;
3784 info "emergency_perl_save: end write uuid\n"; 3889 info "emergency_perl_save: end write uuid\n";
3785 };
3786 3890
3891 cf::write_runtime_sync; # external watchdog should not bark
3892
3893 trace "emergency_perl_save: syncing database to disk";
3894 BDB::db_env_txn_checkpoint $DB_ENV;
3895
3787 info "emergency_perl_save: starting sync()\n"; 3896 info "emergency_perl_save: starting sync\n";
3788 IO::AIO::aio_sync sub { 3897 IO::AIO::aio_sync sub {
3789 info "emergency_perl_save: finished sync()\n"; 3898 info "emergency_perl_save: finished sync\n";
3899 };
3900
3901 cf::write_runtime_sync; # external watchdog should not bark
3902
3903 trace "emergency_perl_save: flushing outstanding aio requests";
3904 while (IO::AIO::nreqs || BDB::nreqs) {
3905 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3906 }
3907
3908 cf::write_runtime_sync; # external watchdog should not bark
3790 }; 3909 };
3791 3910
3792 info "emergency_perl_save: leave\n"; 3911 info "emergency_perl_save: leave\n";
3793} 3912}
3794 3913
3795sub post_cleanup { 3914sub post_cleanup {
3796 my ($make_core) = @_; 3915 my ($make_core) = @_;
3916
3917 IO::AIO::flush;
3797 3918
3798 error Carp::longmess "post_cleanup backtrace" 3919 error Carp::longmess "post_cleanup backtrace"
3799 if $make_core; 3920 if $make_core;
3800 3921
3801 my $fh = pidfile; 3922 my $fh = pidfile;
… …
3827 } 3948 }
3828} 3949}
3829 3950
3830sub do_reload_perl() { 3951sub do_reload_perl() {
3831 # can/must only be called in main 3952 # can/must only be called in main
3832 if (in_main) { 3953 unless (in_main) {
3833 error "can only reload from main coroutine"; 3954 error "can only reload from main coroutine";
3834 return; 3955 return;
3835 } 3956 }
3836 3957
3837 return if $RELOAD++; 3958 return if $RELOAD++;
3838 3959
3839 my $t1 = AE::time; 3960 my $t1 = AE::time;
3840 3961
3841 while ($RELOAD) { 3962 while ($RELOAD) {
3963 cf::get_slot 0.1, -1, "reload_perl";
3842 info "reloading..."; 3964 info "perl_reload: reloading...";
3843 3965
3844 trace "entering sync_job"; 3966 trace "perl_reload: entering sync_job";
3845 3967
3846 cf::sync_job { 3968 cf::sync_job {
3847 cf::write_runtime_sync; # external watchdog should not bark
3848 cf::emergency_save; 3969 #cf::emergency_save;
3849 cf::write_runtime_sync; # external watchdog should not bark
3850 3970
3851 trace "syncing database to disk";
3852 BDB::db_env_txn_checkpoint $DB_ENV;
3853
3854 # if anything goes wrong in here, we should simply crash as we already saved
3855
3856 trace "flushing outstanding aio requests";
3857 while (IO::AIO::nreqs || BDB::nreqs) {
3858 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3859 }
3860
3861 trace "cancelling all extension coros"; 3971 trace "perl_reload: cancelling all extension coros";
3862 $_->cancel for values %EXT_CORO; 3972 $_->cancel for values %EXT_CORO;
3863 %EXT_CORO = (); 3973 %EXT_CORO = ();
3864 3974
3865 trace "removing commands"; 3975 trace "perl_reload: removing commands";
3866 %COMMAND = (); 3976 %COMMAND = ();
3867 3977
3868 trace "removing ext/exti commands"; 3978 trace "perl_reload: removing ext/exti commands";
3869 %EXTCMD = (); 3979 %EXTCMD = ();
3870 %EXTICMD = (); 3980 %EXTICMD = ();
3871 3981
3872 trace "unloading/nuking all extensions"; 3982 trace "perl_reload: unloading/nuking all extensions";
3873 for my $pkg (@EXTS) { 3983 for my $pkg (@EXTS) {
3874 trace "... unloading $pkg"; 3984 trace "... unloading $pkg";
3875 3985
3876 if (my $cb = $pkg->can ("unload")) { 3986 if (my $cb = $pkg->can ("unload")) {
3877 eval { 3987 eval {
… …
3882 3992
3883 trace "... clearing $pkg"; 3993 trace "... clearing $pkg";
3884 clear_package $pkg; 3994 clear_package $pkg;
3885 } 3995 }
3886 3996
3887 trace "unloading all perl modules loaded from $LIBDIR"; 3997 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3888 while (my ($k, $v) = each %INC) { 3998 while (my ($k, $v) = each %INC) {
3889 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3999 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3890 4000
3891 trace "... unloading $k"; 4001 trace "... unloading $k";
3892 delete $INC{$k}; 4002 delete $INC{$k};
… …
3899 } 4009 }
3900 4010
3901 clear_package $k; 4011 clear_package $k;
3902 } 4012 }
3903 4013
3904 trace "getting rid of safe::, as good as possible"; 4014 trace "perl_reload: getting rid of safe::, as good as possible";
3905 clear_package "safe::$_" 4015 clear_package "safe::$_"
3906 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4016 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3907 4017
3908 trace "unloading cf.pm \"a bit\""; 4018 trace "perl_reload: unloading cf.pm \"a bit\"";
3909 delete $INC{"cf.pm"}; 4019 delete $INC{"cf.pm"};
3910 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4020 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3911 4021
3912 # don't, removes xs symbols, too, 4022 # don't, removes xs symbols, too,
3913 # and global variables created in xs 4023 # and global variables created in xs
3914 #clear_package __PACKAGE__; 4024 #clear_package __PACKAGE__;
3915 4025
3916 info "unload completed, starting to reload now"; 4026 info "perl_reload: unload completed, starting to reload now";
3917 4027
3918 trace "reloading cf.pm"; 4028 trace "perl_reload: reloading cf.pm";
3919 require cf; 4029 require cf;
3920 cf::_connect_to_perl_1; 4030 cf::_connect_to_perl_1;
3921 4031
3922 trace "loading config and database again"; 4032 trace "perl_reload: loading config and database again";
3923 cf::reload_config; 4033 cf::reload_config;
3924 4034
3925 trace "loading extensions"; 4035 trace "perl_reload: loading extensions";
3926 cf::load_extensions; 4036 cf::load_extensions;
3927 4037
3928 if ($REATTACH_ON_RELOAD) { 4038 if ($REATTACH_ON_RELOAD) {
3929 trace "reattaching attachments to objects/players"; 4039 trace "perl_reload: reattaching attachments to objects/players";
3930 _global_reattach; # objects, sockets 4040 _global_reattach; # objects, sockets
3931 trace "reattaching attachments to maps"; 4041 trace "perl_reload: reattaching attachments to maps";
3932 reattach $_ for values %MAP; 4042 reattach $_ for values %MAP;
3933 trace "reattaching attachments to players"; 4043 trace "perl_reload: reattaching attachments to players";
3934 reattach $_ for values %PLAYER; 4044 reattach $_ for values %PLAYER;
3935 } 4045 }
3936 4046
3937 trace "running post_init jobs"; 4047 cf::_post_init 1;
3938 (pop @POST_INIT)->(1) while @POST_INIT;
3939 4048
3940 trace "leaving sync_job"; 4049 trace "perl_reload: leaving sync_job";
3941 4050
3942 1 4051 1
3943 } or do { 4052 } or do {
3944 error $@; 4053 error $@;
3945 cf::cleanup "error while reloading, exiting."; 4054 cf::cleanup "perl_reload: error, exiting.";
3946 }; 4055 };
3947 4056
3948 info "reloaded";
3949 --$RELOAD; 4057 --$RELOAD;
3950 } 4058 }
3951 4059
3952 $t1 = AE::time - $t1; 4060 $t1 = AE::time - $t1;
3953 info "reload completed in ${t1}s\n"; 4061 info "perl_reload: completed in ${t1}s\n";
3954}; 4062};
3955 4063
3956our $RELOAD_WATCHER; # used only during reload 4064our $RELOAD_WATCHER; # used only during reload
3957 4065
3958sub reload_perl() { 4066sub reload_perl() {
… …
3979 reload_perl; 4087 reload_perl;
3980 }; 4088 };
3981 } 4089 }
3982}; 4090};
3983 4091
3984unshift @INC, $LIBDIR; 4092#############################################################################
3985 4093
3986my $bug_warning = 0; 4094my $bug_warning = 0;
3987 4095
3988our @WAIT_FOR_TICK; 4096our @WAIT_FOR_TICK;
3989our @WAIT_FOR_TICK_BEGIN; 4097our @WAIT_FOR_TICK_BEGIN;
3990 4098
3991sub wait_for_tick { 4099sub wait_for_tick() {
3992 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4100 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3993 4101
3994 my $signal = new Coro::Signal; 4102 my $signal = new Coro::Signal;
3995 push @WAIT_FOR_TICK, $signal; 4103 push @WAIT_FOR_TICK, $signal;
3996 $signal->wait; 4104 $signal->wait;
3997} 4105}
3998 4106
3999sub wait_for_tick_begin { 4107sub wait_for_tick_begin() {
4000 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4108 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
4001 4109
4002 my $signal = new Coro::Signal; 4110 my $signal = new Coro::Signal;
4003 push @WAIT_FOR_TICK_BEGIN, $signal; 4111 push @WAIT_FOR_TICK_BEGIN, $signal;
4004 $signal->wait; 4112 $signal->wait;
… …
4091 IO::AIO::min_parallel 8; 4199 IO::AIO::min_parallel 8;
4092 IO::AIO::max_poll_time $TICK * 0.1; 4200 IO::AIO::max_poll_time $TICK * 0.1;
4093 undef $AnyEvent::AIO::WATCHER; 4201 undef $AnyEvent::AIO::WATCHER;
4094} 4202}
4095 4203
4096my $_log_backtrace; 4204our $_log_backtrace;
4205our $_log_backtrace_last;
4097 4206
4098sub _log_backtrace { 4207sub _log_backtrace {
4099 my ($msg, @addr) = @_; 4208 my ($msg, @addr) = @_;
4100 4209
4101 $msg =~ s/\n//; 4210 $msg =~ s/\n$//;
4102 4211
4212 if ($_log_backtrace_last eq $msg) {
4213 LOG llevInfo, "[ABT] $msg\n";
4214 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4103 # limit the # of concurrent backtraces 4215 # limit the # of concurrent backtraces
4104 if ($_log_backtrace < 2) { 4216 } elsif ($_log_backtrace < 2) {
4217 $_log_backtrace_last = $msg;
4105 ++$_log_backtrace; 4218 ++$_log_backtrace;
4106 my $perl_bt = Carp::longmess $msg; 4219 my $perl_bt = Carp::longmess $msg;
4107 async { 4220 async {
4108 $Coro::current->{desc} = "abt $msg"; 4221 $Coro::current->{desc} = "abt $msg";
4109 4222
… …
4129 LOG llevInfo, "[ABT] $_\n" for @bt; 4242 LOG llevInfo, "[ABT] $_\n" for @bt;
4130 --$_log_backtrace; 4243 --$_log_backtrace;
4131 }; 4244 };
4132 } else { 4245 } else {
4133 LOG llevInfo, "[ABT] $msg\n"; 4246 LOG llevInfo, "[ABT] $msg\n";
4134 LOG llevInfo, "[ABT] [suppressed]\n"; 4247 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4135 } 4248 }
4136} 4249}
4137 4250
4138# load additional modules 4251# load additional modules
4139require "cf/$_.pm" for @EXTRA_MODULES; 4252require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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