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.434 by root, Thu May 29 03:27:37 2008 UTC vs.
Revision 1.466 by root, Thu Jan 8 03:03:24 2009 UTC

… …
19# The authors can be reached via e-mail to <support@deliantra.net> 19# The authors can be reached via e-mail to <support@deliantra.net>
20# 20#
21 21
22package cf; 22package cf;
23 23
24use 5.10.0;
24use utf8; 25use utf8;
25use strict; 26use strict qw(vars subs);
26 27
27use Symbol; 28use Symbol;
28use List::Util; 29use List::Util;
29use Socket; 30use Socket;
30use EV; 31use EV;
31use Opcode; 32use Opcode;
32use Safe; 33use Safe;
33use Safe::Hole; 34use Safe::Hole;
34use Storable (); 35use Storable ();
35 36
37use Guard ();
36use Coro (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
39use Coro::AnyEvent; 42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
43use Coro::AnyEvent; 47use Coro::AnyEvent;
44use Coro::AIO; 48use Coro::AIO;
45use Coro::BDB; 49use Coro::BDB 1.6;
46use Coro::Storable; 50use Coro::Storable;
47use Coro::Util (); 51use Coro::Util ();
48 52
49use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
50use BDB (); 54use BDB ();
… …
57use Compress::LZF; 61use Compress::LZF;
58use Digest::MD5 (); 62use Digest::MD5 ();
59 63
60AnyEvent::detect; 64AnyEvent::detect;
61 65
62IO::AIO::max_poll_reqs 1;#d#
63
64# configure various modules to our taste 66# configure various modules to our taste
65# 67#
66$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
67Coro::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";
68Compress::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
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71 76
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
73 78
74our %COMMAND = (); 79our %COMMAND = ();
75our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
… …
78our %EXTCMD = (); 83our %EXTCMD = ();
79our %EXTICMD = (); 84our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
82 87
83our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 89our @EVENT;
85 90
86our $CONFDIR = confdir; 91our $CONFDIR = confdir;
87our $DATADIR = datadir; 92our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 94our $PODDIR = "$DATADIR/pod";
90our $MAPDIR = "$DATADIR/" . mapdir; 95our $MAPDIR = "$DATADIR/" . mapdir;
91our $LOCALDIR = localdir; 96our $LOCALDIR = localdir;
92our $TMPDIR = "$LOCALDIR/" . tmpdir; 97our $TMPDIR = "$LOCALDIR/" . tmpdir;
93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94our $PLAYERDIR = "$LOCALDIR/" . playerdir; 99our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95our $RANDOMDIR = "$LOCALDIR/random"; 100our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 101our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime";
104
97our %RESOURCE; 105our %RESOURCE;
98 106
99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
101our $NEXT_TICK; 109our $NEXT_TICK;
… …
104our $BDB_DEADLOCK_WATCHER; 112our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER; 113our $BDB_CHECKPOINT_WATCHER;
106our $BDB_TRICKLE_WATCHER; 114our $BDB_TRICKLE_WATCHER;
107our $DB_ENV; 115our $DB_ENV;
108 116
117our @EXTRA_MODULES = qw(pod mapscript);
118
109our %CFG; 119our %CFG;
110 120
111our $UPTIME; $UPTIME ||= time; 121our $UPTIME; $UPTIME ||= time;
112our $RUNTIME; 122our $RUNTIME;
113our $NOW; 123our $NOW;
… …
122our $LOAD; # a number between 0 (idle) and 1 (too many objects) 132our $LOAD; # a number between 0 (idle) and 1 (too many objects)
123our $LOADAVG; # same thing, but with alpha-smoothing 133our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter 134our $JITTER; # average jitter
125our $TICK_START; # for load detecting purposes 135our $TICK_START; # for load detecting purposes
126 136
137our @POST_INIT;
138
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
140
127binmode STDOUT; 141binmode STDOUT;
128binmode STDERR; 142binmode STDERR;
129 143
130# read virtual server time, if available 144# read virtual server time, if available
131unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 145unless ($RUNTIME || !-e $RUNTIMEFILE) {
132 open my $fh, "<", "$LOCALDIR/runtime" 146 open my $fh, "<", $RUNTIMEFILE
133 or die "unable to read runtime file: $!"; 147 or die "unable to read $RUNTIMEFILE file: $!";
134 $RUNTIME = <$fh> + 0.; 148 $RUNTIME = <$fh> + 0.;
135} 149}
136 150
137mkdir $_ 151mkdir $_
138 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 152 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
245for my $pkg (qw( 259for my $pkg (qw(
246 cf::global cf::attachable 260 cf::global cf::attachable
247 cf::object cf::object::player 261 cf::object cf::object::player
248 cf::client cf::player 262 cf::client cf::player
249 cf::arch cf::living 263 cf::arch cf::living
264 cf::map cf::mapspace
250 cf::map cf::party cf::region 265 cf::party cf::region
251)) { 266)) {
252 no strict 'refs';
253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 267 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
254} 268}
255 269
256$EV::DIED = sub { 270$EV::DIED = sub {
257 warn "error in event callback: @_"; 271 warn "error in event callback: @_";
… …
299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 313our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
300 314
301sub encode_json($) { $json_coder->encode ($_[0]) } 315sub encode_json($) { $json_coder->encode ($_[0]) }
302sub decode_json($) { $json_coder->decode ($_[0]) } 316sub decode_json($) { $json_coder->decode ($_[0]) }
303 317
318=item cf::post_init { BLOCK }
319
320Execute the given codeblock, I<after> all extensions have been (re-)loaded,
321but I<before> the server starts ticking again.
322
323The cdoeblock will have a single boolean argument to indicate whether this
324is a reload or not.
325
326=cut
327
328sub post_init(&) {
329 push @POST_INIT, shift;
330}
331
304=item cf::lock_wait $string 332=item cf::lock_wait $string
305 333
306Wait until the given lock is available. See cf::lock_acquire. 334Wait until the given lock is available. See cf::lock_acquire.
307 335
308=item my $lock = cf::lock_acquire $string 336=item my $lock = cf::lock_acquire $string
309 337
310Wait until the given lock is available and then acquires it and returns 338Wait until the given lock is available and then acquires it and returns
311a Coro::guard object. If the guard object gets destroyed (goes out of scope, 339a L<Guard> object. If the guard object gets destroyed (goes out of scope,
312for example when the coroutine gets canceled), the lock is automatically 340for example when the coroutine gets canceled), the lock is automatically
313returned. 341returned.
314 342
315Locks are *not* recursive, locking from the same coro twice results in a 343Locks are *not* recursive, locking from the same coro twice results in a
316deadlocked coro. 344deadlocked coro.
… …
322 350
323Return true if the lock is currently active, i.e. somebody has locked it. 351Return true if the lock is currently active, i.e. somebody has locked it.
324 352
325=cut 353=cut
326 354
327our %LOCK; 355our $LOCKS = new Coro::SemaphoreSet;
328our %LOCKER;#d#
329 356
330sub lock_wait($) { 357sub lock_wait($) {
331 my ($key) = @_; 358 $LOCKS->wait ($_[0]);
332
333 if ($LOCKER{$key} == $Coro::current) {#d#
334 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
335 return;#d#
336 }#d#
337
338 # wait for lock, if any
339 while ($LOCK{$key}) {
340 push @{ $LOCK{$key} }, $Coro::current;
341 Coro::schedule;
342 }
343} 359}
344 360
345sub lock_acquire($) { 361sub lock_acquire($) {
346 my ($key) = @_; 362 $LOCKS->guard ($_[0])
347
348 # wait, to be sure we are not locked
349 lock_wait $key;
350
351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
353
354 Coro::guard {
355 delete $LOCKER{$key};#d#
356 # wake up all waiters, to be on the safe side
357 $_->ready for @{ delete $LOCK{$key} };
358 }
359} 363}
360 364
361sub lock_active($) { 365sub lock_active($) {
362 my ($key) = @_; 366 $LOCKS->count ($_[0]) < 1
363
364 ! ! $LOCK{$key}
365} 367}
366 368
367sub freeze_mainloop { 369sub freeze_mainloop {
368 tick_inhibit_inc; 370 tick_inhibit_inc;
369 371
370 Coro::guard \&tick_inhibit_dec; 372 &Guard::guard (\&tick_inhibit_dec);
371} 373}
372 374
373=item cf::periodic $interval, $cb 375=item cf::periodic $interval, $cb
374 376
375Like EV::periodic, but randomly selects a starting point so that the actions 377Like EV::periodic, but randomly selects a starting point so that the actions
… …
727 729
728############################################################################# 730#############################################################################
729 731
730=head2 ATTACHABLE OBJECTS 732=head2 ATTACHABLE OBJECTS
731 733
732Many objects in crossfire are so-called attachable objects. That means you can 734Many objects in deliantra are so-called attachable objects. That means you can
733attach callbacks/event handlers (a collection of which is called an "attachment") 735attach callbacks/event handlers (a collection of which is called an "attachment")
734to it. All such attachable objects support the following methods. 736to it. All such attachable objects support the following methods.
735 737
736In the following description, CLASS can be any of C<global>, C<object> 738In the following description, CLASS can be any of C<global>, C<object>
737C<player>, C<client> or C<map> (i.e. the attachable objects in 739C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
787=item cf::CLASS::attachment $name, ... 789=item cf::CLASS::attachment $name, ...
788 790
789Register an attachment by C<$name> through which attachable objects of the 791Register an attachment by C<$name> through which attachable objects of the
790given CLASS can refer to this attachment. 792given CLASS can refer to this attachment.
791 793
792Some classes such as crossfire maps and objects can specify attachments 794Some classes such as deliantra maps and objects can specify attachments
793that are attached at load/instantiate time, thus the need for a name. 795that are attached at load/instantiate time, thus the need for a name.
794 796
795These calls expect any number of the following handler/hook descriptions: 797These calls expect any number of the following handler/hook descriptions:
796 798
797=over 4 799=over 4
… …
1088 1090
1089sub reattach { 1091sub reattach {
1090 # basically do the same as instantiate, without calling instantiate 1092 # basically do the same as instantiate, without calling instantiate
1091 my ($obj) = @_; 1093 my ($obj) = @_;
1092 1094
1095 # no longer needed after getting rid of delete_package?
1093 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1096 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1094 1097
1095 my $registry = $obj->registry; 1098 my $registry = $obj->registry;
1096 1099
1097 @$registry = (); 1100 @$registry = ();
1098 1101
… …
1163 } else { 1166 } else {
1164 aio_unlink "$filename.pst"; 1167 aio_unlink "$filename.pst";
1165 } 1168 }
1166 1169
1167 aio_rename "$filename~", $filename; 1170 aio_rename "$filename~", $filename;
1171
1172 $filename =~ s%/[^/]+$%%;
1173 aio_pathsync $filename if $cf::USE_FSYNC;
1168 } else { 1174 } else {
1169 warn "FATAL: $filename~: $!\n"; 1175 warn "unable to save objects: $filename~: $!\n";
1170 } 1176 }
1171 } else { 1177 } else {
1172 aio_unlink $filename; 1178 aio_unlink $filename;
1173 aio_unlink "$filename.pst"; 1179 aio_unlink "$filename.pst";
1174 } 1180 }
… …
1265 my ($name, $cb) = @_; 1271 my ($name, $cb) = @_;
1266 1272
1267 $EXTICMD{$name} = $cb; 1273 $EXTICMD{$name} = $cb;
1268} 1274}
1269 1275
1276use File::Glob ();
1277
1270cf::player->attach ( 1278cf::player->attach (
1271 on_command => sub { 1279 on_command => sub {
1272 my ($pl, $name, $params) = @_; 1280 my ($pl, $name, $params) = @_;
1273 1281
1274 my $cb = $COMMAND{$name} 1282 my $cb = $COMMAND{$name}
… …
1306 1314
1307 cf::override; 1315 cf::override;
1308 }, 1316 },
1309); 1317);
1310 1318
1319# "readahead" all extensions
1320sub cache_extensions {
1321 my $grp = IO::AIO::aio_group;
1322
1323 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1324 for (grep /\.ext$/, @{$_[0]}) {
1325 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1326 }
1327 };
1328
1329 $grp
1330}
1331
1311sub load_extensions { 1332sub load_extensions {
1312 cf::sync_job { 1333 cf::sync_job {
1313 my %todo; 1334 my %todo;
1314 1335
1315 for my $path (<$LIBDIR/*.ext>) { 1336 for my $path (<$LIBDIR/*.ext>) {
… …
1334 1355
1335 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1356 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1336 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1357 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1337 1358
1338 $ext{source} = 1359 $ext{source} =
1339 "package $pkg; use strict; use utf8;\n" 1360 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1340 . "#line 1 \"$path\"\n{\n" 1361 . "#line 1 \"$path\"\n{\n"
1341 . $source 1362 . $source
1342 . "\n};\n1"; 1363 . "\n};\n1";
1343 1364
1344 $todo{$base} = \%ext; 1365 $todo{$base} = \%ext;
… …
1384 1405
1385=back 1406=back
1386 1407
1387=head2 CORE EXTENSIONS 1408=head2 CORE EXTENSIONS
1388 1409
1389Functions and methods that extend core crossfire objects. 1410Functions and methods that extend core deliantra objects.
1390 1411
1391=cut 1412=cut
1392 1413
1393package cf::player; 1414package cf::player;
1394 1415
… …
1437 1458
1438sub exists($) { 1459sub exists($) {
1439 my ($login) = @_; 1460 my ($login) = @_;
1440 1461
1441 $cf::PLAYER{$login} 1462 $cf::PLAYER{$login}
1442 or cf::sync_job { !aio_stat path $login } 1463 or !aio_stat path $login
1443} 1464}
1444 1465
1445sub find($) { 1466sub find($) {
1446 return $cf::PLAYER{$_[0]} || do { 1467 return $cf::PLAYER{$_[0]} || do {
1447 my $login = $_[0]; 1468 my $login = $_[0];
… …
1522 my ($pl) = @_; 1543 my ($pl) = @_;
1523 1544
1524 my $name = $pl->ob->name; 1545 my $name = $pl->ob->name;
1525 1546
1526 $pl->{deny_save} = 1; 1547 $pl->{deny_save} = 1;
1527 $pl->password ("*"); # this should lock out the player until we nuked the dir 1548 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1528 1549
1529 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1550 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1530 $pl->deactivate; 1551 $pl->deactivate;
1531 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1552 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1532 $pl->ob->check_score; 1553 $pl->ob->check_score;
… …
1618 } 1639 }
1619 1640
1620 \@paths 1641 \@paths
1621} 1642}
1622 1643
1623=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1644=item $protocol_xml = $player->expand_cfpod ($cfpod)
1624 1645
1625Expand crossfire pod fragments into protocol xml. 1646Expand deliantra pod fragments into protocol xml.
1626
1627=cut
1628
1629use re 'eval';
1630
1631my $group;
1632my $interior; $interior = qr{
1633 # match a pod interior sequence sans C<< >>
1634 (?:
1635 \ (.*?)\ (?{ $group = $^N })
1636 | < (??{$interior}) >
1637 )
1638}x;
1639
1640sub expand_cfpod {
1641 my ($self, $pod) = @_;
1642
1643 my $xml;
1644
1645 while () {
1646 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1647 $group = $1;
1648
1649 $group =~ s/&/&amp;/g;
1650 $group =~ s/</&lt;/g;
1651
1652 $xml .= $group;
1653 } elsif ($pod =~ m%\G
1654 ([BCGHITU])
1655 <
1656 (?:
1657 ([^<>]*) (?{ $group = $^N })
1658 | < $interior >
1659 )
1660 >
1661 %gcsx
1662 ) {
1663 my ($code, $data) = ($1, $group);
1664
1665 if ($code eq "B") {
1666 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1667 } elsif ($code eq "I") {
1668 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1669 } elsif ($code eq "U") {
1670 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1671 } elsif ($code eq "C") {
1672 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1673 } elsif ($code eq "T") {
1674 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1675 } elsif ($code eq "G") {
1676 my ($male, $female) = split /\|/, $data;
1677 $data = $self->gender ? $female : $male;
1678 $xml .= expand_cfpod ($self, $data);
1679 } elsif ($code eq "H") {
1680 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1681 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1682 "")
1683 [$self->{hintmode}];
1684 } else {
1685 $xml .= "error processing '$code($data)' directive";
1686 }
1687 } else {
1688 if ($pod =~ /\G(.+)/) {
1689 warn "parse error while expanding $pod (at $1)";
1690 }
1691 last;
1692 }
1693 }
1694
1695 for ($xml) {
1696 # create single paragraphs (very hackish)
1697 s/(?<=\S)\n(?=\w)/ /g;
1698
1699 # compress some whitespace
1700 s/\s+\n/\n/g; # ws line-ends
1701 s/\n\n+/\n/g; # double lines
1702 s/^\n+//; # beginning lines
1703 s/\n+$//; # ending lines
1704 }
1705
1706 $xml
1707}
1708
1709no re 'eval';
1710
1711sub hintmode {
1712 $_[0]{hintmode} = $_[1] if @_ > 1;
1713 $_[0]{hintmode}
1714}
1715 1647
1716=item $player->ext_reply ($msgid, @msg) 1648=item $player->ext_reply ($msgid, @msg)
1717 1649
1718Sends an ext reply to the player. 1650Sends an ext reply to the player.
1719 1651
… …
1932 1864
1933 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1865 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1934 "$UNIQUEDIR/$path" 1866 "$UNIQUEDIR/$path"
1935} 1867}
1936 1868
1937# and all this just because we cannot iterate over
1938# all maps in C++...
1939sub change_all_map_light {
1940 my ($change) = @_;
1941
1942 $_->change_map_light ($change)
1943 for grep $_->outdoor, values %cf::MAP;
1944}
1945
1946sub decay_objects { 1869sub decay_objects {
1947 my ($self) = @_; 1870 my ($self) = @_;
1948 1871
1949 return if $self->{deny_reset}; 1872 return if $self->{deny_reset};
1950 1873
… …
2032sub find { 1955sub find {
2033 my ($path, $origin) = @_; 1956 my ($path, $origin) = @_;
2034 1957
2035 $path = normalise $path, $origin && $origin->path; 1958 $path = normalise $path, $origin && $origin->path;
2036 1959
2037 cf::lock_wait "map_data:$path";#d#remove 1960 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2038 cf::lock_wait "map_find:$path"; 1961 my $guard2 = cf::lock_acquire "map_find:$path";
2039 1962
2040 $cf::MAP{$path} || do { 1963 $cf::MAP{$path} || do {
2041 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2042 my $guard2 = cf::lock_acquire "map_find:$path";
2043
2044 my $map = new_from_path cf::map $path 1964 my $map = new_from_path cf::map $path
2045 or return; 1965 or return;
2046 1966
2047 $map->{last_save} = $cf::RUNTIME; 1967 $map->{last_save} = $cf::RUNTIME;
2048 1968
… …
2088 my $f = new_from_file cf::object::thawer $self->{load_path}; 2008 my $f = new_from_file cf::object::thawer $self->{load_path};
2089 $f->skip_block; 2009 $f->skip_block;
2090 $self->_load_objects ($f) 2010 $self->_load_objects ($f)
2091 or return; 2011 or return;
2092 2012
2093 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2013 $self->post_load_original
2094 if delete $self->{load_original}; 2014 if delete $self->{load_original};
2095 2015
2096 if (my $uniq = $self->uniq_path) { 2016 if (my $uniq = $self->uniq_path) {
2097 utf8::encode $uniq; 2017 utf8::encode $uniq;
2098 unless (aio_stat $uniq) { 2018 unless (aio_stat $uniq) {
… …
2115 2035
2116 unless ($self->{deny_activate}) { 2036 unless ($self->{deny_activate}) {
2117 $self->decay_objects; 2037 $self->decay_objects;
2118 $self->fix_auto_apply; 2038 $self->fix_auto_apply;
2119 $self->update_buttons; 2039 $self->update_buttons;
2120 cf::cede_to_tick;
2121 $self->set_darkness_map;
2122 cf::cede_to_tick; 2040 cf::cede_to_tick;
2123 $self->activate; 2041 $self->activate;
2124 } 2042 }
2125 2043
2126 $self->{last_save} = $cf::RUNTIME; 2044 $self->{last_save} = $cf::RUNTIME;
… …
2533 2451
2534=item $player_object->enter_link 2452=item $player_object->enter_link
2535 2453
2536Freezes the player and moves him/her to a special map (C<{link}>). 2454Freezes the player and moves him/her to a special map (C<{link}>).
2537 2455
2538The player should be reasonably safe there for short amounts of time. You 2456The player should be reasonably safe there for short amounts of time (e.g.
2539I<MUST> call C<leave_link> as soon as possible, though. 2457for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2458though, as the palyer cannot control the character while it is on the link
2459map.
2540 2460
2541Will never block. 2461Will never block.
2542 2462
2543=item $player_object->leave_link ($map, $x, $y) 2463=item $player_object->leave_link ($map, $x, $y)
2544 2464
… …
2602 2522
2603 $map->load; 2523 $map->load;
2604 $map->load_neighbours; 2524 $map->load_neighbours;
2605 2525
2606 return unless $self->contr->active; 2526 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2607 $self->activate_recursive; 2528 $self->activate_recursive;
2608 2529
2609 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2610 $self->enter_map ($map, $x, $y); 2531 $self->enter_map ($map, $x, $y);
2611} 2532}
… …
2615Moves the player to the given map-path and coordinates by first freezing 2536Moves the player to the given map-path and coordinates by first freezing
2616her, loading and preparing them map, calling the provided $check callback 2537her, loading and preparing them map, calling the provided $check callback
2617that has to return the map if sucecssful, and then unfreezes the player on 2538that has to return the map if sucecssful, and then unfreezes the player on
2618the new (success) or old (failed) map position. In either case, $done will 2539the new (success) or old (failed) map position. In either case, $done will
2619be called at the end of this process. 2540be called at the end of this process.
2541
2542Note that $check will be called with a potentially non-loaded map, so if
2543it needs a loaded map it has to call C<< ->load >>.
2620 2544
2621=cut 2545=cut
2622 2546
2623our $GOTOGEN; 2547our $GOTOGEN;
2624 2548
… …
2771 $self->contr->savebed ($map, $x, $y) 2695 $self->contr->savebed ($map, $x, $y)
2772 if $exit->flag (cf::FLAG_DAMNED); 2696 if $exit->flag (cf::FLAG_DAMNED);
2773 2697
2774 1 2698 1
2775 }) { 2699 }) {
2776 $self->message ("Something went wrong deep within the crossfire server. " 2700 $self->message ("Something went wrong deep within the deliantra server. "
2777 . "I'll try to bring you back to the map you were before. " 2701 . "I'll try to bring you back to the map you were before. "
2778 . "Please report this to the dungeon master!", 2702 . "Please report this to the dungeon master!",
2779 cf::NDI_UNIQUE | cf::NDI_RED); 2703 cf::NDI_UNIQUE | cf::NDI_RED);
2780 2704
2781 warn "ERROR in enter_exit: $@"; 2705 warn "ERROR in enter_exit: $@";
… …
2847 id => "infobox", 2771 id => "infobox",
2848 title => "Body Parts", 2772 title => "Body Parts",
2849 reply => undef, 2773 reply => undef,
2850 tooltip => "Shows which body parts you posess and are available", 2774 tooltip => "Shows which body parts you posess and are available",
2851 }, 2775 },
2776 "c/statistics" => {
2777 id => "infobox",
2778 title => "Statistics",
2779 reply => undef,
2780 tooltip => "Shows your primary statistics",
2781 },
2782 "c/skills" => {
2783 id => "infobox",
2784 title => "Skills",
2785 reply => undef,
2786 tooltip => "Shows your experience per skill and item power",
2787 },
2788 "c/resistances" => {
2789 id => "infobox",
2790 title => "Resistances",
2791 reply => undef,
2792 tooltip => "Shows your resistances",
2793 },
2794 "c/pets" => {
2795 id => "infobox",
2796 title => "Pets",
2797 reply => undef,
2798 tooltip => "Shows information abotu your pets/a specific pet",
2799 },
2852 "c/uptime" => { 2800 "c/uptime" => {
2853 id => "infobox", 2801 id => "infobox",
2854 title => "Uptime", 2802 title => "Uptime",
2855 reply => undef, 2803 reply => undef,
2856 tooltip => "How long the server has been running since last restart", 2804 tooltip => "How long the server has been running since last restart",
… …
2865 id => "party", 2813 id => "party",
2866 title => "Party", 2814 title => "Party",
2867 reply => "gsay ", 2815 reply => "gsay ",
2868 tooltip => "Messages and chat related to your party", 2816 tooltip => "Messages and chat related to your party",
2869 }, 2817 },
2818 "c/death" => {
2819 id => "death",
2820 title => "Death",
2821 reply => undef,
2822 tooltip => "Reason for and more info about your most recent death",
2823 },
2824 "c/say" => $SAY_CHANNEL,
2825 "c/chat" => $CHAT_CHANNEL,
2870); 2826);
2871 2827
2872sub cf::client::send_msg { 2828sub cf::client::send_msg {
2873 my ($self, $channel, $msg, $color, @extra) = @_; 2829 my ($self, $channel, $msg, $color, @extra) = @_;
2874 2830
2875 $msg = $self->pl->expand_cfpod ($msg); 2831 $msg = $self->pl->expand_cfpod ($msg)
2832 unless $color & cf::NDI_VERBATIM;
2876 2833
2877 $color &= cf::NDI_CLIENT_MASK; # just in case... 2834 $color &= cf::NDI_CLIENT_MASK; # just in case...
2878 2835
2879 # check predefined channels, for the benefit of C 2836 # check predefined channels, for the benefit of C
2880 if ($CHANNEL{$channel}) { 2837 if ($CHANNEL{$channel}) {
2881 $channel = $CHANNEL{$channel}; 2838 $channel = $CHANNEL{$channel};
2882 2839
2883 $self->ext_msg (channel_info => $channel) 2840 $self->ext_msg (channel_info => $channel);
2884 if $self->can_msg;
2885
2886 $channel = $channel->{id}; 2841 $channel = $channel->{id};
2887 2842
2888 } elsif (ref $channel) { 2843 } elsif (ref $channel) {
2889 # send meta info to client, if not yet sent 2844 # send meta info to client, if not yet sent
2890 unless (exists $self->{channel}{$channel->{id}}) { 2845 unless (exists $self->{channel}{$channel->{id}}) {
2891 $self->{channel}{$channel->{id}} = $channel; 2846 $self->{channel}{$channel->{id}} = $channel;
2892 $self->ext_msg (channel_info => $channel) 2847 $self->ext_msg (channel_info => $channel);
2893 if $self->can_msg;
2894 } 2848 }
2895 2849
2896 $channel = $channel->{id}; 2850 $channel = $channel->{id};
2897 } 2851 }
2898 2852
2899 return unless @extra || length $msg; 2853 return unless @extra || length $msg;
2900 2854
2901 if ($self->can_msg) {
2902 # default colour, mask it out 2855 # default colour, mask it out
2903 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2856 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2904 if $color & cf::NDI_DEF; 2857 if $color & cf::NDI_DEF;
2905 2858
2906 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2859 my $pkt = "msg "
2860 . $self->{json_coder}->encode (
2907 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2861 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2908 } else { 2862 );
2909 if ($color >= 0) {
2910 # replace some tags by gcfclient-compatible ones
2911 for ($msg) {
2912 1 while
2913 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2914 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2915 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2916 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2917 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2918 }
2919 2863
2920 $color &= cf::NDI_COLOR_MASK; 2864 # try lzf for large packets
2865 $pkt = "lzf " . Compress::LZF::compress $pkt
2866 if 1024 <= length $pkt and $self->{can_lzf};
2921 2867
2922 utf8::encode $msg; 2868 # split very large packets
2923 2869 if (8192 < length $pkt and $self->{can_lzf}) {
2924 if (0 && $msg =~ /\[/) { 2870 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2925 # COMMAND/INFO 2871 $pkt = "frag";
2926 $self->send_packet ("drawextinfo $color 10 8 $msg")
2927 } else {
2928 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2929 $self->send_packet ("drawinfo $color $msg")
2930 }
2931 }
2932 } 2872 }
2873
2874 $self->send_packet ($pkt);
2933} 2875}
2934 2876
2935=item $client->ext_msg ($type, @msg) 2877=item $client->ext_msg ($type, @msg)
2936 2878
2937Sends an ext event to the client. 2879Sends an ext event to the client.
… …
3112The following functions and methods are available within a safe environment: 3054The following functions and methods are available within a safe environment:
3113 3055
3114 cf::object 3056 cf::object
3115 contr pay_amount pay_player map x y force_find force_add destroy 3057 contr pay_amount pay_player map x y force_find force_add destroy
3116 insert remove name archname title slaying race decrease split 3058 insert remove name archname title slaying race decrease split
3059 value
3117 3060
3118 cf::object::player 3061 cf::object::player
3119 player 3062 player
3120 3063
3121 cf::player 3064 cf::player
… …
3127=cut 3070=cut
3128 3071
3129for ( 3072for (
3130 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3073 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3131 insert remove inv nrof name archname title slaying race 3074 insert remove inv nrof name archname title slaying race
3132 decrease split destroy)], 3075 decrease split destroy change_exp value msg lore send_msg)],
3133 ["cf::object::player" => qw(player)], 3076 ["cf::object::player" => qw(player)],
3134 ["cf::player" => qw(peaceful)], 3077 ["cf::player" => qw(peaceful send_msg)],
3135 ["cf::map" => qw(trigger)], 3078 ["cf::map" => qw(trigger)],
3136) { 3079) {
3137 no strict 'refs'; 3080 no strict 'refs';
3138 my ($pkg, @funs) = @$_; 3081 my ($pkg, @funs) = @$_;
3139 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3082 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3156 my ($code, %vars) = @_; 3099 my ($code, %vars) = @_;
3157 3100
3158 my $qcode = $code; 3101 my $qcode = $code;
3159 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3102 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3160 $qcode =~ s/\n/\\n/g; 3103 $qcode =~ s/\n/\\n/g;
3104
3105 %vars = (_dummy => 0) unless %vars;
3161 3106
3162 local $_; 3107 local $_;
3163 local @safe::cf::_safe_eval_args = values %vars; 3108 local @safe::cf::_safe_eval_args = values %vars;
3164 3109
3165 my $eval = 3110 my $eval =
… …
3395 reload_treasures; 3340 reload_treasures;
3396 3341
3397 warn "finished reloading resource files\n"; 3342 warn "finished reloading resource files\n";
3398} 3343}
3399 3344
3400sub init {
3401 my $guard = freeze_mainloop;
3402
3403 reload_resources;
3404}
3405
3406sub reload_config { 3345sub reload_config {
3407 open my $fh, "<:utf8", "$CONFDIR/config" 3346 open my $fh, "<:utf8", "$CONFDIR/config"
3408 or return; 3347 or return;
3409 3348
3410 local $/; 3349 local $/;
… …
3422 }; 3361 };
3423 warn $@ if $@; 3362 warn $@ if $@;
3424 } 3363 }
3425} 3364}
3426 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
3427sub 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
3428 # we must not ever block the main coroutine 3400 # we must not ever block the main coroutine
3429 local $Coro::idle = sub { 3401 local $Coro::idle = sub {
3430 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#
3431 (async { 3403 (async {
3432 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3404 $Coro::current->{desc} = "IDLE BUG HANDLER";
3433 EV::loop EV::LOOP_ONESHOT; 3405 EV::loop EV::LOOP_ONESHOT;
3434 })->prio (Coro::PRIO_MAX); 3406 })->prio (Coro::PRIO_MAX);
3435 }; 3407 };
3436 3408
3437 { 3409 evthread_start IO::AIO::poll_fileno;
3438 my $guard = freeze_mainloop; 3410
3411 cf::sync_job {
3412 reload_resources;
3439 reload_config; 3413 reload_config;
3440 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
3441 load_extensions; 3427 load_extensions;
3442 3428
3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3429 utime time, time, $RUNTIMEFILE;
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;
3444 } 3435 };
3445 3436
3446 EV::loop; 3437 EV::loop;
3447} 3438}
3448 3439
3449############################################################################# 3440#############################################################################
… …
3458 }; 3449 };
3459 } 3450 }
3460} 3451}
3461 3452
3462sub write_runtime_sync { 3453sub write_runtime_sync {
3463 my $runtime = "$LOCALDIR/runtime";
3464
3465 # first touch the runtime file to show we are still running: 3454 # first touch the runtime file to show we are still running:
3466 # the fsync below can take a very very long time. 3455 # the fsync below can take a very very long time.
3467 3456
3468 IO::AIO::aio_utime $runtime, undef, undef; 3457 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3469 3458
3470 my $guard = cf::lock_acquire "write_runtime"; 3459 my $guard = cf::lock_acquire "write_runtime";
3471 3460
3472 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3461 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3473 or return; 3462 or return;
3474 3463
3475 my $value = $cf::RUNTIME + 90 + 10; 3464 my $value = $cf::RUNTIME + 90 + 10;
3476 # 10 is the runtime save interval, for a monotonic clock 3465 # 10 is the runtime save interval, for a monotonic clock
3477 # 60 allows for the watchdog to kill the server. 3466 # 60 allows for the watchdog to kill the server.
… …
3487 aio_utime $fh, undef, undef; 3476 aio_utime $fh, undef, undef;
3488 3477
3489 close $fh 3478 close $fh
3490 or return; 3479 or return;
3491 3480
3492 aio_rename "$runtime~", $runtime 3481 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3493 and return; 3482 and return;
3494 3483
3495 warn "runtime file written.\n"; 3484 warn "runtime file written.\n";
3496 3485
3497 1 3486 1
… …
3509 my $uuid = "$LOCALDIR/uuid"; 3498 my $uuid = "$LOCALDIR/uuid";
3510 3499
3511 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3500 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3512 or return; 3501 or return;
3513 3502
3514 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;
3515 $uuid_skip = 0; 3511 $uuid_skip = 0;
3516 3512
3517 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3513 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3518 and return; 3514 and return;
3519 3515
… …
3541} 3537}
3542 3538
3543sub emergency_save() { 3539sub emergency_save() {
3544 my $freeze_guard = cf::freeze_mainloop; 3540 my $freeze_guard = cf::freeze_mainloop;
3545 3541
3546 warn "enter emergency perl save\n"; 3542 warn "emergency_perl_save: enter\n";
3547 3543
3548 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
3549 # use a peculiar iteration method to avoid tripping on perl 3550 # use a peculiar iteration method to avoid tripping on perl
3550 # refcount bugs in for. also avoids problems with players 3551 # refcount bugs in for. also avoids problems with players
3551 # and maps saved/destroyed asynchronously. 3552 # and maps saved/destroyed asynchronously.
3552 warn "begin emergency player save\n"; 3553 warn "emergency_perl_save: begin player save\n";
3553 for my $login (keys %cf::PLAYER) { 3554 for my $login (keys %cf::PLAYER) {
3554 my $pl = $cf::PLAYER{$login} or next; 3555 my $pl = $cf::PLAYER{$login} or next;
3555 $pl->valid or next; 3556 $pl->valid or next;
3556 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3557 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3557 $pl->save; 3558 $pl->save;
3558 } 3559 }
3559 warn "end emergency player save\n"; 3560 warn "emergency_perl_save: end player save\n";
3560 3561
3561 warn "begin emergency map save\n"; 3562 warn "emergency_perl_save: begin map save\n";
3562 for my $path (keys %cf::MAP) { 3563 for my $path (keys %cf::MAP) {
3563 my $map = $cf::MAP{$path} or next; 3564 my $map = $cf::MAP{$path} or next;
3564 $map->valid or next; 3565 $map->valid or next;
3565 $map->save; 3566 $map->save;
3566 } 3567 }
3567 warn "end emergency map save\n"; 3568 warn "emergency_perl_save: end map save\n";
3568 3569
3569 warn "begin emergency database checkpoint\n"; 3570 warn "emergency_perl_save: begin database checkpoint\n";
3570 BDB::db_env_txn_checkpoint $DB_ENV; 3571 BDB::db_env_txn_checkpoint $DB_ENV;
3571 warn "end emergency database checkpoint\n"; 3572 warn "emergency_perl_save: end database checkpoint\n";
3572 3573
3573 warn "begin write uuid\n"; 3574 warn "emergency_perl_save: begin write uuid\n";
3574 write_uuid_sync 1; 3575 write_uuid_sync 1;
3575 warn "end write uuid\n"; 3576 warn "emergency_perl_save: end write uuid\n";
3576 }; 3577 };
3577 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
3578 warn "leave emergency perl save\n"; 3584 warn "emergency_perl_save: leave\n";
3579} 3585}
3580 3586
3581sub post_cleanup { 3587sub post_cleanup {
3582 my ($make_core) = @_; 3588 my ($make_core) = @_;
3583 3589
3584 warn Carp::longmess "post_cleanup backtrace" 3590 warn Carp::longmess "post_cleanup backtrace"
3585 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#
3586} 3621}
3587 3622
3588sub do_reload_perl() { 3623sub do_reload_perl() {
3589 # can/must only be called in main 3624 # can/must only be called in main
3590 if ($Coro::current != $Coro::main) { 3625 if ($Coro::current != $Coro::main) {
3591 warn "can only reload from main coroutine"; 3626 warn "can only reload from main coroutine";
3592 return; 3627 return;
3593 } 3628 }
3594 3629
3630 return if $RELOAD++;
3631
3632 my $t1 = EV::time;
3633
3634 while ($RELOAD) {
3595 warn "reloading..."; 3635 warn "reloading...";
3596 3636
3597 warn "entering sync_job"; 3637 warn "entering sync_job";
3598 3638
3599 cf::sync_job { 3639 cf::sync_job {
3600 cf::write_runtime_sync; # external watchdog should not bark 3640 cf::write_runtime_sync; # external watchdog should not bark
3601 cf::emergency_save; 3641 cf::emergency_save;
3602 cf::write_runtime_sync; # external watchdog should not bark 3642 cf::write_runtime_sync; # external watchdog should not bark
3603 3643
3604 warn "syncing database to disk"; 3644 warn "syncing database to disk";
3605 BDB::db_env_txn_checkpoint $DB_ENV; 3645 BDB::db_env_txn_checkpoint $DB_ENV;
3606 3646
3607 # 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
3608 3648
3609 warn "flushing outstanding aio requests"; 3649 warn "flushing outstanding aio requests";
3610 for (;;) {
3611 BDB::flush;
3612 IO::AIO::flush;
3613 Coro::cede_notself;
3614 last unless IO::AIO::nreqs || BDB::nreqs; 3650 while (IO::AIO::nreqs || BDB::nreqs) {
3615 warn "iterate..."; 3651 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3616 }
3617
3618 ++$RELOAD;
3619
3620 warn "cancelling all extension coros";
3621 $_->cancel for values %EXT_CORO;
3622 %EXT_CORO = ();
3623
3624 warn "removing commands";
3625 %COMMAND = ();
3626
3627 warn "removing ext/exti commands";
3628 %EXTCMD = ();
3629 %EXTICMD = ();
3630
3631 warn "unloading/nuking all extensions";
3632 for my $pkg (@EXTS) {
3633 warn "... unloading $pkg";
3634
3635 if (my $cb = $pkg->can ("unload")) {
3636 eval {
3637 $cb->($pkg);
3638 1
3639 } or warn "$pkg unloaded, but with errors: $@";
3640 } 3652 }
3641 3653
3642 warn "... nuking $pkg"; 3654 warn "cancelling all extension coros";
3643 Symbol::delete_package $pkg; 3655 $_->cancel for values %EXT_CORO;
3644 } 3656 %EXT_CORO = ();
3645 3657
3646 warn "unloading all perl modules loaded from $LIBDIR"; 3658 warn "removing commands";
3647 while (my ($k, $v) = each %INC) { 3659 %COMMAND = ();
3648 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3649 3660
3661 warn "removing ext/exti commands";
3662 %EXTCMD = ();
3663 %EXTICMD = ();
3664
3665 warn "unloading/nuking all extensions";
3666 for my $pkg (@EXTS) {
3650 warn "... unloading $k"; 3667 warn "... unloading $pkg";
3651 delete $INC{$k};
3652 3668
3653 $k =~ s/\.pm$//;
3654 $k =~ s/\//::/g;
3655
3656 if (my $cb = $k->can ("unload_module")) { 3669 if (my $cb = $pkg->can ("unload")) {
3670 eval {
3657 $cb->(); 3671 $cb->($pkg);
3672 1
3673 } or warn "$pkg unloaded, but with errors: $@";
3674 }
3675
3676 warn "... clearing $pkg";
3677 clear_package $pkg;
3658 } 3678 }
3659 3679
3660 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;
3661 } 3695 }
3662 3696
3663 warn "getting rid of safe::, as good as possible"; 3697 warn "getting rid of safe::, as good as possible";
3664 Symbol::delete_package "safe::$_" 3698 clear_package "safe::$_"
3665 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);
3666 3700
3667 warn "unloading cf.pm \"a bit\""; 3701 warn "unloading cf.pm \"a bit\"";
3668 delete $INC{"cf.pm"}; 3702 delete $INC{"cf.pm"};
3669 delete $INC{"cf/pod.pm"}; 3703 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3670 3704
3671 # don't, removes xs symbols, too, 3705 # don't, removes xs symbols, too,
3672 # and global variables created in xs 3706 # and global variables created in xs
3673 #Symbol::delete_package __PACKAGE__; 3707 #clear_package __PACKAGE__;
3674 3708
3675 warn "unload completed, starting to reload now"; 3709 warn "unload completed, starting to reload now";
3676 3710
3677 warn "reloading cf.pm"; 3711 warn "reloading cf.pm";
3678 require cf; 3712 require cf;
3679 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3713 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3680 3714
3681 warn "loading config and database again"; 3715 warn "loading config and database again";
3682 cf::reload_config; 3716 cf::reload_config;
3683 3717
3684 warn "loading extensions"; 3718 warn "loading extensions";
3685 cf::load_extensions; 3719 cf::load_extensions;
3686 3720
3721 if ($REATTACH_ON_RELOAD) {
3687 warn "reattaching attachments to objects/players"; 3722 warn "reattaching attachments to objects/players";
3688 _global_reattach; # objects, sockets 3723 _global_reattach; # objects, sockets
3689 warn "reattaching attachments to maps"; 3724 warn "reattaching attachments to maps";
3690 reattach $_ for values %MAP; 3725 reattach $_ for values %MAP;
3691 warn "reattaching attachments to players"; 3726 warn "reattaching attachments to players";
3692 reattach $_ for values %PLAYER; 3727 reattach $_ for values %PLAYER;
3728 }
3693 3729
3730 warn "running post_init jobs";
3731 (pop @POST_INIT)->(1) while @POST_INIT;
3732
3694 warn "leaving sync_job"; 3733 warn "leaving sync_job";
3695 3734
3696 1 3735 1
3697 } or do { 3736 } or do {
3698 warn $@; 3737 warn $@;
3699 cf::cleanup "error while reloading, exiting."; 3738 cf::cleanup "error while reloading, exiting.";
3700 }; 3739 };
3701 3740
3702 warn "reloaded"; 3741 warn "reloaded";
3742 --$RELOAD;
3743 }
3744
3745 $t1 = EV::time - $t1;
3746 warn "reload completed in ${t1}s\n";
3703}; 3747};
3704 3748
3705our $RELOAD_WATCHER; # used only during reload 3749our $RELOAD_WATCHER; # used only during reload
3706 3750
3707sub reload_perl() { 3751sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 3752 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 3753 # coro crashes during coro_state_free->destroy here.
3710 3754
3755 $RELOAD_WATCHER ||= cf::async {
3756 Coro::AIO::aio_wait cache_extensions;
3757
3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3758 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 3759 do_reload_perl;
3713 undef $RELOAD_WATCHER; 3760 undef $RELOAD_WATCHER;
3761 };
3714 }; 3762 };
3715} 3763}
3716 3764
3717register_command "reload" => sub { 3765register_command "reload" => sub {
3718 my ($who, $arg) = @_; 3766 my ($who, $arg) = @_;
… …
3793 BDB::max_poll_reqs $TICK * 0.1; 3841 BDB::max_poll_reqs $TICK * 0.1;
3794 $AnyEvent::BDB::WATCHER->priority (1); 3842 $AnyEvent::BDB::WATCHER->priority (1);
3795 3843
3796 unless ($DB_ENV) { 3844 unless ($DB_ENV) {
3797 $DB_ENV = BDB::db_env_create; 3845 $DB_ENV = BDB::db_env_create;
3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3846 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3799 | 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;
3800 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3849 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3801 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3850 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3802 3851
3803 cf::sync_job { 3852 cf::sync_job {
3804 eval { 3853 eval {
… …
3830{ 3879{
3831 # configure IO::AIO 3880 # configure IO::AIO
3832 3881
3833 IO::AIO::min_parallel 8; 3882 IO::AIO::min_parallel 8;
3834 IO::AIO::max_poll_time $TICK * 0.1; 3883 IO::AIO::max_poll_time $TICK * 0.1;
3835 #undef $AnyEvent::AIO::WATCHER; 3884 undef $AnyEvent::AIO::WATCHER;
3836} 3885}
3837 3886
3838my $_log_backtrace; 3887my $_log_backtrace;
3839 3888
3840sub _log_backtrace { 3889sub _log_backtrace {
… …
3843 $msg =~ s/\n//; 3892 $msg =~ s/\n//;
3844 3893
3845 # limit the # of concurrent backtraces 3894 # limit the # of concurrent backtraces
3846 if ($_log_backtrace < 2) { 3895 if ($_log_backtrace < 2) {
3847 ++$_log_backtrace; 3896 ++$_log_backtrace;
3897 my $perl_bt = Carp::longmess $msg;
3848 async { 3898 async {
3849 $Coro::current->{desc} = "abt $msg"; 3899 $Coro::current->{desc} = "abt $msg";
3850 3900
3851 my @bt = fork_call { 3901 my @bt = fork_call {
3852 @addr = map { sprintf "%x", $_ } @addr; 3902 @addr = map { sprintf "%x", $_ } @addr;
… …
3863 } 3913 }
3864 3914
3865 @funcs 3915 @funcs
3866 }; 3916 };
3867 3917
3868 LOG llevInfo, "[ABT] $msg\n"; 3918 LOG llevInfo, "[ABT] $perl_bt\n";
3919 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3869 LOG llevInfo, "[ABT] $_\n" for @bt; 3920 LOG llevInfo, "[ABT] $_\n" for @bt;
3870 --$_log_backtrace; 3921 --$_log_backtrace;
3871 }; 3922 };
3872 } else { 3923 } else {
3873 LOG llevInfo, "[ABT] $msg\n"; 3924 LOG llevInfo, "[ABT] $msg\n";
3874 LOG llevInfo, "[ABT] [suppressed]\n"; 3925 LOG llevInfo, "[ABT] [suppressed]\n";
3875 } 3926 }
3876} 3927}
3877 3928
3878# load additional modules 3929# load additional modules
3879use cf::pod; 3930eval "use cf::$_" for @EXTRA_MODULES;
3880 3931
3881END { cf::emergency_save } 3932END { cf::emergency_save }
3882 3933
3883evthread_start IO::AIO::poll_fileno;
3884
38851 39341
3886 3935

Diff Legend

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