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.427 by root, Sat Apr 26 12:25:45 2008 UTC vs.
Revision 1.461 by root, Fri Dec 19 22:47:29 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 3.2; 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 4.50 (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
39use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
43use Coro::AIO; 48use Coro::AIO;
44use Coro::BDB; 49use Coro::BDB 1.6;
45use Coro::Storable; 50use Coro::Storable;
46use Coro::Util (); 51use Coro::Util ();
47 52
48use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
49use BDB (); 54use BDB ();
50use Data::Dumper; 55use Data::Dumper;
51use Digest::MD5; 56use Digest::MD5;
52use Fcntl; 57use Fcntl;
53use YAML (); 58use YAML ();
54use IO::AIO 2.51 (); 59use IO::AIO ();
55use Time::HiRes; 60use Time::HiRes;
56use Compress::LZF; 61use Compress::LZF;
57use Digest::MD5 (); 62use Digest::MD5 ();
63
64AnyEvent::detect;
58 65
59# configure various modules to our taste 66# configure various modules to our taste
60# 67#
61$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
62Coro::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";
63Compress::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
64
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
66 76
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 78
69our %COMMAND = (); 79our %COMMAND = ();
70our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
… …
73our %EXTCMD = (); 83our %EXTCMD = ();
74our %EXTICMD = (); 84our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
77 87
78our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 89our @EVENT;
80 90
81our $CONFDIR = confdir; 91our $CONFDIR = confdir;
82our $DATADIR = datadir; 92our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 94our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 95our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 96our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 97our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 99our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 100our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 101our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime";
104
92our %RESOURCE; 105our %RESOURCE;
93 106
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 109our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 110our $USE_FSYNC = 1; # use fsync to write maps - default off
99 111
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 112our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 113our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 114our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 115our $DB_ENV;
105 116
… …
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 130our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 131our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 132our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 133our $TICK_START; # for load detecting purposes
123 134
135our @POST_INIT;
136
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
138
124binmode STDOUT; 139binmode STDOUT;
125binmode STDERR; 140binmode STDERR;
126 141
127# read virtual server time, if available 142# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 143unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 144 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 145 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 146 $RUNTIME = <$fh> + 0.;
132} 147}
133 148
134mkdir $_ 149mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
242for my $pkg (qw( 257for my $pkg (qw(
243 cf::global cf::attachable 258 cf::global cf::attachable
244 cf::object cf::object::player 259 cf::object cf::object::player
245 cf::client cf::player 260 cf::client cf::player
246 cf::arch cf::living 261 cf::arch cf::living
262 cf::map cf::mapspace
247 cf::map cf::party cf::region 263 cf::party cf::region
248)) { 264)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 266}
252 267
253$EV::DIED = sub { 268$EV::DIED = sub {
254 warn "error in event callback: @_"; 269 warn "error in event callback: @_";
… …
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 311our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 312
298sub encode_json($) { $json_coder->encode ($_[0]) } 313sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 314sub decode_json($) { $json_coder->decode ($_[0]) }
300 315
316=item cf::post_init { BLOCK }
317
318Execute the given codeblock, I<after> all extensions have been (re-)loaded,
319but I<before> the server starts ticking again.
320
321The cdoeblock will have a single boolean argument to indicate whether this
322is a reload or not.
323
324=cut
325
326sub post_init(&) {
327 push @POST_INIT, shift;
328}
329
301=item cf::lock_wait $string 330=item cf::lock_wait $string
302 331
303Wait until the given lock is available. See cf::lock_acquire. 332Wait until the given lock is available. See cf::lock_acquire.
304 333
305=item my $lock = cf::lock_acquire $string 334=item my $lock = cf::lock_acquire $string
306 335
307Wait until the given lock is available and then acquires it and returns 336Wait until the given lock is available and then acquires it and returns
308a Coro::guard object. If the guard object gets destroyed (goes out of scope, 337a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 338for example when the coroutine gets canceled), the lock is automatically
310returned. 339returned.
311 340
312Locks are *not* recursive, locking from the same coro twice results in a 341Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 342deadlocked coro.
… …
319 348
320Return true if the lock is currently active, i.e. somebody has locked it. 349Return true if the lock is currently active, i.e. somebody has locked it.
321 350
322=cut 351=cut
323 352
324our %LOCK; 353our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 354
327sub lock_wait($) { 355sub lock_wait($) {
328 my ($key) = @_; 356 $LOCKS->wait ($_[0]);
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
334
335 # wait for lock, if any
336 while ($LOCK{$key}) {
337 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule;
339 }
340} 357}
341 358
342sub lock_acquire($) { 359sub lock_acquire($) {
343 my ($key) = @_; 360 $LOCKS->guard ($_[0])
344
345 # wait, to be sure we are not locked
346 lock_wait $key;
347
348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
350
351 Coro::guard {
352 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} };
355 }
356} 361}
357 362
358sub lock_active($) { 363sub lock_active($) {
359 my ($key) = @_; 364 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 365}
363 366
364sub freeze_mainloop { 367sub freeze_mainloop {
365 tick_inhibit_inc; 368 tick_inhibit_inc;
366 369
367 Coro::guard \&tick_inhibit_dec; 370 &Guard::guard (\&tick_inhibit_dec);
368} 371}
369 372
370=item cf::periodic $interval, $cb 373=item cf::periodic $interval, $cb
371 374
372Like EV::periodic, but randomly selects a starting point so that the actions 375Like EV::periodic, but randomly selects a starting point so that the actions
… …
724 727
725############################################################################# 728#############################################################################
726 729
727=head2 ATTACHABLE OBJECTS 730=head2 ATTACHABLE OBJECTS
728 731
729Many objects in crossfire are so-called attachable objects. That means you can 732Many objects in deliantra are so-called attachable objects. That means you can
730attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
732 735
733In the following description, CLASS can be any of C<global>, C<object> 736In the following description, CLASS can be any of C<global>, C<object>
734C<player>, C<client> or C<map> (i.e. the attachable objects in 737C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
784=item cf::CLASS::attachment $name, ... 787=item cf::CLASS::attachment $name, ...
785 788
786Register an attachment by C<$name> through which attachable objects of the 789Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 790given CLASS can refer to this attachment.
788 791
789Some classes such as crossfire maps and objects can specify attachments 792Some classes such as deliantra maps and objects can specify attachments
790that are attached at load/instantiate time, thus the need for a name. 793that are attached at load/instantiate time, thus the need for a name.
791 794
792These calls expect any number of the following handler/hook descriptions: 795These calls expect any number of the following handler/hook descriptions:
793 796
794=over 4 797=over 4
… …
1085 1088
1086sub reattach { 1089sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1091 my ($obj) = @_;
1089 1092
1093 # no longer needed after getting rid of delete_package?
1090 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091 1095
1092 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
1093 1097
1094 @$registry = (); 1098 @$registry = ();
1095 1099
… …
1160 } else { 1164 } else {
1161 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1162 } 1166 }
1163 1167
1164 aio_rename "$filename~", $filename; 1168 aio_rename "$filename~", $filename;
1169
1170 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1172 } else {
1166 warn "FATAL: $filename~: $!\n"; 1173 warn "unable to save objects: $filename~: $!\n";
1167 } 1174 }
1168 } else { 1175 } else {
1169 aio_unlink $filename; 1176 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1177 aio_unlink "$filename.pst";
1171 } 1178 }
… …
1262 my ($name, $cb) = @_; 1269 my ($name, $cb) = @_;
1263 1270
1264 $EXTICMD{$name} = $cb; 1271 $EXTICMD{$name} = $cb;
1265} 1272}
1266 1273
1274use File::Glob ();
1275
1267cf::player->attach ( 1276cf::player->attach (
1268 on_command => sub { 1277 on_command => sub {
1269 my ($pl, $name, $params) = @_; 1278 my ($pl, $name, $params) = @_;
1270 1279
1271 my $cb = $COMMAND{$name} 1280 my $cb = $COMMAND{$name}
… …
1303 1312
1304 cf::override; 1313 cf::override;
1305 }, 1314 },
1306); 1315);
1307 1316
1317# "readahead" all extensions
1318sub cache_extensions {
1319 my $grp = IO::AIO::aio_group;
1320
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1322 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 }
1325 };
1326
1327 $grp
1328}
1329
1308sub load_extensions { 1330sub load_extensions {
1309 cf::sync_job { 1331 cf::sync_job {
1310 my %todo; 1332 my %todo;
1311 1333
1312 for my $path (<$LIBDIR/*.ext>) { 1334 for my $path (<$LIBDIR/*.ext>) {
… …
1331 1353
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1356
1335 $ext{source} = 1357 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337 . "#line 1 \"$path\"\n{\n" 1359 . "#line 1 \"$path\"\n{\n"
1338 . $source 1360 . $source
1339 . "\n};\n1"; 1361 . "\n};\n1";
1340 1362
1341 $todo{$base} = \%ext; 1363 $todo{$base} = \%ext;
… …
1381 1403
1382=back 1404=back
1383 1405
1384=head2 CORE EXTENSIONS 1406=head2 CORE EXTENSIONS
1385 1407
1386Functions and methods that extend core crossfire objects. 1408Functions and methods that extend core deliantra objects.
1387 1409
1388=cut 1410=cut
1389 1411
1390package cf::player; 1412package cf::player;
1391 1413
… …
1434 1456
1435sub exists($) { 1457sub exists($) {
1436 my ($login) = @_; 1458 my ($login) = @_;
1437 1459
1438 $cf::PLAYER{$login} 1460 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1461 or !aio_stat path $login
1440} 1462}
1441 1463
1442sub find($) { 1464sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1465 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1466 my $login = $_[0];
… …
1519 my ($pl) = @_; 1541 my ($pl) = @_;
1520 1542
1521 my $name = $pl->ob->name; 1543 my $name = $pl->ob->name;
1522 1544
1523 $pl->{deny_save} = 1; 1545 $pl->{deny_save} = 1;
1524 $pl->password ("*"); # this should lock out the player until we nuked the dir 1546 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1525 1547
1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1527 $pl->deactivate; 1549 $pl->deactivate;
1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1551 $pl->ob->check_score;
1528 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1552 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1529 $pl->ns->destroy if $pl->ns; 1553 $pl->ns->destroy if $pl->ns;
1530 1554
1531 my $path = playerdir $pl; 1555 my $path = playerdir $pl;
1532 my $temp = "$path~$cf::RUNTIME~deleting~"; 1556 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1613 } 1637 }
1614 1638
1615 \@paths 1639 \@paths
1616} 1640}
1617 1641
1618=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1642=item $protocol_xml = $player->expand_cfpod ($cfpod)
1619 1643
1620Expand crossfire pod fragments into protocol xml. 1644Expand deliantra pod fragments into protocol xml.
1621
1622=cut
1623
1624use re 'eval';
1625
1626my $group;
1627my $interior; $interior = qr{
1628 # match a pod interior sequence sans C<< >>
1629 (?:
1630 \ (.*?)\ (?{ $group = $^N })
1631 | < (??{$interior}) >
1632 )
1633}x;
1634
1635sub expand_cfpod {
1636 my ($self, $pod) = @_;
1637
1638 my $xml;
1639
1640 while () {
1641 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1642 $group = $1;
1643
1644 $group =~ s/&/&amp;/g;
1645 $group =~ s/</&lt;/g;
1646
1647 $xml .= $group;
1648 } elsif ($pod =~ m%\G
1649 ([BCGHITU])
1650 <
1651 (?:
1652 ([^<>]*) (?{ $group = $^N })
1653 | < $interior >
1654 )
1655 >
1656 %gcsx
1657 ) {
1658 my ($code, $data) = ($1, $group);
1659
1660 if ($code eq "B") {
1661 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1662 } elsif ($code eq "I") {
1663 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1664 } elsif ($code eq "U") {
1665 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1666 } elsif ($code eq "C") {
1667 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1668 } elsif ($code eq "T") {
1669 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1670 } elsif ($code eq "G") {
1671 my ($male, $female) = split /\|/, $data;
1672 $data = $self->gender ? $female : $male;
1673 $xml .= expand_cfpod ($self, $data);
1674 } elsif ($code eq "H") {
1675 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1676 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1677 "")
1678 [$self->{hintmode}];
1679 } else {
1680 $xml .= "error processing '$code($data)' directive";
1681 }
1682 } else {
1683 if ($pod =~ /\G(.+)/) {
1684 warn "parse error while expanding $pod (at $1)";
1685 }
1686 last;
1687 }
1688 }
1689
1690 for ($xml) {
1691 # create single paragraphs (very hackish)
1692 s/(?<=\S)\n(?=\w)/ /g;
1693
1694 # compress some whitespace
1695 s/\s+\n/\n/g; # ws line-ends
1696 s/\n\n+/\n/g; # double lines
1697 s/^\n+//; # beginning lines
1698 s/\n+$//; # ending lines
1699 }
1700
1701 $xml
1702}
1703
1704no re 'eval';
1705
1706sub hintmode {
1707 $_[0]{hintmode} = $_[1] if @_ > 1;
1708 $_[0]{hintmode}
1709}
1710 1645
1711=item $player->ext_reply ($msgid, @msg) 1646=item $player->ext_reply ($msgid, @msg)
1712 1647
1713Sends an ext reply to the player. 1648Sends an ext reply to the player.
1714 1649
… …
2027sub find { 1962sub find {
2028 my ($path, $origin) = @_; 1963 my ($path, $origin) = @_;
2029 1964
2030 $path = normalise $path, $origin && $origin->path; 1965 $path = normalise $path, $origin && $origin->path;
2031 1966
2032 cf::lock_wait "map_data:$path";#d#remove 1967 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2033 cf::lock_wait "map_find:$path"; 1968 my $guard2 = cf::lock_acquire "map_find:$path";
2034 1969
2035 $cf::MAP{$path} || do { 1970 $cf::MAP{$path} || do {
2036 my $guard1 = cf::lock_acquire "map_find:$path";
2037 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2038
2039 my $map = new_from_path cf::map $path 1971 my $map = new_from_path cf::map $path
2040 or return; 1972 or return;
2041 1973
2042 $map->{last_save} = $cf::RUNTIME; 1974 $map->{last_save} = $cf::RUNTIME;
2043 1975
… …
2045 or return; 1977 or return;
2046 1978
2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1979 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2048 # doing this can freeze the server in a sync job, obviously 1980 # doing this can freeze the server in a sync job, obviously
2049 #$cf::WAIT_FOR_TICK->wait; 1981 #$cf::WAIT_FOR_TICK->wait;
1982 undef $guard2;
2050 undef $guard1; 1983 undef $guard1;
2051 undef $guard2;
2052 $map->reset; 1984 $map->reset;
2053 return find $path; 1985 return find $path;
2054 } 1986 }
2055 1987
2056 $cf::MAP{$path} = $map 1988 $cf::MAP{$path} = $map
… …
2083 my $f = new_from_file cf::object::thawer $self->{load_path}; 2015 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block; 2016 $f->skip_block;
2085 $self->_load_objects ($f) 2017 $self->_load_objects ($f)
2086 or return; 2018 or return;
2087 2019
2088 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2020 $self->post_load_original
2089 if delete $self->{load_original}; 2021 if delete $self->{load_original};
2090 2022
2091 if (my $uniq = $self->uniq_path) { 2023 if (my $uniq = $self->uniq_path) {
2092 utf8::encode $uniq; 2024 utf8::encode $uniq;
2093 unless (aio_stat $uniq) { 2025 unless (aio_stat $uniq) {
… …
2459can be C<undef>. Does the right thing when the player is currently in a 2391can be C<undef>. Does the right thing when the player is currently in a
2460dialogue with the given NPC character. 2392dialogue with the given NPC character.
2461 2393
2462=cut 2394=cut
2463 2395
2396our $SAY_CHANNEL = {
2397 id => "say",
2398 title => "Map",
2399 reply => "say ",
2400 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2401};
2402
2403our $CHAT_CHANNEL = {
2404 id => "chat",
2405 title => "Chat",
2406 reply => "chat ",
2407 tooltip => "Player chat and shouts, global to the server.",
2408};
2409
2464# rough implementation of a future "reply" method that works 2410# rough implementation of a future "reply" method that works
2465# with dialog boxes. 2411# with dialog boxes.
2466#TODO: the first argument must go, split into a $npc->reply_to ( method 2412#TODO: the first argument must go, split into a $npc->reply_to ( method
2467sub cf::object::player::reply($$$;$) { 2413sub cf::object::player::reply($$$;$) {
2468 my ($self, $npc, $msg, $flags) = @_; 2414 my ($self, $npc, $msg, $flags) = @_;
… …
2479 my $dialog = $pl->{npc_dialog}; 2425 my $dialog = $pl->{npc_dialog};
2480 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2426 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2481 2427
2482 } else { 2428 } else {
2483 $msg = $npc->name . " says: $msg" if $npc; 2429 $msg = $npc->name . " says: $msg" if $npc;
2484 $self->message ($msg, $flags); 2430 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2485 } 2431 }
2486 } 2432 }
2487} 2433}
2488 2434
2489=item $object->send_msg ($channel, $msg, $color, [extra...]) 2435=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2514 2460
2515=item $player_object->enter_link 2461=item $player_object->enter_link
2516 2462
2517Freezes the player and moves him/her to a special map (C<{link}>). 2463Freezes the player and moves him/her to a special map (C<{link}>).
2518 2464
2519The player should be reasonably safe there for short amounts of time. You 2465The player should be reasonably safe there for short amounts of time (e.g.
2520I<MUST> call C<leave_link> as soon as possible, though. 2466for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2467though, as the palyer cannot control the character while it is on the link
2468map.
2521 2469
2522Will never block. 2470Will never block.
2523 2471
2524=item $player_object->leave_link ($map, $x, $y) 2472=item $player_object->leave_link ($map, $x, $y)
2525 2473
… …
2583 2531
2584 $map->load; 2532 $map->load;
2585 $map->load_neighbours; 2533 $map->load_neighbours;
2586 2534
2587 return unless $self->contr->active; 2535 return unless $self->contr->active;
2536 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2588 $self->activate_recursive; 2537 $self->activate_recursive;
2589 2538
2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2539 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2591 $self->enter_map ($map, $x, $y); 2540 $self->enter_map ($map, $x, $y);
2592} 2541}
… …
2596Moves the player to the given map-path and coordinates by first freezing 2545Moves the player to the given map-path and coordinates by first freezing
2597her, loading and preparing them map, calling the provided $check callback 2546her, loading and preparing them map, calling the provided $check callback
2598that has to return the map if sucecssful, and then unfreezes the player on 2547that has to return the map if sucecssful, and then unfreezes the player on
2599the new (success) or old (failed) map position. In either case, $done will 2548the new (success) or old (failed) map position. In either case, $done will
2600be called at the end of this process. 2549be called at the end of this process.
2550
2551Note that $check will be called with a potentially non-loaded map, so if
2552it needs a loaded map it has to call C<< ->load >>.
2601 2553
2602=cut 2554=cut
2603 2555
2604our $GOTOGEN; 2556our $GOTOGEN;
2605 2557
… …
2684} 2636}
2685 2637
2686sub prepare_random_map { 2638sub prepare_random_map {
2687 my ($exit) = @_; 2639 my ($exit) = @_;
2688 2640
2689 my $guard = cf::lock_acquire "exit_prepare:$exit";
2690
2691 # all this does is basically replace the /! path by 2641 # all this does is basically replace the /! path by
2692 # a new random map path (?random/...) with a seed 2642 # a new random map path (?random/...) with a seed
2693 # that depends on the exit object 2643 # that depends on the exit object
2694 2644
2695 my $rmp = parse_random_map_params $exit->msg; 2645 my $rmp = parse_random_map_params $exit->msg;
… …
2697 if ($exit->map) { 2647 if ($exit->map) {
2698 $rmp->{region} = $exit->region->name; 2648 $rmp->{region} = $exit->region->name;
2699 $rmp->{origin_map} = $exit->map->path; 2649 $rmp->{origin_map} = $exit->map->path;
2700 $rmp->{origin_x} = $exit->x; 2650 $rmp->{origin_x} = $exit->x;
2701 $rmp->{origin_y} = $exit->y; 2651 $rmp->{origin_y} = $exit->y;
2652
2653 $exit->map->touch;
2702 } 2654 }
2703 2655
2704 $rmp->{random_seed} ||= $exit->random_seed; 2656 $rmp->{random_seed} ||= $exit->random_seed;
2705 2657
2706 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2658 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
… …
2710 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2662 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2711 aio_write $fh, 0, (length $data), $data, 0; 2663 aio_write $fh, 0, (length $data), $data, 0;
2712 undef $fh; 2664 undef $fh;
2713 aio_rename "$meta~", $meta; 2665 aio_rename "$meta~", $meta;
2714 2666
2667 my $slaying = "?random/$md5";
2668
2669 if ($exit->valid) {
2715 $exit->slaying ("?random/$md5"); 2670 $exit->slaying ("?random/$md5");
2716 $exit->msg (undef); 2671 $exit->msg (undef);
2672 }
2717 } 2673 }
2718} 2674}
2719 2675
2720sub cf::object::player::enter_exit { 2676sub cf::object::player::enter_exit {
2721 my ($self, $exit) = @_; 2677 my ($self, $exit) = @_;
2722 2678
2723 return unless $self->type == cf::PLAYER; 2679 return unless $self->type == cf::PLAYER;
2724 2680
2725 if ($exit->slaying eq "/!") {
2726 #TODO: this should de-fi-ni-te-ly not be a sync-job
2727 # the problem is that $exit might not survive long enough
2728 # so it needs to be done right now, right here
2729 cf::sync_job { prepare_random_map $exit };
2730 }
2731
2732 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2733 my $hp = $exit->stats->hp;
2734 my $sp = $exit->stats->sp;
2735
2736 $self->enter_link; 2681 $self->enter_link;
2737 2682
2738 # if exit is damned, update players death & WoR home-position
2739 $self->contr->savebed ($slaying, $hp, $sp)
2740 if $exit->flag (FLAG_DAMNED);
2741
2742 (async { 2683 (async {
2743 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2684 $Coro::current->{desc} = "enter_exit";
2744 2685
2745 $self->deactivate_recursive; # just to be sure
2746 unless (eval { 2686 unless (eval {
2687 $self->deactivate_recursive; # just to be sure
2688
2689 # random map handling
2690 {
2691 my $guard = cf::lock_acquire "exit_prepare:$exit";
2692
2693 prepare_random_map $exit
2694 if $exit->slaying eq "/!";
2695 }
2696
2697 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2698 my $x = $exit->stats->hp;
2699 my $y = $exit->stats->sp;
2700
2747 $self->goto ($slaying, $hp, $sp); 2701 $self->goto ($map, $x, $y);
2748 2702
2703 # if exit is damned, update players death & WoR home-position
2704 $self->contr->savebed ($map, $x, $y)
2705 if $exit->flag (cf::FLAG_DAMNED);
2706
2749 1; 2707 1
2750 }) { 2708 }) {
2751 $self->message ("Something went wrong deep within the crossfire server. " 2709 $self->message ("Something went wrong deep within the deliantra server. "
2752 . "I'll try to bring you back to the map you were before. " 2710 . "I'll try to bring you back to the map you were before. "
2753 . "Please report this to the dungeon master!", 2711 . "Please report this to the dungeon master!",
2754 cf::NDI_UNIQUE | cf::NDI_RED); 2712 cf::NDI_UNIQUE | cf::NDI_RED);
2755 2713
2756 warn "ERROR in enter_exit: $@"; 2714 warn "ERROR in enter_exit: $@";
… …
2822 id => "infobox", 2780 id => "infobox",
2823 title => "Body Parts", 2781 title => "Body Parts",
2824 reply => undef, 2782 reply => undef,
2825 tooltip => "Shows which body parts you posess and are available", 2783 tooltip => "Shows which body parts you posess and are available",
2826 }, 2784 },
2785 "c/skills" => {
2786 id => "infobox",
2787 title => "Skills",
2788 reply => undef,
2789 tooltip => "Shows your experience per skill and item power",
2790 },
2827 "c/uptime" => { 2791 "c/uptime" => {
2828 id => "infobox", 2792 id => "infobox",
2829 title => "Uptime", 2793 title => "Uptime",
2830 reply => undef, 2794 reply => undef,
2831 tooltip => "How long the server has been running since last restart", 2795 tooltip => "How long the server has been running since last restart",
… …
2845); 2809);
2846 2810
2847sub cf::client::send_msg { 2811sub cf::client::send_msg {
2848 my ($self, $channel, $msg, $color, @extra) = @_; 2812 my ($self, $channel, $msg, $color, @extra) = @_;
2849 2813
2850 $msg = $self->pl->expand_cfpod ($msg); 2814 $msg = $self->pl->expand_cfpod ($msg)
2815 unless $color & cf::NDI_VERBATIM;
2851 2816
2852 $color &= cf::NDI_CLIENT_MASK; # just in case... 2817 $color &= cf::NDI_CLIENT_MASK; # just in case...
2853 2818
2854 # check predefined channels, for the benefit of C 2819 # check predefined channels, for the benefit of C
2855 if ($CHANNEL{$channel}) { 2820 if ($CHANNEL{$channel}) {
… …
2876 if ($self->can_msg) { 2841 if ($self->can_msg) {
2877 # default colour, mask it out 2842 # default colour, mask it out
2878 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2843 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2879 if $color & cf::NDI_DEF; 2844 if $color & cf::NDI_DEF;
2880 2845
2881 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2846 my $pkt = "msg "
2847 . $self->{json_coder}->encode (
2882 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2848 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2849 );
2850
2851 # try lzf for large packets
2852 $pkt = "lzf " . Compress::LZF::compress $pkt
2853 if 1024 <= length $pkt and $self->{can_lzf};
2854
2855 # split very large packets
2856 if (8192 < length $pkt and $self->{can_lzf}) {
2857 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2858 $pkt = "frag";
2859 }
2860
2861 $self->send_packet ($pkt);
2883 } else { 2862 } else {
2884 if ($color >= 0) { 2863 if ($color >= 0) {
2885 # replace some tags by gcfclient-compatible ones 2864 # replace some tags by gcfclient-compatible ones
2886 for ($msg) { 2865 for ($msg) {
2887 1 while 2866 1 while
… …
3101 3080
3102=cut 3081=cut
3103 3082
3104for ( 3083for (
3105 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3084 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3106 insert remove inv name archname title slaying race 3085 insert remove inv nrof name archname title slaying race
3107 decrease split destroy)], 3086 decrease split destroy change_exp)],
3108 ["cf::object::player" => qw(player)], 3087 ["cf::object::player" => qw(player)],
3109 ["cf::player" => qw(peaceful)], 3088 ["cf::player" => qw(peaceful)],
3110 ["cf::map" => qw(trigger)], 3089 ["cf::map" => qw(trigger)],
3111) { 3090) {
3112 no strict 'refs'; 3091 no strict 'refs';
… …
3370 reload_treasures; 3349 reload_treasures;
3371 3350
3372 warn "finished reloading resource files\n"; 3351 warn "finished reloading resource files\n";
3373} 3352}
3374 3353
3375sub init {
3376 my $guard = freeze_mainloop;
3377
3378 reload_resources;
3379}
3380
3381sub reload_config { 3354sub reload_config {
3382 open my $fh, "<:utf8", "$CONFDIR/config" 3355 open my $fh, "<:utf8", "$CONFDIR/config"
3383 or return; 3356 or return;
3384 3357
3385 local $/; 3358 local $/;
… …
3397 }; 3370 };
3398 warn $@ if $@; 3371 warn $@ if $@;
3399 } 3372 }
3400} 3373}
3401 3374
3375sub pidfile() {
3376 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3377 or die "$PIDFILE: $!";
3378 flock $fh, &Fcntl::LOCK_EX
3379 or die "$PIDFILE: flock: $!";
3380 $fh
3381}
3382
3383# make sure only one server instance is running at any one time
3384sub atomic {
3385 my $fh = pidfile;
3386
3387 my $pid = <$fh>;
3388 kill 9, $pid if $pid > 0;
3389
3390 seek $fh, 0, 0;
3391 print $fh $$;
3392}
3393
3402sub main { 3394sub main {
3395 cf::init_globals; # initialise logging
3396
3397 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3398 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3399 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3400 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3401
3402 cf::init_experience;
3403 cf::init_anim;
3404 cf::init_attackmess;
3405 cf::init_dynamic;
3406
3407 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3408
3403 # we must not ever block the main coroutine 3409 # we must not ever block the main coroutine
3404 local $Coro::idle = sub { 3410 local $Coro::idle = sub {
3405 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3411 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3406 (async { 3412 (async {
3407 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3413 $Coro::current->{desc} = "IDLE BUG HANDLER";
3408 EV::loop EV::LOOP_ONESHOT; 3414 EV::loop EV::LOOP_ONESHOT;
3409 })->prio (Coro::PRIO_MAX); 3415 })->prio (Coro::PRIO_MAX);
3410 }; 3416 };
3411 3417
3412 { 3418 evthread_start IO::AIO::poll_fileno;
3413 my $guard = freeze_mainloop; 3419
3420 cf::sync_job {
3421 reload_resources;
3414 reload_config; 3422 reload_config;
3415 db_init; 3423 db_init;
3424
3425 cf::load_settings;
3426 cf::load_materials;
3427 cf::init_uuid;
3428 cf::init_signals;
3429 cf::init_commands;
3430 cf::init_skills;
3431
3432 cf::init_beforeplay;
3433
3434 atomic;
3435
3416 load_extensions; 3436 load_extensions;
3417 3437
3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3438 utime time, time, $RUNTIMEFILE;
3419 evthread_start IO::AIO::poll_fileno; 3439
3440 # no (long-running) fork's whatsoever before this point(!)
3441 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3442
3443 (pop @POST_INIT)->(0) while @POST_INIT;
3420 } 3444 };
3421 3445
3422 EV::loop; 3446 EV::loop;
3423} 3447}
3424 3448
3425############################################################################# 3449#############################################################################
… …
3434 }; 3458 };
3435 } 3459 }
3436} 3460}
3437 3461
3438sub write_runtime_sync { 3462sub write_runtime_sync {
3439 my $runtime = "$LOCALDIR/runtime";
3440
3441 # first touch the runtime file to show we are still running: 3463 # first touch the runtime file to show we are still running:
3442 # the fsync below can take a very very long time. 3464 # the fsync below can take a very very long time.
3443 3465
3444 IO::AIO::aio_utime $runtime, undef, undef; 3466 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3445 3467
3446 my $guard = cf::lock_acquire "write_runtime"; 3468 my $guard = cf::lock_acquire "write_runtime";
3447 3469
3448 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3470 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3449 or return; 3471 or return;
3450 3472
3451 my $value = $cf::RUNTIME + 90 + 10; 3473 my $value = $cf::RUNTIME + 90 + 10;
3452 # 10 is the runtime save interval, for a monotonic clock 3474 # 10 is the runtime save interval, for a monotonic clock
3453 # 60 allows for the watchdog to kill the server. 3475 # 60 allows for the watchdog to kill the server.
… …
3463 aio_utime $fh, undef, undef; 3485 aio_utime $fh, undef, undef;
3464 3486
3465 close $fh 3487 close $fh
3466 or return; 3488 or return;
3467 3489
3468 aio_rename "$runtime~", $runtime 3490 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3469 and return; 3491 and return;
3470 3492
3471 warn "runtime file written.\n"; 3493 warn "runtime file written.\n";
3472 3494
3473 1 3495 1
… …
3485 my $uuid = "$LOCALDIR/uuid"; 3507 my $uuid = "$LOCALDIR/uuid";
3486 3508
3487 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3509 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3488 or return; 3510 or return;
3489 3511
3490 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3512 my $value = uuid_seq uuid_cur;
3513
3514 unless ($value) {
3515 warn "cowardly refusing to write zero uuid value!\n";
3516 return;
3517 }
3518
3519 my $value = uuid_str $value + $uuid_skip;
3491 $uuid_skip = 0; 3520 $uuid_skip = 0;
3492 3521
3493 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3522 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3494 and return; 3523 and return;
3495 3524
… …
3517} 3546}
3518 3547
3519sub emergency_save() { 3548sub emergency_save() {
3520 my $freeze_guard = cf::freeze_mainloop; 3549 my $freeze_guard = cf::freeze_mainloop;
3521 3550
3522 warn "enter emergency perl save\n"; 3551 warn "emergency_perl_save: enter\n";
3523 3552
3524 cf::sync_job { 3553 cf::sync_job {
3554 # this is a trade-off: we want to be very quick here, so
3555 # save all maps without fsync, and later call a global sync
3556 # (which in turn might be very very slow)
3557 local $USE_FSYNC = 0;
3558
3525 # use a peculiar iteration method to avoid tripping on perl 3559 # use a peculiar iteration method to avoid tripping on perl
3526 # refcount bugs in for. also avoids problems with players 3560 # refcount bugs in for. also avoids problems with players
3527 # and maps saved/destroyed asynchronously. 3561 # and maps saved/destroyed asynchronously.
3528 warn "begin emergency player save\n"; 3562 warn "emergency_perl_save: begin player save\n";
3529 for my $login (keys %cf::PLAYER) { 3563 for my $login (keys %cf::PLAYER) {
3530 my $pl = $cf::PLAYER{$login} or next; 3564 my $pl = $cf::PLAYER{$login} or next;
3531 $pl->valid or next; 3565 $pl->valid or next;
3532 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3566 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3533 $pl->save; 3567 $pl->save;
3534 } 3568 }
3535 warn "end emergency player save\n"; 3569 warn "emergency_perl_save: end player save\n";
3536 3570
3537 warn "begin emergency map save\n"; 3571 warn "emergency_perl_save: begin map save\n";
3538 for my $path (keys %cf::MAP) { 3572 for my $path (keys %cf::MAP) {
3539 my $map = $cf::MAP{$path} or next; 3573 my $map = $cf::MAP{$path} or next;
3540 $map->valid or next; 3574 $map->valid or next;
3541 $map->save; 3575 $map->save;
3542 } 3576 }
3543 warn "end emergency map save\n"; 3577 warn "emergency_perl_save: end map save\n";
3544 3578
3545 warn "begin emergency database checkpoint\n"; 3579 warn "emergency_perl_save: begin database checkpoint\n";
3546 BDB::db_env_txn_checkpoint $DB_ENV; 3580 BDB::db_env_txn_checkpoint $DB_ENV;
3547 warn "end emergency database checkpoint\n"; 3581 warn "emergency_perl_save: end database checkpoint\n";
3548 3582
3549 warn "begin write uuid\n"; 3583 warn "emergency_perl_save: begin write uuid\n";
3550 write_uuid_sync 1; 3584 write_uuid_sync 1;
3551 warn "end write uuid\n"; 3585 warn "emergency_perl_save: end write uuid\n";
3552 }; 3586 };
3553 3587
3588 warn "emergency_perl_save: starting sync()\n";
3589 IO::AIO::aio_sync sub {
3590 warn "emergency_perl_save: finished sync()\n";
3591 };
3592
3554 warn "leave emergency perl save\n"; 3593 warn "emergency_perl_save: leave\n";
3555} 3594}
3556 3595
3557sub post_cleanup { 3596sub post_cleanup {
3558 my ($make_core) = @_; 3597 my ($make_core) = @_;
3559 3598
3560 warn Carp::longmess "post_cleanup backtrace" 3599 warn Carp::longmess "post_cleanup backtrace"
3561 if $make_core; 3600 if $make_core;
3601
3602 my $fh = pidfile;
3603 unlink $PIDFILE if <$fh> == $$;
3604}
3605
3606# a safer delete_package, copied from Symbol
3607sub clear_package($) {
3608 my $pkg = shift;
3609
3610 # expand to full symbol table name if needed
3611 unless ($pkg =~ /^main::.*::$/) {
3612 $pkg = "main$pkg" if $pkg =~ /^::/;
3613 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3614 $pkg .= '::' unless $pkg =~ /::$/;
3615 }
3616
3617 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3618 my $stem_symtab = *{$stem}{HASH};
3619
3620 defined $stem_symtab and exists $stem_symtab->{$leaf}
3621 or return;
3622
3623 # clear all symbols
3624 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3625 for my $name (keys %$leaf_symtab) {
3626 _gv_clear *{"$pkg$name"};
3627# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3628 }
3629 warn "cleared package $pkg\n";#d#
3562} 3630}
3563 3631
3564sub do_reload_perl() { 3632sub do_reload_perl() {
3565 # can/must only be called in main 3633 # can/must only be called in main
3566 if ($Coro::current != $Coro::main) { 3634 if ($Coro::current != $Coro::main) {
3567 warn "can only reload from main coroutine"; 3635 warn "can only reload from main coroutine";
3568 return; 3636 return;
3569 } 3637 }
3570 3638
3639 return if $RELOAD++;
3640
3641 my $t1 = EV::time;
3642
3643 while ($RELOAD) {
3571 warn "reloading..."; 3644 warn "reloading...";
3572 3645
3573 warn "entering sync_job"; 3646 warn "entering sync_job";
3574 3647
3575 cf::sync_job { 3648 cf::sync_job {
3576 cf::write_runtime_sync; # external watchdog should not bark 3649 cf::write_runtime_sync; # external watchdog should not bark
3577 cf::emergency_save; 3650 cf::emergency_save;
3578 cf::write_runtime_sync; # external watchdog should not bark 3651 cf::write_runtime_sync; # external watchdog should not bark
3579 3652
3580 warn "syncing database to disk"; 3653 warn "syncing database to disk";
3581 BDB::db_env_txn_checkpoint $DB_ENV; 3654 BDB::db_env_txn_checkpoint $DB_ENV;
3582 3655
3583 # if anything goes wrong in here, we should simply crash as we already saved 3656 # if anything goes wrong in here, we should simply crash as we already saved
3584 3657
3585 warn "flushing outstanding aio requests"; 3658 warn "flushing outstanding aio requests";
3586 for (;;) {
3587 BDB::flush;
3588 IO::AIO::flush;
3589 Coro::cede_notself;
3590 last unless IO::AIO::nreqs || BDB::nreqs; 3659 while (IO::AIO::nreqs || BDB::nreqs) {
3591 warn "iterate..."; 3660 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3592 }
3593
3594 ++$RELOAD;
3595
3596 warn "cancelling all extension coros";
3597 $_->cancel for values %EXT_CORO;
3598 %EXT_CORO = ();
3599
3600 warn "removing commands";
3601 %COMMAND = ();
3602
3603 warn "removing ext/exti commands";
3604 %EXTCMD = ();
3605 %EXTICMD = ();
3606
3607 warn "unloading/nuking all extensions";
3608 for my $pkg (@EXTS) {
3609 warn "... unloading $pkg";
3610
3611 if (my $cb = $pkg->can ("unload")) {
3612 eval {
3613 $cb->($pkg);
3614 1
3615 } or warn "$pkg unloaded, but with errors: $@";
3616 } 3661 }
3617 3662
3618 warn "... nuking $pkg"; 3663 warn "cancelling all extension coros";
3619 Symbol::delete_package $pkg; 3664 $_->cancel for values %EXT_CORO;
3620 } 3665 %EXT_CORO = ();
3621 3666
3622 warn "unloading all perl modules loaded from $LIBDIR"; 3667 warn "removing commands";
3623 while (my ($k, $v) = each %INC) { 3668 %COMMAND = ();
3624 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3625 3669
3670 warn "removing ext/exti commands";
3671 %EXTCMD = ();
3672 %EXTICMD = ();
3673
3674 warn "unloading/nuking all extensions";
3675 for my $pkg (@EXTS) {
3626 warn "... unloading $k"; 3676 warn "... unloading $pkg";
3627 delete $INC{$k};
3628 3677
3629 $k =~ s/\.pm$//;
3630 $k =~ s/\//::/g;
3631
3632 if (my $cb = $k->can ("unload_module")) { 3678 if (my $cb = $pkg->can ("unload")) {
3679 eval {
3633 $cb->(); 3680 $cb->($pkg);
3681 1
3682 } or warn "$pkg unloaded, but with errors: $@";
3683 }
3684
3685 warn "... clearing $pkg";
3686 clear_package $pkg;
3634 } 3687 }
3635 3688
3636 Symbol::delete_package $k; 3689 warn "unloading all perl modules loaded from $LIBDIR";
3690 while (my ($k, $v) = each %INC) {
3691 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3692
3693 warn "... unloading $k";
3694 delete $INC{$k};
3695
3696 $k =~ s/\.pm$//;
3697 $k =~ s/\//::/g;
3698
3699 if (my $cb = $k->can ("unload_module")) {
3700 $cb->();
3701 }
3702
3703 clear_package $k;
3637 } 3704 }
3638 3705
3639 warn "getting rid of safe::, as good as possible"; 3706 warn "getting rid of safe::, as good as possible";
3640 Symbol::delete_package "safe::$_" 3707 clear_package "safe::$_"
3641 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3708 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3642 3709
3643 warn "unloading cf.pm \"a bit\""; 3710 warn "unloading cf.pm \"a bit\"";
3644 delete $INC{"cf.pm"}; 3711 delete $INC{"cf.pm"};
3645 delete $INC{"cf/pod.pm"}; 3712 delete $INC{"cf/pod.pm"};
3646 3713
3647 # don't, removes xs symbols, too, 3714 # don't, removes xs symbols, too,
3648 # and global variables created in xs 3715 # and global variables created in xs
3649 #Symbol::delete_package __PACKAGE__; 3716 #clear_package __PACKAGE__;
3650 3717
3651 warn "unload completed, starting to reload now"; 3718 warn "unload completed, starting to reload now";
3652 3719
3653 warn "reloading cf.pm"; 3720 warn "reloading cf.pm";
3654 require cf; 3721 require cf;
3655 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3722 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3656 3723
3657 warn "loading config and database again"; 3724 warn "loading config and database again";
3658 cf::reload_config; 3725 cf::reload_config;
3659 3726
3660 warn "loading extensions"; 3727 warn "loading extensions";
3661 cf::load_extensions; 3728 cf::load_extensions;
3662 3729
3730 if ($REATTACH_ON_RELOAD) {
3663 warn "reattaching attachments to objects/players"; 3731 warn "reattaching attachments to objects/players";
3664 _global_reattach; # objects, sockets 3732 _global_reattach; # objects, sockets
3665 warn "reattaching attachments to maps"; 3733 warn "reattaching attachments to maps";
3666 reattach $_ for values %MAP; 3734 reattach $_ for values %MAP;
3667 warn "reattaching attachments to players"; 3735 warn "reattaching attachments to players";
3668 reattach $_ for values %PLAYER; 3736 reattach $_ for values %PLAYER;
3737 }
3669 3738
3739 warn "running post_init jobs";
3740 (pop @POST_INIT)->(1) while @POST_INIT;
3741
3670 warn "leaving sync_job"; 3742 warn "leaving sync_job";
3671 3743
3672 1 3744 1
3673 } or do { 3745 } or do {
3674 warn $@; 3746 warn $@;
3675 cf::cleanup "error while reloading, exiting."; 3747 cf::cleanup "error while reloading, exiting.";
3676 }; 3748 };
3677 3749
3678 warn "reloaded"; 3750 warn "reloaded";
3751 --$RELOAD;
3752 }
3753
3754 $t1 = EV::time - $t1;
3755 warn "reload completed in ${t1}s\n";
3679}; 3756};
3680 3757
3681our $RELOAD_WATCHER; # used only during reload 3758our $RELOAD_WATCHER; # used only during reload
3682 3759
3683sub reload_perl() { 3760sub reload_perl() {
3684 # doing reload synchronously and two reloads happen back-to-back, 3761 # doing reload synchronously and two reloads happen back-to-back,
3685 # coro crashes during coro_state_free->destroy here. 3762 # coro crashes during coro_state_free->destroy here.
3686 3763
3764 $RELOAD_WATCHER ||= cf::async {
3765 Coro::AIO::aio_wait cache_extensions;
3766
3687 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3767 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3688 do_reload_perl; 3768 do_reload_perl;
3689 undef $RELOAD_WATCHER; 3769 undef $RELOAD_WATCHER;
3770 };
3690 }; 3771 };
3691} 3772}
3692 3773
3693register_command "reload" => sub { 3774register_command "reload" => sub {
3694 my ($who, $arg) = @_; 3775 my ($who, $arg) = @_;
… …
3765{ 3846{
3766 # configure BDB 3847 # configure BDB
3767 3848
3768 BDB::min_parallel 8; 3849 BDB::min_parallel 8;
3769 BDB::max_poll_reqs $TICK * 0.1; 3850 BDB::max_poll_reqs $TICK * 0.1;
3770 $Coro::BDB::WATCHER->priority (1); 3851 $AnyEvent::BDB::WATCHER->priority (1);
3771 3852
3772 unless ($DB_ENV) { 3853 unless ($DB_ENV) {
3773 $DB_ENV = BDB::db_env_create; 3854 $DB_ENV = BDB::db_env_create;
3774 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3855 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3775 | BDB::LOG_AUTOREMOVE, 1); 3856 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3857 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3776 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3858 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3777 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3859 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3778 3860
3779 cf::sync_job { 3861 cf::sync_job {
3780 eval { 3862 eval {
… …
3806{ 3888{
3807 # configure IO::AIO 3889 # configure IO::AIO
3808 3890
3809 IO::AIO::min_parallel 8; 3891 IO::AIO::min_parallel 8;
3810 IO::AIO::max_poll_time $TICK * 0.1; 3892 IO::AIO::max_poll_time $TICK * 0.1;
3811 $Coro::AIO::WATCHER->priority (1); 3893 undef $AnyEvent::AIO::WATCHER;
3812} 3894}
3813 3895
3814my $_log_backtrace; 3896my $_log_backtrace;
3815 3897
3816sub _log_backtrace { 3898sub _log_backtrace {
… …
3819 $msg =~ s/\n//; 3901 $msg =~ s/\n//;
3820 3902
3821 # limit the # of concurrent backtraces 3903 # limit the # of concurrent backtraces
3822 if ($_log_backtrace < 2) { 3904 if ($_log_backtrace < 2) {
3823 ++$_log_backtrace; 3905 ++$_log_backtrace;
3906 my $perl_bt = Carp::longmess $msg;
3824 async { 3907 async {
3825 $Coro::current->{desc} = "abt $msg"; 3908 $Coro::current->{desc} = "abt $msg";
3826 3909
3827 my @bt = fork_call { 3910 my @bt = fork_call {
3828 @addr = map { sprintf "%x", $_ } @addr; 3911 @addr = map { sprintf "%x", $_ } @addr;
… …
3839 } 3922 }
3840 3923
3841 @funcs 3924 @funcs
3842 }; 3925 };
3843 3926
3844 LOG llevInfo, "[ABT] $msg\n"; 3927 LOG llevInfo, "[ABT] $perl_bt\n";
3928 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3845 LOG llevInfo, "[ABT] $_\n" for @bt; 3929 LOG llevInfo, "[ABT] $_\n" for @bt;
3846 --$_log_backtrace; 3930 --$_log_backtrace;
3847 }; 3931 };
3848 } else { 3932 } else {
3849 LOG llevInfo, "[ABT] $msg\n"; 3933 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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