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.468 by root, Thu Jan 8 19:23:44 2009 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 qw(vars subs);
26 27
27use Symbol; 28use Symbol;
28use List::Util; 29use List::Util;
29use Socket; 30use Socket;
30use EV; 31use EV;
31use Opcode; 32use Opcode;
32use Safe; 33use Safe;
33use Safe::Hole; 34use Safe::Hole;
34use Storable (); 35use Storable ();
35 36
37use Guard ();
36use Coro (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
39use Coro::AnyEvent; 42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
43use Coro::AnyEvent; 47use Coro::AnyEvent;
44use Coro::AIO; 48use Coro::AIO;
45use Coro::BDB 1.6; 49use Coro::BDB 1.6;
46use Coro::Storable; 50use Coro::Storable;
47use Coro::Util (); 51use Coro::Util ();
… …
61 65
62# configure various modules to our taste 66# configure various modules to our taste
63# 67#
64$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
65Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 69Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
70
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72
73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
66Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::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 76
70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
71 78
72our %COMMAND = (); 79our %COMMAND = ();
73our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
… …
76our %EXTCMD = (); 83our %EXTCMD = ();
77our %EXTICMD = (); 84our %EXTICMD = ();
78our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
79our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
80 87
81our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
82our @EVENT; 89our @EVENT;
83 90
84our $CONFDIR = confdir; 91our $CONFDIR = confdir;
85our $DATADIR = datadir; 92our $DATADIR = datadir;
86our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
87our $PODDIR = "$DATADIR/pod"; 94our $PODDIR = "$DATADIR/pod";
88our $MAPDIR = "$DATADIR/" . mapdir; 95our $MAPDIR = "$DATADIR/" . mapdir;
89our $LOCALDIR = localdir; 96our $LOCALDIR = localdir;
90our $TMPDIR = "$LOCALDIR/" . tmpdir; 97our $TMPDIR = "$LOCALDIR/" . tmpdir;
91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
92our $PLAYERDIR = "$LOCALDIR/" . playerdir; 99our $PLAYERDIR = "$LOCALDIR/" . playerdir;
93our $RANDOMDIR = "$LOCALDIR/random"; 100our $RANDOMDIR = "$LOCALDIR/random";
94our $BDBDIR = "$LOCALDIR/db"; 101our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime";
104
95our %RESOURCE; 105our %RESOURCE;
96 106
97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
99our $NEXT_TICK; 109our $NEXT_TICK;
… …
102our $BDB_DEADLOCK_WATCHER; 112our $BDB_DEADLOCK_WATCHER;
103our $BDB_CHECKPOINT_WATCHER; 113our $BDB_CHECKPOINT_WATCHER;
104our $BDB_TRICKLE_WATCHER; 114our $BDB_TRICKLE_WATCHER;
105our $DB_ENV; 115our $DB_ENV;
106 116
117our @EXTRA_MODULES = qw(pod mapscript);
118
107our %CFG; 119our %CFG;
108 120
109our $UPTIME; $UPTIME ||= time; 121our $UPTIME; $UPTIME ||= time;
110our $RUNTIME; 122our $RUNTIME;
111our $NOW; 123our $NOW;
… …
120our $LOAD; # a number between 0 (idle) and 1 (too many objects) 132our $LOAD; # a number between 0 (idle) and 1 (too many objects)
121our $LOADAVG; # same thing, but with alpha-smoothing 133our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter 134our $JITTER; # average jitter
123our $TICK_START; # for load detecting purposes 135our $TICK_START; # for load detecting purposes
124 136
137our @POST_INIT;
138
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
140
125binmode STDOUT; 141binmode STDOUT;
126binmode STDERR; 142binmode STDERR;
127 143
128# read virtual server time, if available 144# read virtual server time, if available
129unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 145unless ($RUNTIME || !-e $RUNTIMEFILE) {
130 open my $fh, "<", "$LOCALDIR/runtime" 146 open my $fh, "<", $RUNTIMEFILE
131 or die "unable to read runtime file: $!"; 147 or die "unable to read $RUNTIMEFILE file: $!";
132 $RUNTIME = <$fh> + 0.; 148 $RUNTIME = <$fh> + 0.;
133} 149}
150
151eval "sub TICK() { $TICK } 1" or die;
134 152
135mkdir $_ 153mkdir $_
136 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 154 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
137 155
138our $EMERGENCY_POSITION; 156our $EMERGENCY_POSITION;
… …
246 cf::client cf::player 264 cf::client cf::player
247 cf::arch cf::living 265 cf::arch cf::living
248 cf::map cf::mapspace 266 cf::map cf::mapspace
249 cf::party cf::region 267 cf::party cf::region
250)) { 268)) {
251 no strict 'refs';
252 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
253} 270}
254 271
255$EV::DIED = sub { 272$EV::DIED = sub {
256 warn "error in event callback: @_"; 273 warn "error in event callback: @_";
… …
298our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 315our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
299 316
300sub encode_json($) { $json_coder->encode ($_[0]) } 317sub encode_json($) { $json_coder->encode ($_[0]) }
301sub decode_json($) { $json_coder->decode ($_[0]) } 318sub decode_json($) { $json_coder->decode ($_[0]) }
302 319
320=item cf::post_init { BLOCK }
321
322Execute the given codeblock, I<after> all extensions have been (re-)loaded,
323but I<before> the server starts ticking again.
324
325The cdoeblock will have a single boolean argument to indicate whether this
326is a reload or not.
327
328=cut
329
330sub post_init(&) {
331 push @POST_INIT, shift;
332}
333
303=item cf::lock_wait $string 334=item cf::lock_wait $string
304 335
305Wait until the given lock is available. See cf::lock_acquire. 336Wait until the given lock is available. See cf::lock_acquire.
306 337
307=item my $lock = cf::lock_acquire $string 338=item my $lock = cf::lock_acquire $string
308 339
309Wait until the given lock is available and then acquires it and returns 340Wait until the given lock is available and then acquires it and returns
310a Coro::guard object. If the guard object gets destroyed (goes out of scope, 341a L<Guard> object. If the guard object gets destroyed (goes out of scope,
311for example when the coroutine gets canceled), the lock is automatically 342for example when the coroutine gets canceled), the lock is automatically
312returned. 343returned.
313 344
314Locks are *not* recursive, locking from the same coro twice results in a 345Locks are *not* recursive, locking from the same coro twice results in a
315deadlocked coro. 346deadlocked coro.
… …
321 352
322Return true if the lock is currently active, i.e. somebody has locked it. 353Return true if the lock is currently active, i.e. somebody has locked it.
323 354
324=cut 355=cut
325 356
326our %LOCK; 357our $LOCKS = new Coro::SemaphoreSet;
327our %LOCKER;#d#
328 358
329sub lock_wait($) { 359sub lock_wait($) {
330 my ($key) = @_; 360 $LOCKS->wait ($_[0]);
331
332 if ($LOCKER{$key} == $Coro::current) {#d#
333 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
334 return;#d#
335 }#d#
336
337 # wait for lock, if any
338 while ($LOCK{$key}) {
339 push @{ $LOCK{$key} }, $Coro::current;
340 Coro::schedule;
341 }
342} 361}
343 362
344sub lock_acquire($) { 363sub lock_acquire($) {
345 my ($key) = @_; 364 $LOCKS->guard ($_[0])
346
347 # wait, to be sure we are not locked
348 lock_wait $key;
349
350 $LOCK{$key} = [];
351 $LOCKER{$key} = $Coro::current;#d#
352
353 Coro::guard {
354 delete $LOCKER{$key};#d#
355 # wake up all waiters, to be on the safe side
356 $_->ready for @{ delete $LOCK{$key} };
357 }
358} 365}
359 366
360sub lock_active($) { 367sub lock_active($) {
361 my ($key) = @_; 368 $LOCKS->count ($_[0]) < 1
362
363 ! ! $LOCK{$key}
364} 369}
365 370
366sub freeze_mainloop { 371sub freeze_mainloop {
367 tick_inhibit_inc; 372 tick_inhibit_inc;
368 373
369 Coro::guard \&tick_inhibit_dec; 374 &Guard::guard (\&tick_inhibit_dec);
370} 375}
371 376
372=item cf::periodic $interval, $cb 377=item cf::periodic $interval, $cb
373 378
374Like EV::periodic, but randomly selects a starting point so that the actions 379Like EV::periodic, but randomly selects a starting point so that the actions
… …
726 731
727############################################################################# 732#############################################################################
728 733
729=head2 ATTACHABLE OBJECTS 734=head2 ATTACHABLE OBJECTS
730 735
731Many objects in crossfire are so-called attachable objects. That means you can 736Many objects in deliantra are so-called attachable objects. That means you can
732attach callbacks/event handlers (a collection of which is called an "attachment") 737attach callbacks/event handlers (a collection of which is called an "attachment")
733to it. All such attachable objects support the following methods. 738to it. All such attachable objects support the following methods.
734 739
735In the following description, CLASS can be any of C<global>, C<object> 740In 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 741C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
786=item cf::CLASS::attachment $name, ... 791=item cf::CLASS::attachment $name, ...
787 792
788Register an attachment by C<$name> through which attachable objects of the 793Register an attachment by C<$name> through which attachable objects of the
789given CLASS can refer to this attachment. 794given CLASS can refer to this attachment.
790 795
791Some classes such as crossfire maps and objects can specify attachments 796Some classes such as deliantra maps and objects can specify attachments
792that are attached at load/instantiate time, thus the need for a name. 797that are attached at load/instantiate time, thus the need for a name.
793 798
794These calls expect any number of the following handler/hook descriptions: 799These calls expect any number of the following handler/hook descriptions:
795 800
796=over 4 801=over 4
… …
1087 1092
1088sub reattach { 1093sub reattach {
1089 # basically do the same as instantiate, without calling instantiate 1094 # basically do the same as instantiate, without calling instantiate
1090 my ($obj) = @_; 1095 my ($obj) = @_;
1091 1096
1097 # no longer needed after getting rid of delete_package?
1092 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1098 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1093 1099
1094 my $registry = $obj->registry; 1100 my $registry = $obj->registry;
1095 1101
1096 @$registry = (); 1102 @$registry = ();
1097 1103
… …
1162 } else { 1168 } else {
1163 aio_unlink "$filename.pst"; 1169 aio_unlink "$filename.pst";
1164 } 1170 }
1165 1171
1166 aio_rename "$filename~", $filename; 1172 aio_rename "$filename~", $filename;
1173
1174 $filename =~ s%/[^/]+$%%;
1175 aio_pathsync $filename if $cf::USE_FSYNC;
1167 } else { 1176 } else {
1168 warn "FATAL: $filename~: $!\n"; 1177 warn "unable to save objects: $filename~: $!\n";
1169 } 1178 }
1170 } else { 1179 } else {
1171 aio_unlink $filename; 1180 aio_unlink $filename;
1172 aio_unlink "$filename.pst"; 1181 aio_unlink "$filename.pst";
1173 } 1182 }
… …
1264 my ($name, $cb) = @_; 1273 my ($name, $cb) = @_;
1265 1274
1266 $EXTICMD{$name} = $cb; 1275 $EXTICMD{$name} = $cb;
1267} 1276}
1268 1277
1278use File::Glob ();
1279
1269cf::player->attach ( 1280cf::player->attach (
1270 on_command => sub { 1281 on_command => sub {
1271 my ($pl, $name, $params) = @_; 1282 my ($pl, $name, $params) = @_;
1272 1283
1273 my $cb = $COMMAND{$name} 1284 my $cb = $COMMAND{$name}
… …
1305 1316
1306 cf::override; 1317 cf::override;
1307 }, 1318 },
1308); 1319);
1309 1320
1321# "readahead" all extensions
1322sub cache_extensions {
1323 my $grp = IO::AIO::aio_group;
1324
1325 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1326 for (grep /\.ext$/, @{$_[0]}) {
1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328 }
1329 };
1330
1331 $grp
1332}
1333
1310sub load_extensions { 1334sub load_extensions {
1311 cf::sync_job { 1335 cf::sync_job {
1312 my %todo; 1336 my %todo;
1313 1337
1314 for my $path (<$LIBDIR/*.ext>) { 1338 for my $path (<$LIBDIR/*.ext>) {
… …
1333 1357
1334 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1358 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1335 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1359 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1336 1360
1337 $ext{source} = 1361 $ext{source} =
1338 "package $pkg; use strict; use utf8;\n" 1362 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1339 . "#line 1 \"$path\"\n{\n" 1363 . "#line 1 \"$path\"\n{\n"
1340 . $source 1364 . $source
1341 . "\n};\n1"; 1365 . "\n};\n1";
1342 1366
1343 $todo{$base} = \%ext; 1367 $todo{$base} = \%ext;
… …
1383 1407
1384=back 1408=back
1385 1409
1386=head2 CORE EXTENSIONS 1410=head2 CORE EXTENSIONS
1387 1411
1388Functions and methods that extend core crossfire objects. 1412Functions and methods that extend core deliantra objects.
1389 1413
1390=cut 1414=cut
1391 1415
1392package cf::player; 1416package cf::player;
1393 1417
… …
1436 1460
1437sub exists($) { 1461sub exists($) {
1438 my ($login) = @_; 1462 my ($login) = @_;
1439 1463
1440 $cf::PLAYER{$login} 1464 $cf::PLAYER{$login}
1441 or cf::sync_job { !aio_stat path $login } 1465 or !aio_stat path $login
1442} 1466}
1443 1467
1444sub find($) { 1468sub find($) {
1445 return $cf::PLAYER{$_[0]} || do { 1469 return $cf::PLAYER{$_[0]} || do {
1446 my $login = $_[0]; 1470 my $login = $_[0];
… …
1521 my ($pl) = @_; 1545 my ($pl) = @_;
1522 1546
1523 my $name = $pl->ob->name; 1547 my $name = $pl->ob->name;
1524 1548
1525 $pl->{deny_save} = 1; 1549 $pl->{deny_save} = 1;
1526 $pl->password ("*"); # this should lock out the player until we nuked the dir 1550 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1527 1551
1528 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1552 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1529 $pl->deactivate; 1553 $pl->deactivate;
1530 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1554 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1531 $pl->ob->check_score; 1555 $pl->ob->check_score;
… …
1617 } 1641 }
1618 1642
1619 \@paths 1643 \@paths
1620} 1644}
1621 1645
1622=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1646=item $protocol_xml = $player->expand_cfpod ($cfpod)
1623 1647
1624Expand crossfire pod fragments into protocol xml. 1648Expand 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 1649
1715=item $player->ext_reply ($msgid, @msg) 1650=item $player->ext_reply ($msgid, @msg)
1716 1651
1717Sends an ext reply to the player. 1652Sends an ext reply to the player.
1718 1653
… …
1931 1866
1932 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1933 "$UNIQUEDIR/$path" 1868 "$UNIQUEDIR/$path"
1934} 1869}
1935 1870
1936# and all this just because we cannot iterate over
1937# all maps in C++...
1938sub change_all_map_light {
1939 my ($change) = @_;
1940
1941 $_->change_map_light ($change)
1942 for grep $_->outdoor, values %cf::MAP;
1943}
1944
1945sub decay_objects { 1871sub decay_objects {
1946 my ($self) = @_; 1872 my ($self) = @_;
1947 1873
1948 return if $self->{deny_reset}; 1874 return if $self->{deny_reset};
1949 1875
… …
2031sub find { 1957sub find {
2032 my ($path, $origin) = @_; 1958 my ($path, $origin) = @_;
2033 1959
2034 $path = normalise $path, $origin && $origin->path; 1960 $path = normalise $path, $origin && $origin->path;
2035 1961
2036 cf::lock_wait "map_data:$path";#d#remove 1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2037 cf::lock_wait "map_find:$path"; 1963 my $guard2 = cf::lock_acquire "map_find:$path";
2038 1964
2039 $cf::MAP{$path} || do { 1965 $cf::MAP{$path} || do {
2040 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2041 my $guard2 = cf::lock_acquire "map_find:$path";
2042
2043 my $map = new_from_path cf::map $path 1966 my $map = new_from_path cf::map $path
2044 or return; 1967 or return;
2045 1968
2046 $map->{last_save} = $cf::RUNTIME; 1969 $map->{last_save} = $cf::RUNTIME;
2047 1970
… …
2114 2037
2115 unless ($self->{deny_activate}) { 2038 unless ($self->{deny_activate}) {
2116 $self->decay_objects; 2039 $self->decay_objects;
2117 $self->fix_auto_apply; 2040 $self->fix_auto_apply;
2118 $self->update_buttons; 2041 $self->update_buttons;
2119 cf::cede_to_tick;
2120 $self->set_darkness_map;
2121 cf::cede_to_tick; 2042 cf::cede_to_tick;
2122 $self->activate; 2043 $self->activate;
2123 } 2044 }
2124 2045
2125 $self->{last_save} = $cf::RUNTIME; 2046 $self->{last_save} = $cf::RUNTIME;
… …
2467 2388
2468our $SAY_CHANNEL = { 2389our $SAY_CHANNEL = {
2469 id => "say", 2390 id => "say",
2470 title => "Map", 2391 title => "Map",
2471 reply => "say ", 2392 reply => "say ",
2472 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2393 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2473}; 2394};
2474 2395
2475our $CHAT_CHANNEL = { 2396our $CHAT_CHANNEL = {
2476 id => "chat", 2397 id => "chat",
2477 title => "Chat", 2398 title => "Chat",
… …
2532 2453
2533=item $player_object->enter_link 2454=item $player_object->enter_link
2534 2455
2535Freezes the player and moves him/her to a special map (C<{link}>). 2456Freezes the player and moves him/her to a special map (C<{link}>).
2536 2457
2537The player should be reasonably safe there for short amounts of time. You 2458The player should be reasonably safe there for short amounts of time (e.g.
2538I<MUST> call C<leave_link> as soon as possible, though. 2459for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2460though, as the palyer cannot control the character while it is on the link
2461map.
2539 2462
2540Will never block. 2463Will never block.
2541 2464
2542=item $player_object->leave_link ($map, $x, $y) 2465=item $player_object->leave_link ($map, $x, $y)
2543 2466
… …
2601 2524
2602 $map->load; 2525 $map->load;
2603 $map->load_neighbours; 2526 $map->load_neighbours;
2604 2527
2605 return unless $self->contr->active; 2528 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2606 $self->activate_recursive; 2530 $self->activate_recursive;
2607 2531
2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2609 $self->enter_map ($map, $x, $y); 2533 $self->enter_map ($map, $x, $y);
2610} 2534}
… …
2773 $self->contr->savebed ($map, $x, $y) 2697 $self->contr->savebed ($map, $x, $y)
2774 if $exit->flag (cf::FLAG_DAMNED); 2698 if $exit->flag (cf::FLAG_DAMNED);
2775 2699
2776 1 2700 1
2777 }) { 2701 }) {
2778 $self->message ("Something went wrong deep within the crossfire server. " 2702 $self->message ("Something went wrong deep within the deliantra server. "
2779 . "I'll try to bring you back to the map you were before. " 2703 . "I'll try to bring you back to the map you were before. "
2780 . "Please report this to the dungeon master!", 2704 . "Please report this to the dungeon master!",
2781 cf::NDI_UNIQUE | cf::NDI_RED); 2705 cf::NDI_UNIQUE | cf::NDI_RED);
2782 2706
2783 warn "ERROR in enter_exit: $@"; 2707 warn "ERROR in enter_exit: $@";
… …
2849 id => "infobox", 2773 id => "infobox",
2850 title => "Body Parts", 2774 title => "Body Parts",
2851 reply => undef, 2775 reply => undef,
2852 tooltip => "Shows which body parts you posess and are available", 2776 tooltip => "Shows which body parts you posess and are available",
2853 }, 2777 },
2778 "c/statistics" => {
2779 id => "infobox",
2780 title => "Statistics",
2781 reply => undef,
2782 tooltip => "Shows your primary statistics",
2783 },
2784 "c/skills" => {
2785 id => "infobox",
2786 title => "Skills",
2787 reply => undef,
2788 tooltip => "Shows your experience per skill and item power",
2789 },
2790 "c/resistances" => {
2791 id => "infobox",
2792 title => "Resistances",
2793 reply => undef,
2794 tooltip => "Shows your resistances",
2795 },
2796 "c/pets" => {
2797 id => "infobox",
2798 title => "Pets",
2799 reply => undef,
2800 tooltip => "Shows information abotu your pets/a specific pet",
2801 },
2854 "c/uptime" => { 2802 "c/uptime" => {
2855 id => "infobox", 2803 id => "infobox",
2856 title => "Uptime", 2804 title => "Uptime",
2857 reply => undef, 2805 reply => undef,
2858 tooltip => "How long the server has been running since last restart", 2806 tooltip => "How long the server has been running since last restart",
… …
2867 id => "party", 2815 id => "party",
2868 title => "Party", 2816 title => "Party",
2869 reply => "gsay ", 2817 reply => "gsay ",
2870 tooltip => "Messages and chat related to your party", 2818 tooltip => "Messages and chat related to your party",
2871 }, 2819 },
2820 "c/death" => {
2821 id => "death",
2822 title => "Death",
2823 reply => undef,
2824 tooltip => "Reason for and more info about your most recent death",
2825 },
2826 "c/say" => $SAY_CHANNEL,
2827 "c/chat" => $CHAT_CHANNEL,
2872); 2828);
2873 2829
2874sub cf::client::send_msg { 2830sub cf::client::send_msg {
2875 my ($self, $channel, $msg, $color, @extra) = @_; 2831 my ($self, $channel, $msg, $color, @extra) = @_;
2876 2832
2877 $msg = $self->pl->expand_cfpod ($msg); 2833 $msg = $self->pl->expand_cfpod ($msg)
2834 unless $color & cf::NDI_VERBATIM;
2878 2835
2879 $color &= cf::NDI_CLIENT_MASK; # just in case... 2836 $color &= cf::NDI_CLIENT_MASK; # just in case...
2880 2837
2881 # check predefined channels, for the benefit of C 2838 # check predefined channels, for the benefit of C
2882 if ($CHANNEL{$channel}) { 2839 if ($CHANNEL{$channel}) {
2883 $channel = $CHANNEL{$channel}; 2840 $channel = $CHANNEL{$channel};
2884 2841
2885 $self->ext_msg (channel_info => $channel) 2842 $self->ext_msg (channel_info => $channel);
2886 if $self->can_msg;
2887
2888 $channel = $channel->{id}; 2843 $channel = $channel->{id};
2889 2844
2890 } elsif (ref $channel) { 2845 } elsif (ref $channel) {
2891 # send meta info to client, if not yet sent 2846 # send meta info to client, if not yet sent
2892 unless (exists $self->{channel}{$channel->{id}}) { 2847 unless (exists $self->{channel}{$channel->{id}}) {
2893 $self->{channel}{$channel->{id}} = $channel; 2848 $self->{channel}{$channel->{id}} = $channel;
2894 $self->ext_msg (channel_info => $channel) 2849 $self->ext_msg (channel_info => $channel);
2895 if $self->can_msg;
2896 } 2850 }
2897 2851
2898 $channel = $channel->{id}; 2852 $channel = $channel->{id};
2899 } 2853 }
2900 2854
2901 return unless @extra || length $msg; 2855 return unless @extra || length $msg;
2902 2856
2903 if ($self->can_msg) {
2904 # default colour, mask it out 2857 # default colour, mask it out
2905 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2858 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2906 if $color & cf::NDI_DEF; 2859 if $color & cf::NDI_DEF;
2907 2860
2908 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2861 my $pkt = "msg "
2862 . $self->{json_coder}->encode (
2909 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2910 } else { 2864 );
2911 if ($color >= 0) {
2912 # replace some tags by gcfclient-compatible ones
2913 for ($msg) {
2914 1 while
2915 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2916 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2917 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2918 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2919 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2920 }
2921 2865
2922 $color &= cf::NDI_COLOR_MASK; 2866 # try lzf for large packets
2867 $pkt = "lzf " . Compress::LZF::compress $pkt
2868 if 1024 <= length $pkt and $self->{can_lzf};
2923 2869
2924 utf8::encode $msg; 2870 # split very large packets
2925 2871 if (8192 < length $pkt and $self->{can_lzf}) {
2926 if (0 && $msg =~ /\[/) { 2872 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2927 # COMMAND/INFO 2873 $pkt = "frag";
2928 $self->send_packet ("drawextinfo $color 10 8 $msg")
2929 } else {
2930 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2931 $self->send_packet ("drawinfo $color $msg")
2932 }
2933 }
2934 } 2874 }
2875
2876 $self->send_packet ($pkt);
2935} 2877}
2936 2878
2937=item $client->ext_msg ($type, @msg) 2879=item $client->ext_msg ($type, @msg)
2938 2880
2939Sends an ext event to the client. 2881Sends an ext event to the client.
… …
3114The following functions and methods are available within a safe environment: 3056The following functions and methods are available within a safe environment:
3115 3057
3116 cf::object 3058 cf::object
3117 contr pay_amount pay_player map x y force_find force_add destroy 3059 contr pay_amount pay_player map x y force_find force_add destroy
3118 insert remove name archname title slaying race decrease split 3060 insert remove name archname title slaying race decrease split
3061 value
3119 3062
3120 cf::object::player 3063 cf::object::player
3121 player 3064 player
3122 3065
3123 cf::player 3066 cf::player
… …
3129=cut 3072=cut
3130 3073
3131for ( 3074for (
3132 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3075 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3133 insert remove inv nrof name archname title slaying race 3076 insert remove inv nrof name archname title slaying race
3134 decrease split destroy change_exp)], 3077 decrease split destroy change_exp value msg lore send_msg)],
3135 ["cf::object::player" => qw(player)], 3078 ["cf::object::player" => qw(player)],
3136 ["cf::player" => qw(peaceful)], 3079 ["cf::player" => qw(peaceful send_msg)],
3137 ["cf::map" => qw(trigger)], 3080 ["cf::map" => qw(trigger)],
3138) { 3081) {
3139 no strict 'refs'; 3082 no strict 'refs';
3140 my ($pkg, @funs) = @$_; 3083 my ($pkg, @funs) = @$_;
3141 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3084 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3158 my ($code, %vars) = @_; 3101 my ($code, %vars) = @_;
3159 3102
3160 my $qcode = $code; 3103 my $qcode = $code;
3161 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3162 $qcode =~ s/\n/\\n/g; 3105 $qcode =~ s/\n/\\n/g;
3106
3107 %vars = (_dummy => 0) unless %vars;
3163 3108
3164 local $_; 3109 local $_;
3165 local @safe::cf::_safe_eval_args = values %vars; 3110 local @safe::cf::_safe_eval_args = values %vars;
3166 3111
3167 my $eval = 3112 my $eval =
… …
3397 reload_treasures; 3342 reload_treasures;
3398 3343
3399 warn "finished reloading resource files\n"; 3344 warn "finished reloading resource files\n";
3400} 3345}
3401 3346
3402sub init {
3403 my $guard = freeze_mainloop;
3404
3405 evthread_start IO::AIO::poll_fileno;
3406
3407 reload_resources;
3408}
3409
3410sub reload_config { 3347sub reload_config {
3411 open my $fh, "<:utf8", "$CONFDIR/config" 3348 open my $fh, "<:utf8", "$CONFDIR/config"
3412 or return; 3349 or return;
3413 3350
3414 local $/; 3351 local $/;
… …
3426 }; 3363 };
3427 warn $@ if $@; 3364 warn $@ if $@;
3428 } 3365 }
3429} 3366}
3430 3367
3368sub pidfile() {
3369 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3370 or die "$PIDFILE: $!";
3371 flock $fh, &Fcntl::LOCK_EX
3372 or die "$PIDFILE: flock: $!";
3373 $fh
3374}
3375
3376# make sure only one server instance is running at any one time
3377sub atomic {
3378 my $fh = pidfile;
3379
3380 my $pid = <$fh>;
3381 kill 9, $pid if $pid > 0;
3382
3383 seek $fh, 0, 0;
3384 print $fh $$;
3385}
3386
3431sub main { 3387sub main {
3388 cf::init_globals; # initialise logging
3389
3390 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3391 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3392 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3393 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3394
3395 cf::init_experience;
3396 cf::init_anim;
3397 cf::init_attackmess;
3398 cf::init_dynamic;
3399
3400 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3401
3432 # we must not ever block the main coroutine 3402 # we must not ever block the main coroutine
3433 local $Coro::idle = sub { 3403 local $Coro::idle = sub {
3434 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3404 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3435 (async { 3405 (async {
3436 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3406 $Coro::current->{desc} = "IDLE BUG HANDLER";
3437 EV::loop EV::LOOP_ONESHOT; 3407 EV::loop EV::LOOP_ONESHOT;
3438 })->prio (Coro::PRIO_MAX); 3408 })->prio (Coro::PRIO_MAX);
3439 }; 3409 };
3440 3410
3441 { 3411 evthread_start IO::AIO::poll_fileno;
3442 my $guard = freeze_mainloop; 3412
3413 cf::sync_job {
3414 reload_resources;
3443 reload_config; 3415 reload_config;
3444 db_init; 3416 db_init;
3417
3418 cf::load_settings;
3419 cf::load_materials;
3420 cf::init_uuid;
3421 cf::init_signals;
3422 cf::init_commands;
3423 cf::init_skills;
3424
3425 cf::init_beforeplay;
3426
3427 atomic;
3428
3445 load_extensions; 3429 load_extensions;
3446 3430
3447 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3431 utime time, time, $RUNTIMEFILE;
3432
3433 # no (long-running) fork's whatsoever before this point(!)
3434 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3435
3436 (pop @POST_INIT)->(0) while @POST_INIT;
3448 } 3437 };
3449 3438
3450 EV::loop; 3439 EV::loop;
3451} 3440}
3452 3441
3453############################################################################# 3442#############################################################################
… …
3462 }; 3451 };
3463 } 3452 }
3464} 3453}
3465 3454
3466sub write_runtime_sync { 3455sub write_runtime_sync {
3467 my $runtime = "$LOCALDIR/runtime";
3468
3469 # first touch the runtime file to show we are still running: 3456 # first touch the runtime file to show we are still running:
3470 # the fsync below can take a very very long time. 3457 # the fsync below can take a very very long time.
3471 3458
3472 IO::AIO::aio_utime $runtime, undef, undef; 3459 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3473 3460
3474 my $guard = cf::lock_acquire "write_runtime"; 3461 my $guard = cf::lock_acquire "write_runtime";
3475 3462
3476 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3463 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3477 or return; 3464 or return;
3478 3465
3479 my $value = $cf::RUNTIME + 90 + 10; 3466 my $value = $cf::RUNTIME + 90 + 10;
3480 # 10 is the runtime save interval, for a monotonic clock 3467 # 10 is the runtime save interval, for a monotonic clock
3481 # 60 allows for the watchdog to kill the server. 3468 # 60 allows for the watchdog to kill the server.
… …
3491 aio_utime $fh, undef, undef; 3478 aio_utime $fh, undef, undef;
3492 3479
3493 close $fh 3480 close $fh
3494 or return; 3481 or return;
3495 3482
3496 aio_rename "$runtime~", $runtime 3483 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3497 and return; 3484 and return;
3498 3485
3499 warn "runtime file written.\n"; 3486 warn "runtime file written.\n";
3500 3487
3501 1 3488 1
… …
3513 my $uuid = "$LOCALDIR/uuid"; 3500 my $uuid = "$LOCALDIR/uuid";
3514 3501
3515 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3502 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3516 or return; 3503 or return;
3517 3504
3518 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3505 my $value = uuid_seq uuid_cur;
3506
3507 unless ($value) {
3508 warn "cowardly refusing to write zero uuid value!\n";
3509 return;
3510 }
3511
3512 my $value = uuid_str $value + $uuid_skip;
3519 $uuid_skip = 0; 3513 $uuid_skip = 0;
3520 3514
3521 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3515 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3522 and return; 3516 and return;
3523 3517
… …
3545} 3539}
3546 3540
3547sub emergency_save() { 3541sub emergency_save() {
3548 my $freeze_guard = cf::freeze_mainloop; 3542 my $freeze_guard = cf::freeze_mainloop;
3549 3543
3550 warn "enter emergency perl save\n"; 3544 warn "emergency_perl_save: enter\n";
3551 3545
3552 cf::sync_job { 3546 cf::sync_job {
3547 # this is a trade-off: we want to be very quick here, so
3548 # save all maps without fsync, and later call a global sync
3549 # (which in turn might be very very slow)
3550 local $USE_FSYNC = 0;
3551
3553 # use a peculiar iteration method to avoid tripping on perl 3552 # use a peculiar iteration method to avoid tripping on perl
3554 # refcount bugs in for. also avoids problems with players 3553 # refcount bugs in for. also avoids problems with players
3555 # and maps saved/destroyed asynchronously. 3554 # and maps saved/destroyed asynchronously.
3556 warn "begin emergency player save\n"; 3555 warn "emergency_perl_save: begin player save\n";
3557 for my $login (keys %cf::PLAYER) { 3556 for my $login (keys %cf::PLAYER) {
3558 my $pl = $cf::PLAYER{$login} or next; 3557 my $pl = $cf::PLAYER{$login} or next;
3559 $pl->valid or next; 3558 $pl->valid or next;
3560 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3561 $pl->save; 3560 $pl->save;
3562 } 3561 }
3563 warn "end emergency player save\n"; 3562 warn "emergency_perl_save: end player save\n";
3564 3563
3565 warn "begin emergency map save\n"; 3564 warn "emergency_perl_save: begin map save\n";
3566 for my $path (keys %cf::MAP) { 3565 for my $path (keys %cf::MAP) {
3567 my $map = $cf::MAP{$path} or next; 3566 my $map = $cf::MAP{$path} or next;
3568 $map->valid or next; 3567 $map->valid or next;
3569 $map->save; 3568 $map->save;
3570 } 3569 }
3571 warn "end emergency map save\n"; 3570 warn "emergency_perl_save: end map save\n";
3572 3571
3573 warn "begin emergency database checkpoint\n"; 3572 warn "emergency_perl_save: begin database checkpoint\n";
3574 BDB::db_env_txn_checkpoint $DB_ENV; 3573 BDB::db_env_txn_checkpoint $DB_ENV;
3575 warn "end emergency database checkpoint\n"; 3574 warn "emergency_perl_save: end database checkpoint\n";
3576 3575
3577 warn "begin write uuid\n"; 3576 warn "emergency_perl_save: begin write uuid\n";
3578 write_uuid_sync 1; 3577 write_uuid_sync 1;
3579 warn "end write uuid\n"; 3578 warn "emergency_perl_save: end write uuid\n";
3580 }; 3579 };
3581 3580
3581 warn "emergency_perl_save: starting sync()\n";
3582 IO::AIO::aio_sync sub {
3583 warn "emergency_perl_save: finished sync()\n";
3584 };
3585
3582 warn "leave emergency perl save\n"; 3586 warn "emergency_perl_save: leave\n";
3583} 3587}
3584 3588
3585sub post_cleanup { 3589sub post_cleanup {
3586 my ($make_core) = @_; 3590 my ($make_core) = @_;
3587 3591
3588 warn Carp::longmess "post_cleanup backtrace" 3592 warn Carp::longmess "post_cleanup backtrace"
3589 if $make_core; 3593 if $make_core;
3594
3595 my $fh = pidfile;
3596 unlink $PIDFILE if <$fh> == $$;
3597}
3598
3599# a safer delete_package, copied from Symbol
3600sub clear_package($) {
3601 my $pkg = shift;
3602
3603 # expand to full symbol table name if needed
3604 unless ($pkg =~ /^main::.*::$/) {
3605 $pkg = "main$pkg" if $pkg =~ /^::/;
3606 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3607 $pkg .= '::' unless $pkg =~ /::$/;
3608 }
3609
3610 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3611 my $stem_symtab = *{$stem}{HASH};
3612
3613 defined $stem_symtab and exists $stem_symtab->{$leaf}
3614 or return;
3615
3616 # clear all symbols
3617 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3618 for my $name (keys %$leaf_symtab) {
3619 _gv_clear *{"$pkg$name"};
3620# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3621 }
3622 warn "cleared package $pkg\n";#d#
3590} 3623}
3591 3624
3592sub do_reload_perl() { 3625sub do_reload_perl() {
3593 # can/must only be called in main 3626 # can/must only be called in main
3594 if ($Coro::current != $Coro::main) { 3627 if ($Coro::current != $Coro::main) {
3595 warn "can only reload from main coroutine"; 3628 warn "can only reload from main coroutine";
3596 return; 3629 return;
3597 } 3630 }
3598 3631
3632 return if $RELOAD++;
3633
3634 my $t1 = EV::time;
3635
3636 while ($RELOAD) {
3599 warn "reloading..."; 3637 warn "reloading...";
3600 3638
3601 warn "entering sync_job"; 3639 warn "entering sync_job";
3602 3640
3603 cf::sync_job { 3641 cf::sync_job {
3604 cf::write_runtime_sync; # external watchdog should not bark 3642 cf::write_runtime_sync; # external watchdog should not bark
3605 cf::emergency_save; 3643 cf::emergency_save;
3606 cf::write_runtime_sync; # external watchdog should not bark 3644 cf::write_runtime_sync; # external watchdog should not bark
3607 3645
3608 warn "syncing database to disk"; 3646 warn "syncing database to disk";
3609 BDB::db_env_txn_checkpoint $DB_ENV; 3647 BDB::db_env_txn_checkpoint $DB_ENV;
3610 3648
3611 # if anything goes wrong in here, we should simply crash as we already saved 3649 # if anything goes wrong in here, we should simply crash as we already saved
3612 3650
3613 warn "flushing outstanding aio requests"; 3651 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; 3652 while (IO::AIO::nreqs || BDB::nreqs) {
3619 warn "iterate..."; 3653 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 } 3654 }
3645 3655
3646 warn "... nuking $pkg"; 3656 warn "cancelling all extension coros";
3647 Symbol::delete_package $pkg; 3657 $_->cancel for values %EXT_CORO;
3648 } 3658 %EXT_CORO = ();
3649 3659
3650 warn "unloading all perl modules loaded from $LIBDIR"; 3660 warn "removing commands";
3651 while (my ($k, $v) = each %INC) { 3661 %COMMAND = ();
3652 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3653 3662
3663 warn "removing ext/exti commands";
3664 %EXTCMD = ();
3665 %EXTICMD = ();
3666
3667 warn "unloading/nuking all extensions";
3668 for my $pkg (@EXTS) {
3654 warn "... unloading $k"; 3669 warn "... unloading $pkg";
3655 delete $INC{$k};
3656 3670
3657 $k =~ s/\.pm$//;
3658 $k =~ s/\//::/g;
3659
3660 if (my $cb = $k->can ("unload_module")) { 3671 if (my $cb = $pkg->can ("unload")) {
3672 eval {
3661 $cb->(); 3673 $cb->($pkg);
3674 1
3675 } or warn "$pkg unloaded, but with errors: $@";
3676 }
3677
3678 warn "... clearing $pkg";
3679 clear_package $pkg;
3662 } 3680 }
3663 3681
3664 Symbol::delete_package $k; 3682 warn "unloading all perl modules loaded from $LIBDIR";
3683 while (my ($k, $v) = each %INC) {
3684 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3685
3686 warn "... unloading $k";
3687 delete $INC{$k};
3688
3689 $k =~ s/\.pm$//;
3690 $k =~ s/\//::/g;
3691
3692 if (my $cb = $k->can ("unload_module")) {
3693 $cb->();
3694 }
3695
3696 clear_package $k;
3665 } 3697 }
3666 3698
3667 warn "getting rid of safe::, as good as possible"; 3699 warn "getting rid of safe::, as good as possible";
3668 Symbol::delete_package "safe::$_" 3700 clear_package "safe::$_"
3669 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3701 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3670 3702
3671 warn "unloading cf.pm \"a bit\""; 3703 warn "unloading cf.pm \"a bit\"";
3672 delete $INC{"cf.pm"}; 3704 delete $INC{"cf.pm"};
3673 delete $INC{"cf/pod.pm"}; 3705 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3674 3706
3675 # don't, removes xs symbols, too, 3707 # don't, removes xs symbols, too,
3676 # and global variables created in xs 3708 # and global variables created in xs
3677 #Symbol::delete_package __PACKAGE__; 3709 #clear_package __PACKAGE__;
3678 3710
3679 warn "unload completed, starting to reload now"; 3711 warn "unload completed, starting to reload now";
3680 3712
3681 warn "reloading cf.pm"; 3713 warn "reloading cf.pm";
3682 require cf; 3714 require cf;
3683 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3715 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3684 3716
3685 warn "loading config and database again"; 3717 warn "loading config and database again";
3686 cf::reload_config; 3718 cf::reload_config;
3687 3719
3688 warn "loading extensions"; 3720 warn "loading extensions";
3689 cf::load_extensions; 3721 cf::load_extensions;
3690 3722
3723 if ($REATTACH_ON_RELOAD) {
3691 warn "reattaching attachments to objects/players"; 3724 warn "reattaching attachments to objects/players";
3692 _global_reattach; # objects, sockets 3725 _global_reattach; # objects, sockets
3693 warn "reattaching attachments to maps"; 3726 warn "reattaching attachments to maps";
3694 reattach $_ for values %MAP; 3727 reattach $_ for values %MAP;
3695 warn "reattaching attachments to players"; 3728 warn "reattaching attachments to players";
3696 reattach $_ for values %PLAYER; 3729 reattach $_ for values %PLAYER;
3730 }
3697 3731
3732 warn "running post_init jobs";
3733 (pop @POST_INIT)->(1) while @POST_INIT;
3734
3698 warn "leaving sync_job"; 3735 warn "leaving sync_job";
3699 3736
3700 1 3737 1
3701 } or do { 3738 } or do {
3702 warn $@; 3739 warn $@;
3703 cf::cleanup "error while reloading, exiting."; 3740 cf::cleanup "error while reloading, exiting.";
3704 }; 3741 };
3705 3742
3706 warn "reloaded"; 3743 warn "reloaded";
3744 --$RELOAD;
3745 }
3746
3747 $t1 = EV::time - $t1;
3748 warn "reload completed in ${t1}s\n";
3707}; 3749};
3708 3750
3709our $RELOAD_WATCHER; # used only during reload 3751our $RELOAD_WATCHER; # used only during reload
3710 3752
3711sub reload_perl() { 3753sub reload_perl() {
3712 # doing reload synchronously and two reloads happen back-to-back, 3754 # doing reload synchronously and two reloads happen back-to-back,
3713 # coro crashes during coro_state_free->destroy here. 3755 # coro crashes during coro_state_free->destroy here.
3714 3756
3757 $RELOAD_WATCHER ||= cf::async {
3758 Coro::AIO::aio_wait cache_extensions;
3759
3715 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3760 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3716 do_reload_perl; 3761 do_reload_perl;
3717 undef $RELOAD_WATCHER; 3762 undef $RELOAD_WATCHER;
3763 };
3718 }; 3764 };
3719} 3765}
3720 3766
3721register_command "reload" => sub { 3767register_command "reload" => sub {
3722 my ($who, $arg) = @_; 3768 my ($who, $arg) = @_;
… …
3848 $msg =~ s/\n//; 3894 $msg =~ s/\n//;
3849 3895
3850 # limit the # of concurrent backtraces 3896 # limit the # of concurrent backtraces
3851 if ($_log_backtrace < 2) { 3897 if ($_log_backtrace < 2) {
3852 ++$_log_backtrace; 3898 ++$_log_backtrace;
3899 my $perl_bt = Carp::longmess $msg;
3853 async { 3900 async {
3854 $Coro::current->{desc} = "abt $msg"; 3901 $Coro::current->{desc} = "abt $msg";
3855 3902
3856 my @bt = fork_call { 3903 my @bt = fork_call {
3857 @addr = map { sprintf "%x", $_ } @addr; 3904 @addr = map { sprintf "%x", $_ } @addr;
… …
3868 } 3915 }
3869 3916
3870 @funcs 3917 @funcs
3871 }; 3918 };
3872 3919
3873 LOG llevInfo, "[ABT] $msg\n"; 3920 LOG llevInfo, "[ABT] $perl_bt\n";
3921 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3874 LOG llevInfo, "[ABT] $_\n" for @bt; 3922 LOG llevInfo, "[ABT] $_\n" for @bt;
3875 --$_log_backtrace; 3923 --$_log_backtrace;
3876 }; 3924 };
3877 } else { 3925 } else {
3878 LOG llevInfo, "[ABT] $msg\n"; 3926 LOG llevInfo, "[ABT] $msg\n";
3879 LOG llevInfo, "[ABT] [suppressed]\n"; 3927 LOG llevInfo, "[ABT] [suppressed]\n";
3880 } 3928 }
3881} 3929}
3882 3930
3883# load additional modules 3931# load additional modules
3884use cf::pod; 3932require "cf/$_.pm" for @EXTRA_MODULES;
3885 3933
3886END { cf::emergency_save } 3934END { cf::emergency_save }
3887 3935
38881 39361
3889 3937

Diff Legend

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