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.439 by root, Mon Jul 14 16:42:49 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;
… …
243for my $pkg (qw( 253for my $pkg (qw(
244 cf::global cf::attachable 254 cf::global cf::attachable
245 cf::object cf::object::player 255 cf::object cf::object::player
246 cf::client cf::player 256 cf::client cf::player
247 cf::arch cf::living 257 cf::arch cf::living
258 cf::map cf::mapspace
248 cf::map cf::party cf::region 259 cf::party cf::region
249)) { 260)) {
250 no strict 'refs';
251 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
252} 262}
253 263
254$EV::DIED = sub { 264$EV::DIED = sub {
255 warn "error in event callback: @_"; 265 warn "error in event callback: @_";
… …
297our $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
298 308
299sub encode_json($) { $json_coder->encode ($_[0]) } 309sub encode_json($) { $json_coder->encode ($_[0]) }
300sub decode_json($) { $json_coder->decode ($_[0]) } 310sub decode_json($) { $json_coder->decode ($_[0]) }
301 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
302=item cf::lock_wait $string 326=item cf::lock_wait $string
303 327
304Wait until the given lock is available. See cf::lock_acquire. 328Wait until the given lock is available. See cf::lock_acquire.
305 329
306=item my $lock = cf::lock_acquire $string 330=item my $lock = cf::lock_acquire $string
… …
333 return;#d# 357 return;#d#
334 }#d# 358 }#d#
335 359
336 # wait for lock, if any 360 # wait for lock, if any
337 while ($LOCK{$key}) { 361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
338 push @{ $LOCK{$key} }, $Coro::current; 363 push @{ $LOCK{$key} }, $Coro::current;
339 Coro::schedule; 364 Coro::schedule;
340 } 365 }
341} 366}
342 367
… …
725 750
726############################################################################# 751#############################################################################
727 752
728=head2 ATTACHABLE OBJECTS 753=head2 ATTACHABLE OBJECTS
729 754
730Many 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
731attach callbacks/event handlers (a collection of which is called an "attachment") 756attach callbacks/event handlers (a collection of which is called an "attachment")
732to it. All such attachable objects support the following methods. 757to it. All such attachable objects support the following methods.
733 758
734In 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>
735C<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
… …
785=item cf::CLASS::attachment $name, ... 810=item cf::CLASS::attachment $name, ...
786 811
787Register an attachment by C<$name> through which attachable objects of the 812Register an attachment by C<$name> through which attachable objects of the
788given CLASS can refer to this attachment. 813given CLASS can refer to this attachment.
789 814
790Some classes such as crossfire maps and objects can specify attachments 815Some classes such as deliantra maps and objects can specify attachments
791that 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.
792 817
793These calls expect any number of the following handler/hook descriptions: 818These calls expect any number of the following handler/hook descriptions:
794 819
795=over 4 820=over 4
… …
1086 1111
1087sub reattach { 1112sub reattach {
1088 # basically do the same as instantiate, without calling instantiate 1113 # basically do the same as instantiate, without calling instantiate
1089 my ($obj) = @_; 1114 my ($obj) = @_;
1090 1115
1116 # no longer needed after getting rid of delete_package?
1091 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
1092 1118
1093 my $registry = $obj->registry; 1119 my $registry = $obj->registry;
1094 1120
1095 @$registry = (); 1121 @$registry = ();
1096 1122
… …
1332 1358
1333 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1359 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1334 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1360 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1335 1361
1336 $ext{source} = 1362 $ext{source} =
1337 "package $pkg; use strict; use utf8;\n" 1363 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1338 . "#line 1 \"$path\"\n{\n" 1364 . "#line 1 \"$path\"\n{\n"
1339 . $source 1365 . $source
1340 . "\n};\n1"; 1366 . "\n};\n1";
1341 1367
1342 $todo{$base} = \%ext; 1368 $todo{$base} = \%ext;
… …
1382 1408
1383=back 1409=back
1384 1410
1385=head2 CORE EXTENSIONS 1411=head2 CORE EXTENSIONS
1386 1412
1387Functions and methods that extend core crossfire objects. 1413Functions and methods that extend core deliantra objects.
1388 1414
1389=cut 1415=cut
1390 1416
1391package cf::player; 1417package cf::player;
1392 1418
… …
1435 1461
1436sub exists($) { 1462sub exists($) {
1437 my ($login) = @_; 1463 my ($login) = @_;
1438 1464
1439 $cf::PLAYER{$login} 1465 $cf::PLAYER{$login}
1440 or cf::sync_job { !aio_stat path $login } 1466 or !aio_stat path $login
1441} 1467}
1442 1468
1443sub find($) { 1469sub find($) {
1444 return $cf::PLAYER{$_[0]} || do { 1470 return $cf::PLAYER{$_[0]} || do {
1445 my $login = $_[0]; 1471 my $login = $_[0];
… …
1520 my ($pl) = @_; 1546 my ($pl) = @_;
1521 1547
1522 my $name = $pl->ob->name; 1548 my $name = $pl->ob->name;
1523 1549
1524 $pl->{deny_save} = 1; 1550 $pl->{deny_save} = 1;
1525 $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
1526 1552
1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1553 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1528 $pl->deactivate; 1554 $pl->deactivate;
1529 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;
1530 $pl->ob->check_score; 1556 $pl->ob->check_score;
… …
1616 } 1642 }
1617 1643
1618 \@paths 1644 \@paths
1619} 1645}
1620 1646
1621=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1647=item $protocol_xml = $player->expand_cfpod ($cfpod)
1622 1648
1623Expand crossfire pod fragments into protocol xml. 1649Expand deliantra pod fragments into protocol xml.
1624
1625=cut
1626
1627use re 'eval';
1628
1629my $group;
1630my $interior; $interior = qr{
1631 # match a pod interior sequence sans C<< >>
1632 (?:
1633 \ (.*?)\ (?{ $group = $^N })
1634 | < (??{$interior}) >
1635 )
1636}x;
1637
1638sub expand_cfpod {
1639 my ($self, $pod) = @_;
1640
1641 my $xml;
1642
1643 while () {
1644 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1645 $group = $1;
1646
1647 $group =~ s/&/&amp;/g;
1648 $group =~ s/</&lt;/g;
1649
1650 $xml .= $group;
1651 } elsif ($pod =~ m%\G
1652 ([BCGHITU])
1653 <
1654 (?:
1655 ([^<>]*) (?{ $group = $^N })
1656 | < $interior >
1657 )
1658 >
1659 %gcsx
1660 ) {
1661 my ($code, $data) = ($1, $group);
1662
1663 if ($code eq "B") {
1664 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1665 } elsif ($code eq "I") {
1666 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1667 } elsif ($code eq "U") {
1668 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1669 } elsif ($code eq "C") {
1670 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1671 } elsif ($code eq "T") {
1672 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1673 } elsif ($code eq "G") {
1674 my ($male, $female) = split /\|/, $data;
1675 $data = $self->gender ? $female : $male;
1676 $xml .= expand_cfpod ($self, $data);
1677 } elsif ($code eq "H") {
1678 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1679 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1680 "")
1681 [$self->{hintmode}];
1682 } else {
1683 $xml .= "error processing '$code($data)' directive";
1684 }
1685 } else {
1686 if ($pod =~ /\G(.+)/) {
1687 warn "parse error while expanding $pod (at $1)";
1688 }
1689 last;
1690 }
1691 }
1692
1693 for ($xml) {
1694 # create single paragraphs (very hackish)
1695 s/(?<=\S)\n(?=\w)/ /g;
1696
1697 # compress some whitespace
1698 s/\s+\n/\n/g; # ws line-ends
1699 s/\n\n+/\n/g; # double lines
1700 s/^\n+//; # beginning lines
1701 s/\n+$//; # ending lines
1702 }
1703
1704 $xml
1705}
1706
1707no re 'eval';
1708
1709sub hintmode {
1710 $_[0]{hintmode} = $_[1] if @_ > 1;
1711 $_[0]{hintmode}
1712}
1713 1650
1714=item $player->ext_reply ($msgid, @msg) 1651=item $player->ext_reply ($msgid, @msg)
1715 1652
1716Sends an ext reply to the player. 1653Sends an ext reply to the player.
1717 1654
… …
2531 2468
2532=item $player_object->enter_link 2469=item $player_object->enter_link
2533 2470
2534Freezes 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}>).
2535 2472
2536The 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.
2537I<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.
2538 2477
2539Will never block. 2478Will never block.
2540 2479
2541=item $player_object->leave_link ($map, $x, $y) 2480=item $player_object->leave_link ($map, $x, $y)
2542 2481
… …
2600 2539
2601 $map->load; 2540 $map->load;
2602 $map->load_neighbours; 2541 $map->load_neighbours;
2603 2542
2604 return unless $self->contr->active; 2543 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2605 $self->activate_recursive; 2545 $self->activate_recursive;
2606 2546
2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2608 $self->enter_map ($map, $x, $y); 2548 $self->enter_map ($map, $x, $y);
2609} 2549}
… …
2772 $self->contr->savebed ($map, $x, $y) 2712 $self->contr->savebed ($map, $x, $y)
2773 if $exit->flag (cf::FLAG_DAMNED); 2713 if $exit->flag (cf::FLAG_DAMNED);
2774 2714
2775 1 2715 1
2776 }) { 2716 }) {
2777 $self->message ("Something went wrong deep within the crossfire server. " 2717 $self->message ("Something went wrong deep within the deliantra server. "
2778 . "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. "
2779 . "Please report this to the dungeon master!", 2719 . "Please report this to the dungeon master!",
2780 cf::NDI_UNIQUE | cf::NDI_RED); 2720 cf::NDI_UNIQUE | cf::NDI_RED);
2781 2721
2782 warn "ERROR in enter_exit: $@"; 2722 warn "ERROR in enter_exit: $@";
… …
2848 id => "infobox", 2788 id => "infobox",
2849 title => "Body Parts", 2789 title => "Body Parts",
2850 reply => undef, 2790 reply => undef,
2851 tooltip => "Shows which body parts you posess and are available", 2791 tooltip => "Shows which body parts you posess and are available",
2852 }, 2792 },
2793 "c/skills" => {
2794 id => "infobox",
2795 title => "Skills",
2796 reply => undef,
2797 tooltip => "Shows your experience per skill and item power",
2798 },
2853 "c/uptime" => { 2799 "c/uptime" => {
2854 id => "infobox", 2800 id => "infobox",
2855 title => "Uptime", 2801 title => "Uptime",
2856 reply => undef, 2802 reply => undef,
2857 tooltip => "How long the server has been running since last restart", 2803 tooltip => "How long the server has been running since last restart",
… …
2871); 2817);
2872 2818
2873sub cf::client::send_msg { 2819sub cf::client::send_msg {
2874 my ($self, $channel, $msg, $color, @extra) = @_; 2820 my ($self, $channel, $msg, $color, @extra) = @_;
2875 2821
2876 $msg = $self->pl->expand_cfpod ($msg); 2822 $msg = $self->pl->expand_cfpod ($msg)
2823 unless $color & cf::NDI_VERBATIM;
2877 2824
2878 $color &= cf::NDI_CLIENT_MASK; # just in case... 2825 $color &= cf::NDI_CLIENT_MASK; # just in case...
2879 2826
2880 # check predefined channels, for the benefit of C 2827 # check predefined channels, for the benefit of C
2881 if ($CHANNEL{$channel}) { 2828 if ($CHANNEL{$channel}) {
… …
2902 if ($self->can_msg) { 2849 if ($self->can_msg) {
2903 # default colour, mask it out 2850 # default colour, mask it out
2904 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2905 if $color & cf::NDI_DEF; 2852 if $color & cf::NDI_DEF;
2906 2853
2907 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2854 my $pkt = "msg "
2855 . $self->{json_coder}->encode (
2908 [$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);
2909 } else { 2870 } else {
2910 if ($color >= 0) { 2871 if ($color >= 0) {
2911 # replace some tags by gcfclient-compatible ones 2872 # replace some tags by gcfclient-compatible ones
2912 for ($msg) { 2873 for ($msg) {
2913 1 while 2874 1 while
… …
3396 reload_treasures; 3357 reload_treasures;
3397 3358
3398 warn "finished reloading resource files\n"; 3359 warn "finished reloading resource files\n";
3399} 3360}
3400 3361
3401sub init {
3402 my $guard = freeze_mainloop;
3403
3404 evthread_start IO::AIO::poll_fileno;
3405
3406 reload_resources;
3407}
3408
3409sub reload_config { 3362sub reload_config {
3410 open my $fh, "<:utf8", "$CONFDIR/config" 3363 open my $fh, "<:utf8", "$CONFDIR/config"
3411 or return; 3364 or return;
3412 3365
3413 local $/; 3366 local $/;
… …
3425 }; 3378 };
3426 warn $@ if $@; 3379 warn $@ if $@;
3427 } 3380 }
3428} 3381}
3429 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
3430sub 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
3431 # we must not ever block the main coroutine 3418 # we must not ever block the main coroutine
3432 local $Coro::idle = sub { 3419 local $Coro::idle = sub {
3433 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#
3434 (async { 3421 (async {
3435 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3422 $Coro::current->{desc} = "IDLE BUG HANDLER";
3436 EV::loop EV::LOOP_ONESHOT; 3423 EV::loop EV::LOOP_ONESHOT;
3437 })->prio (Coro::PRIO_MAX); 3424 })->prio (Coro::PRIO_MAX);
3438 }; 3425 };
3439 3426
3440 { 3427 evthread_start IO::AIO::poll_fileno;
3441 my $guard = freeze_mainloop; 3428
3429 cf::sync_job {
3430 reload_resources;
3442 reload_config; 3431 reload_config;
3443 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
3444 load_extensions; 3445 load_extensions;
3445 3446
3446 $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;
3447 } 3453 };
3448 3454
3449 EV::loop; 3455 EV::loop;
3450} 3456}
3451 3457
3452############################################################################# 3458#############################################################################
… …
3461 }; 3467 };
3462 } 3468 }
3463} 3469}
3464 3470
3465sub write_runtime_sync { 3471sub write_runtime_sync {
3466 my $runtime = "$LOCALDIR/runtime";
3467
3468 # first touch the runtime file to show we are still running: 3472 # first touch the runtime file to show we are still running:
3469 # the fsync below can take a very very long time. 3473 # the fsync below can take a very very long time.
3470 3474
3471 IO::AIO::aio_utime $runtime, undef, undef; 3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3472 3476
3473 my $guard = cf::lock_acquire "write_runtime"; 3477 my $guard = cf::lock_acquire "write_runtime";
3474 3478
3475 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3476 or return; 3480 or return;
3477 3481
3478 my $value = $cf::RUNTIME + 90 + 10; 3482 my $value = $cf::RUNTIME + 90 + 10;
3479 # 10 is the runtime save interval, for a monotonic clock 3483 # 10 is the runtime save interval, for a monotonic clock
3480 # 60 allows for the watchdog to kill the server. 3484 # 60 allows for the watchdog to kill the server.
… …
3490 aio_utime $fh, undef, undef; 3494 aio_utime $fh, undef, undef;
3491 3495
3492 close $fh 3496 close $fh
3493 or return; 3497 or return;
3494 3498
3495 aio_rename "$runtime~", $runtime 3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3496 and return; 3500 and return;
3497 3501
3498 warn "runtime file written.\n"; 3502 warn "runtime file written.\n";
3499 3503
3500 1 3504 1
… …
3584sub post_cleanup { 3588sub post_cleanup {
3585 my ($make_core) = @_; 3589 my ($make_core) = @_;
3586 3590
3587 warn Carp::longmess "post_cleanup backtrace" 3591 warn Carp::longmess "post_cleanup backtrace"
3588 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#
3589} 3622}
3590 3623
3591sub do_reload_perl() { 3624sub do_reload_perl() {
3592 # can/must only be called in main 3625 # can/must only be called in main
3593 if ($Coro::current != $Coro::main) { 3626 if ($Coro::current != $Coro::main) {
3594 warn "can only reload from main coroutine"; 3627 warn "can only reload from main coroutine";
3595 return; 3628 return;
3596 } 3629 }
3597 3630
3631 return if $RELOAD++;
3632
3633 while ($RELOAD) {
3598 warn "reloading..."; 3634 warn "reloading...";
3599 3635
3600 warn "entering sync_job"; 3636 warn "entering sync_job";
3601 3637
3602 cf::sync_job { 3638 cf::sync_job {
3603 cf::write_runtime_sync; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
3604 cf::emergency_save; 3640 cf::emergency_save;
3605 cf::write_runtime_sync; # external watchdog should not bark 3641 cf::write_runtime_sync; # external watchdog should not bark
3606 3642
3607 warn "syncing database to disk"; 3643 warn "syncing database to disk";
3608 BDB::db_env_txn_checkpoint $DB_ENV; 3644 BDB::db_env_txn_checkpoint $DB_ENV;
3609 3645
3610 # 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
3611 3647
3612 warn "flushing outstanding aio requests"; 3648 warn "flushing outstanding aio requests";
3613 for (;;) {
3614 BDB::flush;
3615 IO::AIO::flush;
3616 Coro::cede_notself;
3617 last unless IO::AIO::nreqs || BDB::nreqs; 3649 while (IO::AIO::nreqs || BDB::nreqs) {
3618 warn "iterate..."; 3650 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3619 }
3620
3621 ++$RELOAD;
3622
3623 warn "cancelling all extension coros";
3624 $_->cancel for values %EXT_CORO;
3625 %EXT_CORO = ();
3626
3627 warn "removing commands";
3628 %COMMAND = ();
3629
3630 warn "removing ext/exti commands";
3631 %EXTCMD = ();
3632 %EXTICMD = ();
3633
3634 warn "unloading/nuking all extensions";
3635 for my $pkg (@EXTS) {
3636 warn "... unloading $pkg";
3637
3638 if (my $cb = $pkg->can ("unload")) {
3639 eval {
3640 $cb->($pkg);
3641 1
3642 } or warn "$pkg unloaded, but with errors: $@";
3643 } 3651 }
3644 3652
3645 warn "... nuking $pkg"; 3653 warn "cancelling all extension coros";
3646 Symbol::delete_package $pkg; 3654 $_->cancel for values %EXT_CORO;
3647 } 3655 %EXT_CORO = ();
3648 3656
3649 warn "unloading all perl modules loaded from $LIBDIR"; 3657 warn "removing commands";
3650 while (my ($k, $v) = each %INC) { 3658 %COMMAND = ();
3651 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3652 3659
3660 warn "removing ext/exti commands";
3661 %EXTCMD = ();
3662 %EXTICMD = ();
3663
3664 warn "unloading/nuking all extensions";
3665 for my $pkg (@EXTS) {
3653 warn "... unloading $k"; 3666 warn "... unloading $pkg";
3654 delete $INC{$k};
3655 3667
3656 $k =~ s/\.pm$//;
3657 $k =~ s/\//::/g;
3658
3659 if (my $cb = $k->can ("unload_module")) { 3668 if (my $cb = $pkg->can ("unload")) {
3669 eval {
3660 $cb->(); 3670 $cb->($pkg);
3671 1
3672 } or warn "$pkg unloaded, but with errors: $@";
3673 }
3674
3675 warn "... clearing $pkg";
3676 clear_package $pkg;
3661 } 3677 }
3662 3678
3663 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;
3664 } 3694 }
3665 3695
3666 warn "getting rid of safe::, as good as possible"; 3696 warn "getting rid of safe::, as good as possible";
3667 Symbol::delete_package "safe::$_" 3697 clear_package "safe::$_"
3668 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);
3669 3699
3670 warn "unloading cf.pm \"a bit\""; 3700 warn "unloading cf.pm \"a bit\"";
3671 delete $INC{"cf.pm"}; 3701 delete $INC{"cf.pm"};
3672 delete $INC{"cf/pod.pm"}; 3702 delete $INC{"cf/pod.pm"};
3673 3703
3674 # don't, removes xs symbols, too, 3704 # don't, removes xs symbols, too,
3675 # and global variables created in xs 3705 # and global variables created in xs
3676 #Symbol::delete_package __PACKAGE__; 3706 #clear_package __PACKAGE__;
3677 3707
3678 warn "unload completed, starting to reload now"; 3708 warn "unload completed, starting to reload now";
3679 3709
3680 warn "reloading cf.pm"; 3710 warn "reloading cf.pm";
3681 require cf; 3711 require cf;
3682 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3712 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3683 3713
3684 warn "loading config and database again"; 3714 warn "loading config and database again";
3685 cf::reload_config; 3715 cf::reload_config;
3686 3716
3687 warn "loading extensions"; 3717 warn "loading extensions";
3688 cf::load_extensions; 3718 cf::load_extensions;
3689 3719
3690 warn "reattaching attachments to objects/players"; 3720 warn "reattaching attachments to objects/players";
3691 _global_reattach; # objects, sockets 3721 _global_reattach; # objects, sockets
3692 warn "reattaching attachments to maps"; 3722 warn "reattaching attachments to maps";
3693 reattach $_ for values %MAP; 3723 reattach $_ for values %MAP;
3694 warn "reattaching attachments to players"; 3724 warn "reattaching attachments to players";
3695 reattach $_ for values %PLAYER; 3725 reattach $_ for values %PLAYER;
3696 3726
3727 warn "running post_load";
3728 (pop @POST_INIT)->(1) while @POST_INIT;
3729
3697 warn "leaving sync_job"; 3730 warn "leaving sync_job";
3698 3731
3699 1 3732 1
3700 } or do { 3733 } or do {
3701 warn $@; 3734 warn $@;
3702 cf::cleanup "error while reloading, exiting."; 3735 cf::cleanup "error while reloading, exiting.";
3703 }; 3736 };
3704 3737
3705 warn "reloaded"; 3738 warn "reloaded";
3739 --$RELOAD;
3740 }
3706}; 3741};
3707 3742
3708our $RELOAD_WATCHER; # used only during reload 3743our $RELOAD_WATCHER; # used only during reload
3709 3744
3710sub reload_perl() { 3745sub reload_perl() {
3711 # doing reload synchronously and two reloads happen back-to-back, 3746 # doing reload synchronously and two reloads happen back-to-back,
3712 # coro crashes during coro_state_free->destroy here. 3747 # coro crashes during coro_state_free->destroy here.
3713 3748
3714 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3749 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
3715 do_reload_perl; 3750 do_reload_perl;
3716 undef $RELOAD_WATCHER; 3751 undef $RELOAD_WATCHER;
3717 }; 3752 };
3718} 3753}
3719 3754
… …
3847 $msg =~ s/\n//; 3882 $msg =~ s/\n//;
3848 3883
3849 # limit the # of concurrent backtraces 3884 # limit the # of concurrent backtraces
3850 if ($_log_backtrace < 2) { 3885 if ($_log_backtrace < 2) {
3851 ++$_log_backtrace; 3886 ++$_log_backtrace;
3887 my $perl_bt = Carp::longmess $msg;
3852 async { 3888 async {
3853 $Coro::current->{desc} = "abt $msg"; 3889 $Coro::current->{desc} = "abt $msg";
3854 3890
3855 my @bt = fork_call { 3891 my @bt = fork_call {
3856 @addr = map { sprintf "%x", $_ } @addr; 3892 @addr = map { sprintf "%x", $_ } @addr;
… …
3867 } 3903 }
3868 3904
3869 @funcs 3905 @funcs
3870 }; 3906 };
3871 3907
3872 LOG llevInfo, "[ABT] $msg\n"; 3908 LOG llevInfo, "[ABT] $perl_bt\n";
3909 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3873 LOG llevInfo, "[ABT] $_\n" for @bt; 3910 LOG llevInfo, "[ABT] $_\n" for @bt;
3874 --$_log_backtrace; 3911 --$_log_backtrace;
3875 }; 3912 };
3876 } else { 3913 } else {
3877 LOG llevInfo, "[ABT] $msg\n"; 3914 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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