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.440 by root, Mon Aug 11 23:23:41 2008 UTC vs.
Revision 1.453 by root, Tue Sep 23 04:29:11 2008 UTC

… …
19# The authors can be reached via e-mail to <support@deliantra.net> 19# The authors can be reached via e-mail to <support@deliantra.net>
20# 20#
21 21
22package cf; 22package cf;
23 23
24use 5.10.0;
24use utf8; 25use utf8;
25use strict; 26use strict "vars", "subs";
26 27
27use Symbol; 28use Symbol;
28use List::Util; 29use List::Util;
29use Socket; 30use Socket;
30use EV; 31use EV;
… …
34use Storable (); 35use Storable ();
35 36
36use Coro (); 37use Coro ();
37use Coro::State; 38use Coro::State;
38use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
39use Coro::AnyEvent; 41use Coro::AnyEvent;
40use Coro::Timer; 42use Coro::Timer;
41use Coro::Signal; 43use Coro::Signal;
42use Coro::Semaphore; 44use Coro::Semaphore;
43use Coro::AnyEvent; 45use Coro::AnyEvent;
… …
61 63
62# configure various modules to our taste 64# configure various modules to our taste
63# 65#
64$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
65Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
68
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
66Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
67
68$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
69 74
70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
71 76
72our %COMMAND = (); 77our %COMMAND = ();
73our %COMMAND_TIME = (); 78our %COMMAND_TIME = ();
… …
76our %EXTCMD = (); 81our %EXTCMD = ();
77our %EXTICMD = (); 82our %EXTICMD = ();
78our %EXT_CORO = (); # coroutines bound to extensions 83our %EXT_CORO = (); # coroutines bound to extensions
79our %EXT_MAP = (); # pluggable maps 84our %EXT_MAP = (); # pluggable maps
80 85
81our $RELOAD; # number of reloads so far 86our $RELOAD; # number of reloads so far, non-zero while in reload
82our @EVENT; 87our @EVENT;
83 88
84our $CONFDIR = confdir; 89our $CONFDIR = confdir;
85our $DATADIR = datadir; 90our $DATADIR = datadir;
86our $LIBDIR = "$DATADIR/ext"; 91our $LIBDIR = "$DATADIR/ext";
87our $PODDIR = "$DATADIR/pod"; 92our $PODDIR = "$DATADIR/pod";
88our $MAPDIR = "$DATADIR/" . mapdir; 93our $MAPDIR = "$DATADIR/" . mapdir;
89our $LOCALDIR = localdir; 94our $LOCALDIR = localdir;
90our $TMPDIR = "$LOCALDIR/" . tmpdir; 95our $TMPDIR = "$LOCALDIR/" . tmpdir;
91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
92our $PLAYERDIR = "$LOCALDIR/" . playerdir; 97our $PLAYERDIR = "$LOCALDIR/" . playerdir;
93our $RANDOMDIR = "$LOCALDIR/random"; 98our $RANDOMDIR = "$LOCALDIR/random";
94our $BDBDIR = "$LOCALDIR/db"; 99our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime";
102
95our %RESOURCE; 103our %RESOURCE;
96 104
97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
99our $NEXT_TICK; 107our $NEXT_TICK;
… …
120our $LOAD; # a number between 0 (idle) and 1 (too many objects) 128our $LOAD; # a number between 0 (idle) and 1 (too many objects)
121our $LOADAVG; # same thing, but with alpha-smoothing 129our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter 130our $JITTER; # average jitter
123our $TICK_START; # for load detecting purposes 131our $TICK_START; # for load detecting purposes
124 132
133our @POST_INIT;
134
125binmode STDOUT; 135binmode STDOUT;
126binmode STDERR; 136binmode STDERR;
127 137
128# read virtual server time, if available 138# read virtual server time, if available
129unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 139unless ($RUNTIME || !-e $RUNTIMEFILE) {
130 open my $fh, "<", "$LOCALDIR/runtime" 140 open my $fh, "<", $RUNTIMEFILE
131 or die "unable to read runtime file: $!"; 141 or die "unable to read $RUNTIMEFILE file: $!";
132 $RUNTIME = <$fh> + 0.; 142 $RUNTIME = <$fh> + 0.;
133} 143}
134 144
135mkdir $_ 145mkdir $_
136 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
246 cf::client cf::player 256 cf::client cf::player
247 cf::arch cf::living 257 cf::arch cf::living
248 cf::map cf::mapspace 258 cf::map cf::mapspace
249 cf::party cf::region 259 cf::party cf::region
250)) { 260)) {
251 no strict 'refs';
252 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
253} 262}
254 263
255$EV::DIED = sub { 264$EV::DIED = sub {
256 warn "error in event callback: @_"; 265 warn "error in event callback: @_";
… …
298our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 307our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
299 308
300sub encode_json($) { $json_coder->encode ($_[0]) } 309sub encode_json($) { $json_coder->encode ($_[0]) }
301sub decode_json($) { $json_coder->decode ($_[0]) } 310sub decode_json($) { $json_coder->decode ($_[0]) }
302 311
312=item cf::post_init { BLOCK }
313
314Execute the given codeblock, I<after> all extensions have been (re-)loaded,
315but I<before> the server starts ticking again.
316
317The cdoeblock will have a single boolean argument to indicate whether this
318is a reload or not.
319
320=cut
321
322sub post_init(&) {
323 push @POST_INIT, shift;
324}
325
303=item cf::lock_wait $string 326=item cf::lock_wait $string
304 327
305Wait until the given lock is available. See cf::lock_acquire. 328Wait until the given lock is available. See cf::lock_acquire.
306 329
307=item my $lock = cf::lock_acquire $string 330=item my $lock = cf::lock_acquire $string
… …
334 return;#d# 357 return;#d#
335 }#d# 358 }#d#
336 359
337 # wait for lock, if any 360 # wait for lock, if any
338 while ($LOCK{$key}) { 361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
339 push @{ $LOCK{$key} }, $Coro::current; 363 push @{ $LOCK{$key} }, $Coro::current;
340 Coro::schedule; 364 Coro::schedule;
341 } 365 }
342} 366}
343 367
… …
726 750
727############################################################################# 751#############################################################################
728 752
729=head2 ATTACHABLE OBJECTS 753=head2 ATTACHABLE OBJECTS
730 754
731Many objects in crossfire are so-called attachable objects. That means you can 755Many objects in deliantra are so-called attachable objects. That means you can
732attach callbacks/event handlers (a collection of which is called an "attachment") 756attach callbacks/event handlers (a collection of which is called an "attachment")
733to it. All such attachable objects support the following methods. 757to it. All such attachable objects support the following methods.
734 758
735In the following description, CLASS can be any of C<global>, C<object> 759In the following description, CLASS can be any of C<global>, C<object>
736C<player>, C<client> or C<map> (i.e. the attachable objects in 760C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
786=item cf::CLASS::attachment $name, ... 810=item cf::CLASS::attachment $name, ...
787 811
788Register an attachment by C<$name> through which attachable objects of the 812Register an attachment by C<$name> through which attachable objects of the
789given CLASS can refer to this attachment. 813given CLASS can refer to this attachment.
790 814
791Some classes such as crossfire maps and objects can specify attachments 815Some classes such as deliantra maps and objects can specify attachments
792that are attached at load/instantiate time, thus the need for a name. 816that are attached at load/instantiate time, thus the need for a name.
793 817
794These calls expect any number of the following handler/hook descriptions: 818These calls expect any number of the following handler/hook descriptions:
795 819
796=over 4 820=over 4
… …
1087 1111
1088sub reattach { 1112sub reattach {
1089 # basically do the same as instantiate, without calling instantiate 1113 # basically do the same as instantiate, without calling instantiate
1090 my ($obj) = @_; 1114 my ($obj) = @_;
1091 1115
1116 # no longer needed after getting rid of delete_package?
1092 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1117 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1093 1118
1094 my $registry = $obj->registry; 1119 my $registry = $obj->registry;
1095 1120
1096 @$registry = (); 1121 @$registry = ();
1097 1122
… …
1333 1358
1334 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1359 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1335 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1360 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1336 1361
1337 $ext{source} = 1362 $ext{source} =
1338 "package $pkg; use strict; use utf8;\n" 1363 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1339 . "#line 1 \"$path\"\n{\n" 1364 . "#line 1 \"$path\"\n{\n"
1340 . $source 1365 . $source
1341 . "\n};\n1"; 1366 . "\n};\n1";
1342 1367
1343 $todo{$base} = \%ext; 1368 $todo{$base} = \%ext;
… …
1383 1408
1384=back 1409=back
1385 1410
1386=head2 CORE EXTENSIONS 1411=head2 CORE EXTENSIONS
1387 1412
1388Functions and methods that extend core crossfire objects. 1413Functions and methods that extend core deliantra objects.
1389 1414
1390=cut 1415=cut
1391 1416
1392package cf::player; 1417package cf::player;
1393 1418
… …
1436 1461
1437sub exists($) { 1462sub exists($) {
1438 my ($login) = @_; 1463 my ($login) = @_;
1439 1464
1440 $cf::PLAYER{$login} 1465 $cf::PLAYER{$login}
1441 or cf::sync_job { !aio_stat path $login } 1466 or !aio_stat path $login
1442} 1467}
1443 1468
1444sub find($) { 1469sub find($) {
1445 return $cf::PLAYER{$_[0]} || do { 1470 return $cf::PLAYER{$_[0]} || do {
1446 my $login = $_[0]; 1471 my $login = $_[0];
… …
1521 my ($pl) = @_; 1546 my ($pl) = @_;
1522 1547
1523 my $name = $pl->ob->name; 1548 my $name = $pl->ob->name;
1524 1549
1525 $pl->{deny_save} = 1; 1550 $pl->{deny_save} = 1;
1526 $pl->password ("*"); # this should lock out the player until we nuked the dir 1551 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1527 1552
1528 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1553 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1529 $pl->deactivate; 1554 $pl->deactivate;
1530 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1555 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1531 $pl->ob->check_score; 1556 $pl->ob->check_score;
… …
1617 } 1642 }
1618 1643
1619 \@paths 1644 \@paths
1620} 1645}
1621 1646
1622=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1647=item $protocol_xml = $player->expand_cfpod ($cfpod)
1623 1648
1624Expand crossfire pod fragments into protocol xml. 1649Expand deliantra pod fragments into protocol xml.
1625
1626=cut
1627
1628use re 'eval';
1629
1630my $group;
1631my $interior; $interior = qr{
1632 # match a pod interior sequence sans C<< >>
1633 (?:
1634 \ (.*?)\ (?{ $group = $^N })
1635 | < (??{$interior}) >
1636 )
1637}x;
1638
1639sub expand_cfpod {
1640 my ($self, $pod) = @_;
1641
1642 my $xml;
1643
1644 while () {
1645 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1646 $group = $1;
1647
1648 $group =~ s/&/&amp;/g;
1649 $group =~ s/</&lt;/g;
1650
1651 $xml .= $group;
1652 } elsif ($pod =~ m%\G
1653 ([BCGHITU])
1654 <
1655 (?:
1656 ([^<>]*) (?{ $group = $^N })
1657 | < $interior >
1658 )
1659 >
1660 %gcsx
1661 ) {
1662 my ($code, $data) = ($1, $group);
1663
1664 if ($code eq "B") {
1665 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1666 } elsif ($code eq "I") {
1667 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1668 } elsif ($code eq "U") {
1669 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1670 } elsif ($code eq "C") {
1671 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1672 } elsif ($code eq "T") {
1673 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1674 } elsif ($code eq "G") {
1675 my ($male, $female) = split /\|/, $data;
1676 $data = $self->gender ? $female : $male;
1677 $xml .= expand_cfpod ($self, $data);
1678 } elsif ($code eq "H") {
1679 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1680 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1681 "")
1682 [$self->{hintmode}];
1683 } else {
1684 $xml .= "error processing '$code($data)' directive";
1685 }
1686 } else {
1687 if ($pod =~ /\G(.+)/) {
1688 warn "parse error while expanding $pod (at $1)";
1689 }
1690 last;
1691 }
1692 }
1693
1694 for ($xml) {
1695 # create single paragraphs (very hackish)
1696 s/(?<=\S)\n(?=\w)/ /g;
1697
1698 # compress some whitespace
1699 s/\s+\n/\n/g; # ws line-ends
1700 s/\n\n+/\n/g; # double lines
1701 s/^\n+//; # beginning lines
1702 s/\n+$//; # ending lines
1703 }
1704
1705 $xml
1706}
1707
1708no re 'eval';
1709
1710sub hintmode {
1711 $_[0]{hintmode} = $_[1] if @_ > 1;
1712 $_[0]{hintmode}
1713}
1714 1650
1715=item $player->ext_reply ($msgid, @msg) 1651=item $player->ext_reply ($msgid, @msg)
1716 1652
1717Sends an ext reply to the player. 1653Sends an ext reply to the player.
1718 1654
… …
2532 2468
2533=item $player_object->enter_link 2469=item $player_object->enter_link
2534 2470
2535Freezes the player and moves him/her to a special map (C<{link}>). 2471Freezes the player and moves him/her to a special map (C<{link}>).
2536 2472
2537The player should be reasonably safe there for short amounts of time. You 2473The player should be reasonably safe there for short amounts of time (e.g.
2538I<MUST> call C<leave_link> as soon as possible, though. 2474for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2475though, as the palyer cannot control the character while it is on the link
2476map.
2539 2477
2540Will never block. 2478Will never block.
2541 2479
2542=item $player_object->leave_link ($map, $x, $y) 2480=item $player_object->leave_link ($map, $x, $y)
2543 2481
… …
2601 2539
2602 $map->load; 2540 $map->load;
2603 $map->load_neighbours; 2541 $map->load_neighbours;
2604 2542
2605 return unless $self->contr->active; 2543 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2606 $self->activate_recursive; 2545 $self->activate_recursive;
2607 2546
2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2609 $self->enter_map ($map, $x, $y); 2548 $self->enter_map ($map, $x, $y);
2610} 2549}
… …
2773 $self->contr->savebed ($map, $x, $y) 2712 $self->contr->savebed ($map, $x, $y)
2774 if $exit->flag (cf::FLAG_DAMNED); 2713 if $exit->flag (cf::FLAG_DAMNED);
2775 2714
2776 1 2715 1
2777 }) { 2716 }) {
2778 $self->message ("Something went wrong deep within the crossfire server. " 2717 $self->message ("Something went wrong deep within the deliantra server. "
2779 . "I'll try to bring you back to the map you were before. " 2718 . "I'll try to bring you back to the map you were before. "
2780 . "Please report this to the dungeon master!", 2719 . "Please report this to the dungeon master!",
2781 cf::NDI_UNIQUE | cf::NDI_RED); 2720 cf::NDI_UNIQUE | cf::NDI_RED);
2782 2721
2783 warn "ERROR in enter_exit: $@"; 2722 warn "ERROR in enter_exit: $@";
… …
2849 id => "infobox", 2788 id => "infobox",
2850 title => "Body Parts", 2789 title => "Body Parts",
2851 reply => undef, 2790 reply => undef,
2852 tooltip => "Shows which body parts you posess and are available", 2791 tooltip => "Shows which body parts you posess and are available",
2853 }, 2792 },
2793 "c/skills" => {
2794 id => "infobox",
2795 title => "Skills",
2796 reply => undef,
2797 tooltip => "Shows your experience per skill and item power",
2798 },
2854 "c/uptime" => { 2799 "c/uptime" => {
2855 id => "infobox", 2800 id => "infobox",
2856 title => "Uptime", 2801 title => "Uptime",
2857 reply => undef, 2802 reply => undef,
2858 tooltip => "How long the server has been running since last restart", 2803 tooltip => "How long the server has been running since last restart",
… …
2872); 2817);
2873 2818
2874sub cf::client::send_msg { 2819sub cf::client::send_msg {
2875 my ($self, $channel, $msg, $color, @extra) = @_; 2820 my ($self, $channel, $msg, $color, @extra) = @_;
2876 2821
2877 $msg = $self->pl->expand_cfpod ($msg); 2822 $msg = $self->pl->expand_cfpod ($msg)
2823 unless $color & cf::NDI_VERBATIM;
2878 2824
2879 $color &= cf::NDI_CLIENT_MASK; # just in case... 2825 $color &= cf::NDI_CLIENT_MASK; # just in case...
2880 2826
2881 # check predefined channels, for the benefit of C 2827 # check predefined channels, for the benefit of C
2882 if ($CHANNEL{$channel}) { 2828 if ($CHANNEL{$channel}) {
… …
2903 if ($self->can_msg) { 2849 if ($self->can_msg) {
2904 # default colour, mask it out 2850 # default colour, mask it out
2905 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2906 if $color & cf::NDI_DEF; 2852 if $color & cf::NDI_DEF;
2907 2853
2908 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2854 my $pkt = "msg "
2855 . $self->{json_coder}->encode (
2909 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 );
2858
2859 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf};
2862
2863 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag";
2867 }
2868
2869 $self->send_packet ($pkt);
2910 } else { 2870 } else {
2911 if ($color >= 0) { 2871 if ($color >= 0) {
2912 # replace some tags by gcfclient-compatible ones 2872 # replace some tags by gcfclient-compatible ones
2913 for ($msg) { 2873 for ($msg) {
2914 1 while 2874 1 while
… …
3397 reload_treasures; 3357 reload_treasures;
3398 3358
3399 warn "finished reloading resource files\n"; 3359 warn "finished reloading resource files\n";
3400} 3360}
3401 3361
3402sub init {
3403 my $guard = freeze_mainloop;
3404
3405 evthread_start IO::AIO::poll_fileno;
3406
3407 reload_resources;
3408}
3409
3410sub reload_config { 3362sub reload_config {
3411 open my $fh, "<:utf8", "$CONFDIR/config" 3363 open my $fh, "<:utf8", "$CONFDIR/config"
3412 or return; 3364 or return;
3413 3365
3414 local $/; 3366 local $/;
… …
3426 }; 3378 };
3427 warn $@ if $@; 3379 warn $@ if $@;
3428 } 3380 }
3429} 3381}
3430 3382
3383sub pidfile() {
3384 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3385 or die "$PIDFILE: $!";
3386 flock $fh, &Fcntl::LOCK_EX
3387 or die "$PIDFILE: flock: $!";
3388 $fh
3389}
3390
3391# make sure only one server instance is running at any one time
3392sub atomic {
3393 my $fh = pidfile;
3394
3395 my $pid = <$fh>;
3396 kill 9, $pid if $pid > 0;
3397
3398 seek $fh, 0, 0;
3399 print $fh $$;
3400}
3401
3431sub main { 3402sub main {
3403 cf::init_globals; # initialise logging
3404
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3407 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3408 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3409
3410 cf::init_experience;
3411 cf::init_anim;
3412 cf::init_attackmess;
3413 cf::init_dynamic;
3414 cf::init_block;
3415
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417
3432 # we must not ever block the main coroutine 3418 # we must not ever block the main coroutine
3433 local $Coro::idle = sub { 3419 local $Coro::idle = sub {
3434 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3420 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3435 (async { 3421 (async {
3436 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3422 $Coro::current->{desc} = "IDLE BUG HANDLER";
3437 EV::loop EV::LOOP_ONESHOT; 3423 EV::loop EV::LOOP_ONESHOT;
3438 })->prio (Coro::PRIO_MAX); 3424 })->prio (Coro::PRIO_MAX);
3439 }; 3425 };
3440 3426
3441 { 3427 evthread_start IO::AIO::poll_fileno;
3442 my $guard = freeze_mainloop; 3428
3429 cf::sync_job {
3430 reload_resources;
3443 reload_config; 3431 reload_config;
3444 db_init; 3432 db_init;
3433
3434 cf::load_settings;
3435 cf::load_materials;
3436 cf::init_uuid;
3437 cf::init_signals;
3438 cf::init_commands;
3439 cf::init_skills;
3440
3441 cf::init_beforeplay;
3442
3443 atomic;
3444
3445 load_extensions; 3445 load_extensions;
3446 3446
3447 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3447 utime time, time, $RUNTIMEFILE;
3448
3449 # no (long-running) fork's whatsoever before this point(!)
3450 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3451
3452 (pop @POST_INIT)->(0) while @POST_INIT;
3448 } 3453 };
3449 3454
3450 EV::loop; 3455 EV::loop;
3451} 3456}
3452 3457
3453############################################################################# 3458#############################################################################
… …
3462 }; 3467 };
3463 } 3468 }
3464} 3469}
3465 3470
3466sub write_runtime_sync { 3471sub write_runtime_sync {
3467 my $runtime = "$LOCALDIR/runtime";
3468
3469 # first touch the runtime file to show we are still running: 3472 # first touch the runtime file to show we are still running:
3470 # the fsync below can take a very very long time. 3473 # the fsync below can take a very very long time.
3471 3474
3472 IO::AIO::aio_utime $runtime, undef, undef; 3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3473 3476
3474 my $guard = cf::lock_acquire "write_runtime"; 3477 my $guard = cf::lock_acquire "write_runtime";
3475 3478
3476 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3477 or return; 3480 or return;
3478 3481
3479 my $value = $cf::RUNTIME + 90 + 10; 3482 my $value = $cf::RUNTIME + 90 + 10;
3480 # 10 is the runtime save interval, for a monotonic clock 3483 # 10 is the runtime save interval, for a monotonic clock
3481 # 60 allows for the watchdog to kill the server. 3484 # 60 allows for the watchdog to kill the server.
… …
3491 aio_utime $fh, undef, undef; 3494 aio_utime $fh, undef, undef;
3492 3495
3493 close $fh 3496 close $fh
3494 or return; 3497 or return;
3495 3498
3496 aio_rename "$runtime~", $runtime 3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3497 and return; 3500 and return;
3498 3501
3499 warn "runtime file written.\n"; 3502 warn "runtime file written.\n";
3500 3503
3501 1 3504 1
… …
3585sub post_cleanup { 3588sub post_cleanup {
3586 my ($make_core) = @_; 3589 my ($make_core) = @_;
3587 3590
3588 warn Carp::longmess "post_cleanup backtrace" 3591 warn Carp::longmess "post_cleanup backtrace"
3589 if $make_core; 3592 if $make_core;
3593
3594 my $fh = pidfile;
3595 unlink $PIDFILE if <$fh> == $$;
3596}
3597
3598# a safer delete_package, copied from Symbol
3599sub clear_package($) {
3600 my $pkg = shift;
3601
3602 # expand to full symbol table name if needed
3603 unless ($pkg =~ /^main::.*::$/) {
3604 $pkg = "main$pkg" if $pkg =~ /^::/;
3605 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3606 $pkg .= '::' unless $pkg =~ /::$/;
3607 }
3608
3609 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3610 my $stem_symtab = *{$stem}{HASH};
3611
3612 defined $stem_symtab and exists $stem_symtab->{$leaf}
3613 or return;
3614
3615 # clear all symbols
3616 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3617 for my $name (keys %$leaf_symtab) {
3618 _gv_clear *{"$pkg$name"};
3619# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3620 }
3621 warn "cleared package $pkg\n";#d#
3590} 3622}
3591 3623
3592sub do_reload_perl() { 3624sub do_reload_perl() {
3593 # can/must only be called in main 3625 # can/must only be called in main
3594 if ($Coro::current != $Coro::main) { 3626 if ($Coro::current != $Coro::main) {
3595 warn "can only reload from main coroutine"; 3627 warn "can only reload from main coroutine";
3596 return; 3628 return;
3597 } 3629 }
3598 3630
3631 return if $RELOAD++;
3632
3633 while ($RELOAD) {
3599 warn "reloading..."; 3634 warn "reloading...";
3600 3635
3601 warn "entering sync_job"; 3636 warn "entering sync_job";
3602 3637
3603 cf::sync_job { 3638 cf::sync_job {
3604 cf::write_runtime_sync; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
3605 cf::emergency_save; 3640 cf::emergency_save;
3606 cf::write_runtime_sync; # external watchdog should not bark 3641 cf::write_runtime_sync; # external watchdog should not bark
3607 3642
3608 warn "syncing database to disk"; 3643 warn "syncing database to disk";
3609 BDB::db_env_txn_checkpoint $DB_ENV; 3644 BDB::db_env_txn_checkpoint $DB_ENV;
3610 3645
3611 # if anything goes wrong in here, we should simply crash as we already saved 3646 # if anything goes wrong in here, we should simply crash as we already saved
3612 3647
3613 warn "flushing outstanding aio requests"; 3648 warn "flushing outstanding aio requests";
3614 for (;;) {
3615 BDB::flush;
3616 IO::AIO::flush;
3617 Coro::cede_notself;
3618 last unless IO::AIO::nreqs || BDB::nreqs; 3649 while (IO::AIO::nreqs || BDB::nreqs) {
3619 warn "iterate..."; 3650 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3620 }
3621
3622 ++$RELOAD;
3623
3624 warn "cancelling all extension coros";
3625 $_->cancel for values %EXT_CORO;
3626 %EXT_CORO = ();
3627
3628 warn "removing commands";
3629 %COMMAND = ();
3630
3631 warn "removing ext/exti commands";
3632 %EXTCMD = ();
3633 %EXTICMD = ();
3634
3635 warn "unloading/nuking all extensions";
3636 for my $pkg (@EXTS) {
3637 warn "... unloading $pkg";
3638
3639 if (my $cb = $pkg->can ("unload")) {
3640 eval {
3641 $cb->($pkg);
3642 1
3643 } or warn "$pkg unloaded, but with errors: $@";
3644 } 3651 }
3645 3652
3646 warn "... nuking $pkg"; 3653 warn "cancelling all extension coros";
3647 Symbol::delete_package $pkg; 3654 $_->cancel for values %EXT_CORO;
3648 } 3655 %EXT_CORO = ();
3649 3656
3650 warn "unloading all perl modules loaded from $LIBDIR"; 3657 warn "removing commands";
3651 while (my ($k, $v) = each %INC) { 3658 %COMMAND = ();
3652 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3653 3659
3660 warn "removing ext/exti commands";
3661 %EXTCMD = ();
3662 %EXTICMD = ();
3663
3664 warn "unloading/nuking all extensions";
3665 for my $pkg (@EXTS) {
3654 warn "... unloading $k"; 3666 warn "... unloading $pkg";
3655 delete $INC{$k};
3656 3667
3657 $k =~ s/\.pm$//;
3658 $k =~ s/\//::/g;
3659
3660 if (my $cb = $k->can ("unload_module")) { 3668 if (my $cb = $pkg->can ("unload")) {
3669 eval {
3661 $cb->(); 3670 $cb->($pkg);
3671 1
3672 } or warn "$pkg unloaded, but with errors: $@";
3673 }
3674
3675 warn "... clearing $pkg";
3676 clear_package $pkg;
3662 } 3677 }
3663 3678
3664 Symbol::delete_package $k; 3679 warn "unloading all perl modules loaded from $LIBDIR";
3680 while (my ($k, $v) = each %INC) {
3681 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3682
3683 warn "... unloading $k";
3684 delete $INC{$k};
3685
3686 $k =~ s/\.pm$//;
3687 $k =~ s/\//::/g;
3688
3689 if (my $cb = $k->can ("unload_module")) {
3690 $cb->();
3691 }
3692
3693 clear_package $k;
3665 } 3694 }
3666 3695
3667 warn "getting rid of safe::, as good as possible"; 3696 warn "getting rid of safe::, as good as possible";
3668 Symbol::delete_package "safe::$_" 3697 clear_package "safe::$_"
3669 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3698 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3670 3699
3671 warn "unloading cf.pm \"a bit\""; 3700 warn "unloading cf.pm \"a bit\"";
3672 delete $INC{"cf.pm"}; 3701 delete $INC{"cf.pm"};
3673 delete $INC{"cf/pod.pm"}; 3702 delete $INC{"cf/pod.pm"};
3674 3703
3675 # don't, removes xs symbols, too, 3704 # don't, removes xs symbols, too,
3676 # and global variables created in xs 3705 # and global variables created in xs
3677 #Symbol::delete_package __PACKAGE__; 3706 #clear_package __PACKAGE__;
3678 3707
3679 warn "unload completed, starting to reload now"; 3708 warn "unload completed, starting to reload now";
3680 3709
3681 warn "reloading cf.pm"; 3710 warn "reloading cf.pm";
3682 require cf; 3711 require cf;
3683 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3712 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3684 3713
3685 warn "loading config and database again"; 3714 warn "loading config and database again";
3686 cf::reload_config; 3715 cf::reload_config;
3687 3716
3688 warn "loading extensions"; 3717 warn "loading extensions";
3689 cf::load_extensions; 3718 cf::load_extensions;
3690 3719
3691 warn "reattaching attachments to objects/players"; 3720 warn "reattaching attachments to objects/players";
3692 _global_reattach; # objects, sockets 3721 _global_reattach; # objects, sockets
3693 warn "reattaching attachments to maps"; 3722 warn "reattaching attachments to maps";
3694 reattach $_ for values %MAP; 3723 reattach $_ for values %MAP;
3695 warn "reattaching attachments to players"; 3724 warn "reattaching attachments to players";
3696 reattach $_ for values %PLAYER; 3725 reattach $_ for values %PLAYER;
3697 3726
3727 warn "running post_load";
3728 (pop @POST_INIT)->(1) while @POST_INIT;
3729
3698 warn "leaving sync_job"; 3730 warn "leaving sync_job";
3699 3731
3700 1 3732 1
3701 } or do { 3733 } or do {
3702 warn $@; 3734 warn $@;
3703 cf::cleanup "error while reloading, exiting."; 3735 cf::cleanup "error while reloading, exiting.";
3704 }; 3736 };
3705 3737
3706 warn "reloaded"; 3738 warn "reloaded";
3739 --$RELOAD;
3740 }
3707}; 3741};
3708 3742
3709our $RELOAD_WATCHER; # used only during reload 3743our $RELOAD_WATCHER; # used only during reload
3710 3744
3711sub reload_perl() { 3745sub reload_perl() {
3712 # doing reload synchronously and two reloads happen back-to-back, 3746 # doing reload synchronously and two reloads happen back-to-back,
3713 # coro crashes during coro_state_free->destroy here. 3747 # coro crashes during coro_state_free->destroy here.
3714 3748
3715 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3749 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
3716 do_reload_perl; 3750 do_reload_perl;
3717 undef $RELOAD_WATCHER; 3751 undef $RELOAD_WATCHER;
3718 }; 3752 };
3719} 3753}
3720 3754
… …
3848 $msg =~ s/\n//; 3882 $msg =~ s/\n//;
3849 3883
3850 # limit the # of concurrent backtraces 3884 # limit the # of concurrent backtraces
3851 if ($_log_backtrace < 2) { 3885 if ($_log_backtrace < 2) {
3852 ++$_log_backtrace; 3886 ++$_log_backtrace;
3887 my $perl_bt = Carp::longmess $msg;
3853 async { 3888 async {
3854 $Coro::current->{desc} = "abt $msg"; 3889 $Coro::current->{desc} = "abt $msg";
3855 3890
3856 my @bt = fork_call { 3891 my @bt = fork_call {
3857 @addr = map { sprintf "%x", $_ } @addr; 3892 @addr = map { sprintf "%x", $_ } @addr;
… …
3868 } 3903 }
3869 3904
3870 @funcs 3905 @funcs
3871 }; 3906 };
3872 3907
3873 LOG llevInfo, "[ABT] $msg\n"; 3908 LOG llevInfo, "[ABT] $perl_bt\n";
3909 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3874 LOG llevInfo, "[ABT] $_\n" for @bt; 3910 LOG llevInfo, "[ABT] $_\n" for @bt;
3875 --$_log_backtrace; 3911 --$_log_backtrace;
3876 }; 3912 };
3877 } else { 3913 } else {
3878 LOG llevInfo, "[ABT] $msg\n"; 3914 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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