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

Diff Legend

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