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.437 by root, Tue Jul 8 08:33:27 2008 UTC vs.
Revision 1.469 by root, Mon Mar 2 22:25:19 2009 UTC

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

Diff Legend

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