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.430 by root, Sun May 4 14:12:37 2008 UTC vs.
Revision 1.462 by root, Tue Dec 23 06:58:23 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
… …
1927 1862
1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1929 "$UNIQUEDIR/$path" 1864 "$UNIQUEDIR/$path"
1930} 1865}
1931 1866
1932# and all this just because we cannot iterate over
1933# all maps in C++...
1934sub change_all_map_light {
1935 my ($change) = @_;
1936
1937 $_->change_map_light ($change)
1938 for grep $_->outdoor, values %cf::MAP;
1939}
1940
1941sub decay_objects { 1867sub decay_objects {
1942 my ($self) = @_; 1868 my ($self) = @_;
1943 1869
1944 return if $self->{deny_reset}; 1870 return if $self->{deny_reset};
1945 1871
… …
2027sub find { 1953sub find {
2028 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
2029 1955
2030 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
2031 1957
2032 cf::lock_wait "map_data:$path";#d#remove 1958 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2033 cf::lock_wait "map_find:$path"; 1959 my $guard2 = cf::lock_acquire "map_find:$path";
2034 1960
2035 $cf::MAP{$path} || do { 1961 $cf::MAP{$path} || do {
2036 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2037 my $guard2 = cf::lock_acquire "map_find:$path";
2038
2039 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
2040 or return; 1963 or return;
2041 1964
2042 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
2043 1966
… …
2083 my $f = new_from_file cf::object::thawer $self->{load_path}; 2006 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block; 2007 $f->skip_block;
2085 $self->_load_objects ($f) 2008 $self->_load_objects ($f)
2086 or return; 2009 or return;
2087 2010
2088 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->post_load_original
2089 if delete $self->{load_original}; 2012 if delete $self->{load_original};
2090 2013
2091 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
2092 utf8::encode $uniq; 2015 utf8::encode $uniq;
2093 unless (aio_stat $uniq) { 2016 unless (aio_stat $uniq) {
… …
2110 2033
2111 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
2112 $self->decay_objects; 2035 $self->decay_objects;
2113 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
2114 $self->update_buttons; 2037 $self->update_buttons;
2115 cf::cede_to_tick;
2116 $self->set_darkness_map;
2117 cf::cede_to_tick; 2038 cf::cede_to_tick;
2118 $self->activate; 2039 $self->activate;
2119 } 2040 }
2120 2041
2121 $self->{last_save} = $cf::RUNTIME; 2042 $self->{last_save} = $cf::RUNTIME;
… …
2528 2449
2529=item $player_object->enter_link 2450=item $player_object->enter_link
2530 2451
2531Freezes the player and moves him/her to a special map (C<{link}>). 2452Freezes the player and moves him/her to a special map (C<{link}>).
2532 2453
2533The player should be reasonably safe there for short amounts of time. You 2454The player should be reasonably safe there for short amounts of time (e.g.
2534I<MUST> call C<leave_link> as soon as possible, though. 2455for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2456though, as the palyer cannot control the character while it is on the link
2457map.
2535 2458
2536Will never block. 2459Will never block.
2537 2460
2538=item $player_object->leave_link ($map, $x, $y) 2461=item $player_object->leave_link ($map, $x, $y)
2539 2462
… …
2597 2520
2598 $map->load; 2521 $map->load;
2599 $map->load_neighbours; 2522 $map->load_neighbours;
2600 2523
2601 return unless $self->contr->active; 2524 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2602 $self->activate_recursive; 2526 $self->activate_recursive;
2603 2527
2604 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2605 $self->enter_map ($map, $x, $y); 2529 $self->enter_map ($map, $x, $y);
2606} 2530}
… …
2610Moves the player to the given map-path and coordinates by first freezing 2534Moves the player to the given map-path and coordinates by first freezing
2611her, loading and preparing them map, calling the provided $check callback 2535her, loading and preparing them map, calling the provided $check callback
2612that has to return the map if sucecssful, and then unfreezes the player on 2536that has to return the map if sucecssful, and then unfreezes the player on
2613the new (success) or old (failed) map position. In either case, $done will 2537the new (success) or old (failed) map position. In either case, $done will
2614be called at the end of this process. 2538be called at the end of this process.
2539
2540Note that $check will be called with a potentially non-loaded map, so if
2541it needs a loaded map it has to call C<< ->load >>.
2615 2542
2616=cut 2543=cut
2617 2544
2618our $GOTOGEN; 2545our $GOTOGEN;
2619 2546
… …
2766 $self->contr->savebed ($map, $x, $y) 2693 $self->contr->savebed ($map, $x, $y)
2767 if $exit->flag (cf::FLAG_DAMNED); 2694 if $exit->flag (cf::FLAG_DAMNED);
2768 2695
2769 1 2696 1
2770 }) { 2697 }) {
2771 $self->message ("Something went wrong deep within the crossfire server. " 2698 $self->message ("Something went wrong deep within the deliantra server. "
2772 . "I'll try to bring you back to the map you were before. " 2699 . "I'll try to bring you back to the map you were before. "
2773 . "Please report this to the dungeon master!", 2700 . "Please report this to the dungeon master!",
2774 cf::NDI_UNIQUE | cf::NDI_RED); 2701 cf::NDI_UNIQUE | cf::NDI_RED);
2775 2702
2776 warn "ERROR in enter_exit: $@"; 2703 warn "ERROR in enter_exit: $@";
… …
2842 id => "infobox", 2769 id => "infobox",
2843 title => "Body Parts", 2770 title => "Body Parts",
2844 reply => undef, 2771 reply => undef,
2845 tooltip => "Shows which body parts you posess and are available", 2772 tooltip => "Shows which body parts you posess and are available",
2846 }, 2773 },
2774 "c/skills" => {
2775 id => "infobox",
2776 title => "Skills",
2777 reply => undef,
2778 tooltip => "Shows your experience per skill and item power",
2779 },
2847 "c/uptime" => { 2780 "c/uptime" => {
2848 id => "infobox", 2781 id => "infobox",
2849 title => "Uptime", 2782 title => "Uptime",
2850 reply => undef, 2783 reply => undef,
2851 tooltip => "How long the server has been running since last restart", 2784 tooltip => "How long the server has been running since last restart",
… …
2860 id => "party", 2793 id => "party",
2861 title => "Party", 2794 title => "Party",
2862 reply => "gsay ", 2795 reply => "gsay ",
2863 tooltip => "Messages and chat related to your party", 2796 tooltip => "Messages and chat related to your party",
2864 }, 2797 },
2798 "c/say" => $SAY_CHANNEL,
2799 "c/chat" => $CHAT_CHANNEL,
2865); 2800);
2866 2801
2867sub cf::client::send_msg { 2802sub cf::client::send_msg {
2868 my ($self, $channel, $msg, $color, @extra) = @_; 2803 my ($self, $channel, $msg, $color, @extra) = @_;
2869 2804
2870 $msg = $self->pl->expand_cfpod ($msg); 2805 $msg = $self->pl->expand_cfpod ($msg)
2806 unless $color & cf::NDI_VERBATIM;
2871 2807
2872 $color &= cf::NDI_CLIENT_MASK; # just in case... 2808 $color &= cf::NDI_CLIENT_MASK; # just in case...
2873 2809
2874 # check predefined channels, for the benefit of C 2810 # check predefined channels, for the benefit of C
2875 if ($CHANNEL{$channel}) { 2811 if ($CHANNEL{$channel}) {
… …
2896 if ($self->can_msg) { 2832 if ($self->can_msg) {
2897 # default colour, mask it out 2833 # default colour, mask it out
2898 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2899 if $color & cf::NDI_DEF; 2835 if $color & cf::NDI_DEF;
2900 2836
2901 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2837 my $pkt = "msg "
2838 . $self->{json_coder}->encode (
2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2839 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2840 );
2841
2842 # try lzf for large packets
2843 $pkt = "lzf " . Compress::LZF::compress $pkt
2844 if 1024 <= length $pkt and $self->{can_lzf};
2845
2846 # split very large packets
2847 if (8192 < length $pkt and $self->{can_lzf}) {
2848 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2849 $pkt = "frag";
2850 }
2851
2852 $self->send_packet ($pkt);
2903 } else { 2853 } else {
2904 if ($color >= 0) { 2854 if ($color >= 0) {
2905 # replace some tags by gcfclient-compatible ones 2855 # replace some tags by gcfclient-compatible ones
2906 for ($msg) { 2856 for ($msg) {
2907 1 while 2857 1 while
… …
3121 3071
3122=cut 3072=cut
3123 3073
3124for ( 3074for (
3125 ["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
3126 insert remove inv name archname title slaying race 3076 insert remove inv nrof name archname title slaying race
3127 decrease split destroy)], 3077 decrease split destroy change_exp)],
3128 ["cf::object::player" => qw(player)], 3078 ["cf::object::player" => qw(player)],
3129 ["cf::player" => qw(peaceful)], 3079 ["cf::player" => qw(peaceful)],
3130 ["cf::map" => qw(trigger)], 3080 ["cf::map" => qw(trigger)],
3131) { 3081) {
3132 no strict 'refs'; 3082 no strict 'refs';
… …
3390 reload_treasures; 3340 reload_treasures;
3391 3341
3392 warn "finished reloading resource files\n"; 3342 warn "finished reloading resource files\n";
3393} 3343}
3394 3344
3395sub init {
3396 my $guard = freeze_mainloop;
3397
3398 reload_resources;
3399}
3400
3401sub reload_config { 3345sub reload_config {
3402 open my $fh, "<:utf8", "$CONFDIR/config" 3346 open my $fh, "<:utf8", "$CONFDIR/config"
3403 or return; 3347 or return;
3404 3348
3405 local $/; 3349 local $/;
… …
3417 }; 3361 };
3418 warn $@ if $@; 3362 warn $@ if $@;
3419 } 3363 }
3420} 3364}
3421 3365
3366sub pidfile() {
3367 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3368 or die "$PIDFILE: $!";
3369 flock $fh, &Fcntl::LOCK_EX
3370 or die "$PIDFILE: flock: $!";
3371 $fh
3372}
3373
3374# make sure only one server instance is running at any one time
3375sub atomic {
3376 my $fh = pidfile;
3377
3378 my $pid = <$fh>;
3379 kill 9, $pid if $pid > 0;
3380
3381 seek $fh, 0, 0;
3382 print $fh $$;
3383}
3384
3422sub main { 3385sub main {
3386 cf::init_globals; # initialise logging
3387
3388 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3389 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3390 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3391 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3392
3393 cf::init_experience;
3394 cf::init_anim;
3395 cf::init_attackmess;
3396 cf::init_dynamic;
3397
3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3399
3423 # we must not ever block the main coroutine 3400 # we must not ever block the main coroutine
3424 local $Coro::idle = sub { 3401 local $Coro::idle = sub {
3425 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3402 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3426 (async { 3403 (async {
3427 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3404 $Coro::current->{desc} = "IDLE BUG HANDLER";
3428 EV::loop EV::LOOP_ONESHOT; 3405 EV::loop EV::LOOP_ONESHOT;
3429 })->prio (Coro::PRIO_MAX); 3406 })->prio (Coro::PRIO_MAX);
3430 }; 3407 };
3431 3408
3432 { 3409 evthread_start IO::AIO::poll_fileno;
3433 my $guard = freeze_mainloop; 3410
3411 cf::sync_job {
3412 reload_resources;
3434 reload_config; 3413 reload_config;
3435 db_init; 3414 db_init;
3415
3416 cf::load_settings;
3417 cf::load_materials;
3418 cf::init_uuid;
3419 cf::init_signals;
3420 cf::init_commands;
3421 cf::init_skills;
3422
3423 cf::init_beforeplay;
3424
3425 atomic;
3426
3436 load_extensions; 3427 load_extensions;
3437 3428
3438 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3429 utime time, time, $RUNTIMEFILE;
3439 evthread_start IO::AIO::poll_fileno; 3430
3431 # no (long-running) fork's whatsoever before this point(!)
3432 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3433
3434 (pop @POST_INIT)->(0) while @POST_INIT;
3440 } 3435 };
3441 3436
3442 EV::loop; 3437 EV::loop;
3443} 3438}
3444 3439
3445############################################################################# 3440#############################################################################
… …
3454 }; 3449 };
3455 } 3450 }
3456} 3451}
3457 3452
3458sub write_runtime_sync { 3453sub write_runtime_sync {
3459 my $runtime = "$LOCALDIR/runtime";
3460
3461 # first touch the runtime file to show we are still running: 3454 # first touch the runtime file to show we are still running:
3462 # the fsync below can take a very very long time. 3455 # the fsync below can take a very very long time.
3463 3456
3464 IO::AIO::aio_utime $runtime, undef, undef; 3457 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3465 3458
3466 my $guard = cf::lock_acquire "write_runtime"; 3459 my $guard = cf::lock_acquire "write_runtime";
3467 3460
3468 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3461 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3469 or return; 3462 or return;
3470 3463
3471 my $value = $cf::RUNTIME + 90 + 10; 3464 my $value = $cf::RUNTIME + 90 + 10;
3472 # 10 is the runtime save interval, for a monotonic clock 3465 # 10 is the runtime save interval, for a monotonic clock
3473 # 60 allows for the watchdog to kill the server. 3466 # 60 allows for the watchdog to kill the server.
… …
3483 aio_utime $fh, undef, undef; 3476 aio_utime $fh, undef, undef;
3484 3477
3485 close $fh 3478 close $fh
3486 or return; 3479 or return;
3487 3480
3488 aio_rename "$runtime~", $runtime 3481 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3489 and return; 3482 and return;
3490 3483
3491 warn "runtime file written.\n"; 3484 warn "runtime file written.\n";
3492 3485
3493 1 3486 1
… …
3505 my $uuid = "$LOCALDIR/uuid"; 3498 my $uuid = "$LOCALDIR/uuid";
3506 3499
3507 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3500 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3508 or return; 3501 or return;
3509 3502
3510 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3503 my $value = uuid_seq uuid_cur;
3504
3505 unless ($value) {
3506 warn "cowardly refusing to write zero uuid value!\n";
3507 return;
3508 }
3509
3510 my $value = uuid_str $value + $uuid_skip;
3511 $uuid_skip = 0; 3511 $uuid_skip = 0;
3512 3512
3513 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3513 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3514 and return; 3514 and return;
3515 3515
… …
3537} 3537}
3538 3538
3539sub emergency_save() { 3539sub emergency_save() {
3540 my $freeze_guard = cf::freeze_mainloop; 3540 my $freeze_guard = cf::freeze_mainloop;
3541 3541
3542 warn "enter emergency perl save\n"; 3542 warn "emergency_perl_save: enter\n";
3543 3543
3544 cf::sync_job { 3544 cf::sync_job {
3545 # this is a trade-off: we want to be very quick here, so
3546 # save all maps without fsync, and later call a global sync
3547 # (which in turn might be very very slow)
3548 local $USE_FSYNC = 0;
3549
3545 # use a peculiar iteration method to avoid tripping on perl 3550 # use a peculiar iteration method to avoid tripping on perl
3546 # refcount bugs in for. also avoids problems with players 3551 # refcount bugs in for. also avoids problems with players
3547 # and maps saved/destroyed asynchronously. 3552 # and maps saved/destroyed asynchronously.
3548 warn "begin emergency player save\n"; 3553 warn "emergency_perl_save: begin player save\n";
3549 for my $login (keys %cf::PLAYER) { 3554 for my $login (keys %cf::PLAYER) {
3550 my $pl = $cf::PLAYER{$login} or next; 3555 my $pl = $cf::PLAYER{$login} or next;
3551 $pl->valid or next; 3556 $pl->valid or next;
3552 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3557 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3553 $pl->save; 3558 $pl->save;
3554 } 3559 }
3555 warn "end emergency player save\n"; 3560 warn "emergency_perl_save: end player save\n";
3556 3561
3557 warn "begin emergency map save\n"; 3562 warn "emergency_perl_save: begin map save\n";
3558 for my $path (keys %cf::MAP) { 3563 for my $path (keys %cf::MAP) {
3559 my $map = $cf::MAP{$path} or next; 3564 my $map = $cf::MAP{$path} or next;
3560 $map->valid or next; 3565 $map->valid or next;
3561 $map->save; 3566 $map->save;
3562 } 3567 }
3563 warn "end emergency map save\n"; 3568 warn "emergency_perl_save: end map save\n";
3564 3569
3565 warn "begin emergency database checkpoint\n"; 3570 warn "emergency_perl_save: begin database checkpoint\n";
3566 BDB::db_env_txn_checkpoint $DB_ENV; 3571 BDB::db_env_txn_checkpoint $DB_ENV;
3567 warn "end emergency database checkpoint\n"; 3572 warn "emergency_perl_save: end database checkpoint\n";
3568 3573
3569 warn "begin write uuid\n"; 3574 warn "emergency_perl_save: begin write uuid\n";
3570 write_uuid_sync 1; 3575 write_uuid_sync 1;
3571 warn "end write uuid\n"; 3576 warn "emergency_perl_save: end write uuid\n";
3572 }; 3577 };
3573 3578
3579 warn "emergency_perl_save: starting sync()\n";
3580 IO::AIO::aio_sync sub {
3581 warn "emergency_perl_save: finished sync()\n";
3582 };
3583
3574 warn "leave emergency perl save\n"; 3584 warn "emergency_perl_save: leave\n";
3575} 3585}
3576 3586
3577sub post_cleanup { 3587sub post_cleanup {
3578 my ($make_core) = @_; 3588 my ($make_core) = @_;
3579 3589
3580 warn Carp::longmess "post_cleanup backtrace" 3590 warn Carp::longmess "post_cleanup backtrace"
3581 if $make_core; 3591 if $make_core;
3592
3593 my $fh = pidfile;
3594 unlink $PIDFILE if <$fh> == $$;
3595}
3596
3597# a safer delete_package, copied from Symbol
3598sub clear_package($) {
3599 my $pkg = shift;
3600
3601 # expand to full symbol table name if needed
3602 unless ($pkg =~ /^main::.*::$/) {
3603 $pkg = "main$pkg" if $pkg =~ /^::/;
3604 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3605 $pkg .= '::' unless $pkg =~ /::$/;
3606 }
3607
3608 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3609 my $stem_symtab = *{$stem}{HASH};
3610
3611 defined $stem_symtab and exists $stem_symtab->{$leaf}
3612 or return;
3613
3614 # clear all symbols
3615 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3616 for my $name (keys %$leaf_symtab) {
3617 _gv_clear *{"$pkg$name"};
3618# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3619 }
3620 warn "cleared package $pkg\n";#d#
3582} 3621}
3583 3622
3584sub do_reload_perl() { 3623sub do_reload_perl() {
3585 # can/must only be called in main 3624 # can/must only be called in main
3586 if ($Coro::current != $Coro::main) { 3625 if ($Coro::current != $Coro::main) {
3587 warn "can only reload from main coroutine"; 3626 warn "can only reload from main coroutine";
3588 return; 3627 return;
3589 } 3628 }
3590 3629
3630 return if $RELOAD++;
3631
3632 my $t1 = EV::time;
3633
3634 while ($RELOAD) {
3591 warn "reloading..."; 3635 warn "reloading...";
3592 3636
3593 warn "entering sync_job"; 3637 warn "entering sync_job";
3594 3638
3595 cf::sync_job { 3639 cf::sync_job {
3596 cf::write_runtime_sync; # external watchdog should not bark 3640 cf::write_runtime_sync; # external watchdog should not bark
3597 cf::emergency_save; 3641 cf::emergency_save;
3598 cf::write_runtime_sync; # external watchdog should not bark 3642 cf::write_runtime_sync; # external watchdog should not bark
3599 3643
3600 warn "syncing database to disk"; 3644 warn "syncing database to disk";
3601 BDB::db_env_txn_checkpoint $DB_ENV; 3645 BDB::db_env_txn_checkpoint $DB_ENV;
3602 3646
3603 # if anything goes wrong in here, we should simply crash as we already saved 3647 # if anything goes wrong in here, we should simply crash as we already saved
3604 3648
3605 warn "flushing outstanding aio requests"; 3649 warn "flushing outstanding aio requests";
3606 for (;;) {
3607 BDB::flush;
3608 IO::AIO::flush;
3609 Coro::cede_notself;
3610 last unless IO::AIO::nreqs || BDB::nreqs; 3650 while (IO::AIO::nreqs || BDB::nreqs) {
3611 warn "iterate..."; 3651 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3612 }
3613
3614 ++$RELOAD;
3615
3616 warn "cancelling all extension coros";
3617 $_->cancel for values %EXT_CORO;
3618 %EXT_CORO = ();
3619
3620 warn "removing commands";
3621 %COMMAND = ();
3622
3623 warn "removing ext/exti commands";
3624 %EXTCMD = ();
3625 %EXTICMD = ();
3626
3627 warn "unloading/nuking all extensions";
3628 for my $pkg (@EXTS) {
3629 warn "... unloading $pkg";
3630
3631 if (my $cb = $pkg->can ("unload")) {
3632 eval {
3633 $cb->($pkg);
3634 1
3635 } or warn "$pkg unloaded, but with errors: $@";
3636 } 3652 }
3637 3653
3638 warn "... nuking $pkg"; 3654 warn "cancelling all extension coros";
3639 Symbol::delete_package $pkg; 3655 $_->cancel for values %EXT_CORO;
3640 } 3656 %EXT_CORO = ();
3641 3657
3642 warn "unloading all perl modules loaded from $LIBDIR"; 3658 warn "removing commands";
3643 while (my ($k, $v) = each %INC) { 3659 %COMMAND = ();
3644 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3645 3660
3661 warn "removing ext/exti commands";
3662 %EXTCMD = ();
3663 %EXTICMD = ();
3664
3665 warn "unloading/nuking all extensions";
3666 for my $pkg (@EXTS) {
3646 warn "... unloading $k"; 3667 warn "... unloading $pkg";
3647 delete $INC{$k};
3648 3668
3649 $k =~ s/\.pm$//;
3650 $k =~ s/\//::/g;
3651
3652 if (my $cb = $k->can ("unload_module")) { 3669 if (my $cb = $pkg->can ("unload")) {
3670 eval {
3653 $cb->(); 3671 $cb->($pkg);
3672 1
3673 } or warn "$pkg unloaded, but with errors: $@";
3674 }
3675
3676 warn "... clearing $pkg";
3677 clear_package $pkg;
3654 } 3678 }
3655 3679
3656 Symbol::delete_package $k; 3680 warn "unloading all perl modules loaded from $LIBDIR";
3681 while (my ($k, $v) = each %INC) {
3682 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3683
3684 warn "... unloading $k";
3685 delete $INC{$k};
3686
3687 $k =~ s/\.pm$//;
3688 $k =~ s/\//::/g;
3689
3690 if (my $cb = $k->can ("unload_module")) {
3691 $cb->();
3692 }
3693
3694 clear_package $k;
3657 } 3695 }
3658 3696
3659 warn "getting rid of safe::, as good as possible"; 3697 warn "getting rid of safe::, as good as possible";
3660 Symbol::delete_package "safe::$_" 3698 clear_package "safe::$_"
3661 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3699 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3662 3700
3663 warn "unloading cf.pm \"a bit\""; 3701 warn "unloading cf.pm \"a bit\"";
3664 delete $INC{"cf.pm"}; 3702 delete $INC{"cf.pm"};
3665 delete $INC{"cf/pod.pm"}; 3703 delete $INC{"cf/pod.pm"};
3666 3704
3667 # don't, removes xs symbols, too, 3705 # don't, removes xs symbols, too,
3668 # and global variables created in xs 3706 # and global variables created in xs
3669 #Symbol::delete_package __PACKAGE__; 3707 #clear_package __PACKAGE__;
3670 3708
3671 warn "unload completed, starting to reload now"; 3709 warn "unload completed, starting to reload now";
3672 3710
3673 warn "reloading cf.pm"; 3711 warn "reloading cf.pm";
3674 require cf; 3712 require cf;
3675 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3713 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3676 3714
3677 warn "loading config and database again"; 3715 warn "loading config and database again";
3678 cf::reload_config; 3716 cf::reload_config;
3679 3717
3680 warn "loading extensions"; 3718 warn "loading extensions";
3681 cf::load_extensions; 3719 cf::load_extensions;
3682 3720
3721 if ($REATTACH_ON_RELOAD) {
3683 warn "reattaching attachments to objects/players"; 3722 warn "reattaching attachments to objects/players";
3684 _global_reattach; # objects, sockets 3723 _global_reattach; # objects, sockets
3685 warn "reattaching attachments to maps"; 3724 warn "reattaching attachments to maps";
3686 reattach $_ for values %MAP; 3725 reattach $_ for values %MAP;
3687 warn "reattaching attachments to players"; 3726 warn "reattaching attachments to players";
3688 reattach $_ for values %PLAYER; 3727 reattach $_ for values %PLAYER;
3728 }
3689 3729
3730 warn "running post_init jobs";
3731 (pop @POST_INIT)->(1) while @POST_INIT;
3732
3690 warn "leaving sync_job"; 3733 warn "leaving sync_job";
3691 3734
3692 1 3735 1
3693 } or do { 3736 } or do {
3694 warn $@; 3737 warn $@;
3695 cf::cleanup "error while reloading, exiting."; 3738 cf::cleanup "error while reloading, exiting.";
3696 }; 3739 };
3697 3740
3698 warn "reloaded"; 3741 warn "reloaded";
3742 --$RELOAD;
3743 }
3744
3745 $t1 = EV::time - $t1;
3746 warn "reload completed in ${t1}s\n";
3699}; 3747};
3700 3748
3701our $RELOAD_WATCHER; # used only during reload 3749our $RELOAD_WATCHER; # used only during reload
3702 3750
3703sub reload_perl() { 3751sub reload_perl() {
3704 # doing reload synchronously and two reloads happen back-to-back, 3752 # doing reload synchronously and two reloads happen back-to-back,
3705 # coro crashes during coro_state_free->destroy here. 3753 # coro crashes during coro_state_free->destroy here.
3706 3754
3755 $RELOAD_WATCHER ||= cf::async {
3756 Coro::AIO::aio_wait cache_extensions;
3757
3707 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3758 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3708 do_reload_perl; 3759 do_reload_perl;
3709 undef $RELOAD_WATCHER; 3760 undef $RELOAD_WATCHER;
3761 };
3710 }; 3762 };
3711} 3763}
3712 3764
3713register_command "reload" => sub { 3765register_command "reload" => sub {
3714 my ($who, $arg) = @_; 3766 my ($who, $arg) = @_;
… …
3785{ 3837{
3786 # configure BDB 3838 # configure BDB
3787 3839
3788 BDB::min_parallel 8; 3840 BDB::min_parallel 8;
3789 BDB::max_poll_reqs $TICK * 0.1; 3841 BDB::max_poll_reqs $TICK * 0.1;
3790 $Coro::BDB::WATCHER->priority (1); 3842 $AnyEvent::BDB::WATCHER->priority (1);
3791 3843
3792 unless ($DB_ENV) { 3844 unless ($DB_ENV) {
3793 $DB_ENV = BDB::db_env_create; 3845 $DB_ENV = BDB::db_env_create;
3794 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3846 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3795 | BDB::LOG_AUTOREMOVE, 1); 3847 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3848 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3796 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3849 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3797 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3850 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3798 3851
3799 cf::sync_job { 3852 cf::sync_job {
3800 eval { 3853 eval {
… …
3826{ 3879{
3827 # configure IO::AIO 3880 # configure IO::AIO
3828 3881
3829 IO::AIO::min_parallel 8; 3882 IO::AIO::min_parallel 8;
3830 IO::AIO::max_poll_time $TICK * 0.1; 3883 IO::AIO::max_poll_time $TICK * 0.1;
3831 $Coro::AIO::WATCHER->priority (1); 3884 undef $AnyEvent::AIO::WATCHER;
3832} 3885}
3833 3886
3834my $_log_backtrace; 3887my $_log_backtrace;
3835 3888
3836sub _log_backtrace { 3889sub _log_backtrace {
… …
3839 $msg =~ s/\n//; 3892 $msg =~ s/\n//;
3840 3893
3841 # limit the # of concurrent backtraces 3894 # limit the # of concurrent backtraces
3842 if ($_log_backtrace < 2) { 3895 if ($_log_backtrace < 2) {
3843 ++$_log_backtrace; 3896 ++$_log_backtrace;
3897 my $perl_bt = Carp::longmess $msg;
3844 async { 3898 async {
3845 $Coro::current->{desc} = "abt $msg"; 3899 $Coro::current->{desc} = "abt $msg";
3846 3900
3847 my @bt = fork_call { 3901 my @bt = fork_call {
3848 @addr = map { sprintf "%x", $_ } @addr; 3902 @addr = map { sprintf "%x", $_ } @addr;
… …
3859 } 3913 }
3860 3914
3861 @funcs 3915 @funcs
3862 }; 3916 };
3863 3917
3864 LOG llevInfo, "[ABT] $msg\n"; 3918 LOG llevInfo, "[ABT] $perl_bt\n";
3919 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3865 LOG llevInfo, "[ABT] $_\n" for @bt; 3920 LOG llevInfo, "[ABT] $_\n" for @bt;
3866 --$_log_backtrace; 3921 --$_log_backtrace;
3867 }; 3922 };
3868 } else { 3923 } else {
3869 LOG llevInfo, "[ABT] $msg\n"; 3924 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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