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.440 by root, Mon Aug 11 23:23:41 2008 UTC vs.
Revision 1.474 by root, Thu Jul 16 21:42:56 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 76
68$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 77# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
69 79
70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
71 81
72our %COMMAND = (); 82our %COMMAND = ();
73our %COMMAND_TIME = (); 83our %COMMAND_TIME = ();
… …
76our %EXTCMD = (); 86our %EXTCMD = ();
77our %EXTICMD = (); 87our %EXTICMD = ();
78our %EXT_CORO = (); # coroutines bound to extensions 88our %EXT_CORO = (); # coroutines bound to extensions
79our %EXT_MAP = (); # pluggable maps 89our %EXT_MAP = (); # pluggable maps
80 90
81our $RELOAD; # number of reloads so far 91our $RELOAD; # number of reloads so far, non-zero while in reload
82our @EVENT; 92our @EVENT;
83 93
84our $CONFDIR = confdir; 94our $CONFDIR = confdir;
85our $DATADIR = datadir; 95our $DATADIR = datadir;
86our $LIBDIR = "$DATADIR/ext"; 96our $LIBDIR = "$DATADIR/ext";
87our $PODDIR = "$DATADIR/pod"; 97our $PODDIR = "$DATADIR/pod";
88our $MAPDIR = "$DATADIR/" . mapdir; 98our $MAPDIR = "$DATADIR/" . mapdir;
89our $LOCALDIR = localdir; 99our $LOCALDIR = localdir;
90our $TMPDIR = "$LOCALDIR/" . tmpdir; 100our $TMPDIR = "$LOCALDIR/" . tmpdir;
91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 101our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
92our $PLAYERDIR = "$LOCALDIR/" . playerdir; 102our $PLAYERDIR = "$LOCALDIR/" . playerdir;
93our $RANDOMDIR = "$LOCALDIR/random"; 103our $RANDOMDIR = "$LOCALDIR/random";
94our $BDBDIR = "$LOCALDIR/db"; 104our $BDBDIR = "$LOCALDIR/db";
105our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime";
107
95our %RESOURCE; 108our %RESOURCE;
96 109
97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
99our $NEXT_TICK; 112our $NEXT_TICK;
100our $USE_FSYNC = 1; # use fsync to write maps - default off 113our $USE_FSYNC = 1; # use fsync to write maps - default on
101 114
102our $BDB_DEADLOCK_WATCHER; 115our $BDB_DEADLOCK_WATCHER;
103our $BDB_CHECKPOINT_WATCHER; 116our $BDB_CHECKPOINT_WATCHER;
104our $BDB_TRICKLE_WATCHER; 117our $BDB_TRICKLE_WATCHER;
105our $DB_ENV; 118our $DB_ENV;
106 119
120our @EXTRA_MODULES = qw(pod mapscript);
121
107our %CFG; 122our %CFG;
108 123
109our $UPTIME; $UPTIME ||= time; 124our $UPTIME; $UPTIME ||= time;
110our $RUNTIME; 125our $RUNTIME;
111our $NOW; 126our $NOW;
… …
120our $LOAD; # a number between 0 (idle) and 1 (too many objects) 135our $LOAD; # a number between 0 (idle) and 1 (too many objects)
121our $LOADAVG; # same thing, but with alpha-smoothing 136our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter 137our $JITTER; # average jitter
123our $TICK_START; # for load detecting purposes 138our $TICK_START; # for load detecting purposes
124 139
140our @POST_INIT;
141
142our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
143our $REALLY_UNLOOP; # never set to true, please :)
144
125binmode STDOUT; 145binmode STDOUT;
126binmode STDERR; 146binmode STDERR;
127 147
128# read virtual server time, if available 148# read virtual server time, if available
129unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 149unless ($RUNTIME || !-e $RUNTIMEFILE) {
130 open my $fh, "<", "$LOCALDIR/runtime" 150 open my $fh, "<", $RUNTIMEFILE
131 or die "unable to read runtime file: $!"; 151 or die "unable to read $RUNTIMEFILE file: $!";
132 $RUNTIME = <$fh> + 0.; 152 $RUNTIME = <$fh> + 0.;
133} 153}
154
155eval "sub TICK() { $TICK } 1" or die;
134 156
135mkdir $_ 157mkdir $_
136 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 158 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
137 159
138our $EMERGENCY_POSITION; 160our $EMERGENCY_POSITION;
… …
246 cf::client cf::player 268 cf::client cf::player
247 cf::arch cf::living 269 cf::arch cf::living
248 cf::map cf::mapspace 270 cf::map cf::mapspace
249 cf::party cf::region 271 cf::party cf::region
250)) { 272)) {
251 no strict 'refs';
252 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 273 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
253} 274}
254 275
255$EV::DIED = sub { 276$EV::DIED = sub {
256 warn "error in event callback: @_"; 277 warn "error in event callback: @_";
… …
298our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 319our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
299 320
300sub encode_json($) { $json_coder->encode ($_[0]) } 321sub encode_json($) { $json_coder->encode ($_[0]) }
301sub decode_json($) { $json_coder->decode ($_[0]) } 322sub decode_json($) { $json_coder->decode ($_[0]) }
302 323
324=item cf::post_init { BLOCK }
325
326Execute the given codeblock, I<after> all extensions have been (re-)loaded,
327but I<before> the server starts ticking again.
328
329The cdoeblock will have a single boolean argument to indicate whether this
330is a reload or not.
331
332=cut
333
334sub post_init(&) {
335 push @POST_INIT, shift;
336}
337
303=item cf::lock_wait $string 338=item cf::lock_wait $string
304 339
305Wait until the given lock is available. See cf::lock_acquire. 340Wait until the given lock is available. See cf::lock_acquire.
306 341
307=item my $lock = cf::lock_acquire $string 342=item my $lock = cf::lock_acquire $string
308 343
309Wait until the given lock is available and then acquires it and returns 344Wait until the given lock is available and then acquires it and returns
310a Coro::guard object. If the guard object gets destroyed (goes out of scope, 345a L<Guard> object. If the guard object gets destroyed (goes out of scope,
311for example when the coroutine gets canceled), the lock is automatically 346for example when the coroutine gets canceled), the lock is automatically
312returned. 347returned.
313 348
314Locks are *not* recursive, locking from the same coro twice results in a 349Locks are *not* recursive, locking from the same coro twice results in a
315deadlocked coro. 350deadlocked coro.
… …
321 356
322Return true if the lock is currently active, i.e. somebody has locked it. 357Return true if the lock is currently active, i.e. somebody has locked it.
323 358
324=cut 359=cut
325 360
326our %LOCK; 361our $LOCKS = new Coro::SemaphoreSet;
327our %LOCKER;#d#
328 362
329sub lock_wait($) { 363sub lock_wait($) {
330 my ($key) = @_; 364 $LOCKS->wait ($_[0]);
331
332 if ($LOCKER{$key} == $Coro::current) {#d#
333 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
334 return;#d#
335 }#d#
336
337 # wait for lock, if any
338 while ($LOCK{$key}) {
339 push @{ $LOCK{$key} }, $Coro::current;
340 Coro::schedule;
341 }
342} 365}
343 366
344sub lock_acquire($) { 367sub lock_acquire($) {
345 my ($key) = @_; 368 $LOCKS->guard ($_[0])
346
347 # wait, to be sure we are not locked
348 lock_wait $key;
349
350 $LOCK{$key} = [];
351 $LOCKER{$key} = $Coro::current;#d#
352
353 Coro::guard {
354 delete $LOCKER{$key};#d#
355 # wake up all waiters, to be on the safe side
356 $_->ready for @{ delete $LOCK{$key} };
357 }
358} 369}
359 370
360sub lock_active($) { 371sub lock_active($) {
361 my ($key) = @_; 372 $LOCKS->count ($_[0]) < 1
362
363 ! ! $LOCK{$key}
364} 373}
365 374
366sub freeze_mainloop { 375sub freeze_mainloop {
367 tick_inhibit_inc; 376 tick_inhibit_inc;
368 377
369 Coro::guard \&tick_inhibit_dec; 378 &Guard::guard (\&tick_inhibit_dec);
370} 379}
371 380
372=item cf::periodic $interval, $cb 381=item cf::periodic $interval, $cb
373 382
374Like EV::periodic, but randomly selects a starting point so that the actions 383Like EV::periodic, but randomly selects a starting point so that the actions
… …
726 735
727############################################################################# 736#############################################################################
728 737
729=head2 ATTACHABLE OBJECTS 738=head2 ATTACHABLE OBJECTS
730 739
731Many objects in crossfire are so-called attachable objects. That means you can 740Many objects in deliantra are so-called attachable objects. That means you can
732attach callbacks/event handlers (a collection of which is called an "attachment") 741attach callbacks/event handlers (a collection of which is called an "attachment")
733to it. All such attachable objects support the following methods. 742to it. All such attachable objects support the following methods.
734 743
735In the following description, CLASS can be any of C<global>, C<object> 744In the following description, CLASS can be any of C<global>, C<object>
736C<player>, C<client> or C<map> (i.e. the attachable objects in 745C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
786=item cf::CLASS::attachment $name, ... 795=item cf::CLASS::attachment $name, ...
787 796
788Register an attachment by C<$name> through which attachable objects of the 797Register an attachment by C<$name> through which attachable objects of the
789given CLASS can refer to this attachment. 798given CLASS can refer to this attachment.
790 799
791Some classes such as crossfire maps and objects can specify attachments 800Some classes such as deliantra maps and objects can specify attachments
792that are attached at load/instantiate time, thus the need for a name. 801that are attached at load/instantiate time, thus the need for a name.
793 802
794These calls expect any number of the following handler/hook descriptions: 803These calls expect any number of the following handler/hook descriptions:
795 804
796=over 4 805=over 4
… …
1087 1096
1088sub reattach { 1097sub reattach {
1089 # basically do the same as instantiate, without calling instantiate 1098 # basically do the same as instantiate, without calling instantiate
1090 my ($obj) = @_; 1099 my ($obj) = @_;
1091 1100
1101 # no longer needed after getting rid of delete_package?
1092 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1102 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1093 1103
1094 my $registry = $obj->registry; 1104 my $registry = $obj->registry;
1095 1105
1096 @$registry = (); 1106 @$registry = ();
1097 1107
… …
1145 $decname, length $$rdata, scalar @$objs; 1155 $decname, length $$rdata, scalar @$objs;
1146 1156
1147 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1157 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1148 aio_chmod $fh, SAVE_MODE; 1158 aio_chmod $fh, SAVE_MODE;
1149 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1159 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1150 aio_fsync $fh if $cf::USE_FSYNC; 1160 if ($cf::USE_FSYNC) {
1161 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1162 aio_fsync $fh;
1163 }
1151 aio_close $fh; 1164 aio_close $fh;
1152 1165
1153 if (@$objs) { 1166 if (@$objs) {
1154 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1167 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1155 aio_chmod $fh, SAVE_MODE; 1168 aio_chmod $fh, SAVE_MODE;
1156 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1169 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1157 aio_write $fh, 0, (length $data), $data, 0; 1170 aio_write $fh, 0, (length $data), $data, 0;
1158 aio_fsync $fh if $cf::USE_FSYNC; 1171 if ($cf::USE_FSYNC) {
1172 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1173 aio_fsync $fh;
1174 }
1159 aio_close $fh; 1175 aio_close $fh;
1160 aio_rename "$filename.pst~", "$filename.pst"; 1176 aio_rename "$filename.pst~", "$filename.pst";
1161 } 1177 }
1162 } else { 1178 } else {
1163 aio_unlink "$filename.pst"; 1179 aio_unlink "$filename.pst";
1164 } 1180 }
1165 1181
1166 aio_rename "$filename~", $filename; 1182 aio_rename "$filename~", $filename;
1183
1184 $filename =~ s%/[^/]+$%%;
1185 aio_pathsync $filename if $cf::USE_FSYNC;
1167 } else { 1186 } else {
1168 warn "FATAL: $filename~: $!\n"; 1187 warn "unable to save objects: $filename~: $!\n";
1169 } 1188 }
1170 } else { 1189 } else {
1171 aio_unlink $filename; 1190 aio_unlink $filename;
1172 aio_unlink "$filename.pst"; 1191 aio_unlink "$filename.pst";
1173 } 1192 }
… …
1264 my ($name, $cb) = @_; 1283 my ($name, $cb) = @_;
1265 1284
1266 $EXTICMD{$name} = $cb; 1285 $EXTICMD{$name} = $cb;
1267} 1286}
1268 1287
1288use File::Glob ();
1289
1269cf::player->attach ( 1290cf::player->attach (
1270 on_command => sub { 1291 on_command => sub {
1271 my ($pl, $name, $params) = @_; 1292 my ($pl, $name, $params) = @_;
1272 1293
1273 my $cb = $COMMAND{$name} 1294 my $cb = $COMMAND{$name}
… …
1305 1326
1306 cf::override; 1327 cf::override;
1307 }, 1328 },
1308); 1329);
1309 1330
1331# "readahead" all extensions
1332sub cache_extensions {
1333 my $grp = IO::AIO::aio_group;
1334
1335 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1336 for (grep /\.ext$/, @{$_[0]}) {
1337 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1338 }
1339 };
1340
1341 $grp
1342}
1343
1310sub load_extensions { 1344sub load_extensions {
1311 cf::sync_job { 1345 cf::sync_job {
1312 my %todo; 1346 my %todo;
1313 1347
1314 for my $path (<$LIBDIR/*.ext>) { 1348 for my $path (<$LIBDIR/*.ext>) {
… …
1333 1367
1334 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1368 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1335 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1369 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1336 1370
1337 $ext{source} = 1371 $ext{source} =
1338 "package $pkg; use strict; use utf8;\n" 1372 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1339 . "#line 1 \"$path\"\n{\n" 1373 . "#line 1 \"$path\"\n{\n"
1340 . $source 1374 . $source
1341 . "\n};\n1"; 1375 . "\n};\n1";
1342 1376
1343 $todo{$base} = \%ext; 1377 $todo{$base} = \%ext;
… …
1383 1417
1384=back 1418=back
1385 1419
1386=head2 CORE EXTENSIONS 1420=head2 CORE EXTENSIONS
1387 1421
1388Functions and methods that extend core crossfire objects. 1422Functions and methods that extend core deliantra objects.
1389 1423
1390=cut 1424=cut
1391 1425
1392package cf::player; 1426package cf::player;
1393 1427
… …
1436 1470
1437sub exists($) { 1471sub exists($) {
1438 my ($login) = @_; 1472 my ($login) = @_;
1439 1473
1440 $cf::PLAYER{$login} 1474 $cf::PLAYER{$login}
1441 or cf::sync_job { !aio_stat path $login } 1475 or !aio_stat path $login
1442} 1476}
1443 1477
1444sub find($) { 1478sub find($) {
1445 return $cf::PLAYER{$_[0]} || do { 1479 return $cf::PLAYER{$_[0]} || do {
1446 my $login = $_[0]; 1480 my $login = $_[0];
… …
1521 my ($pl) = @_; 1555 my ($pl) = @_;
1522 1556
1523 my $name = $pl->ob->name; 1557 my $name = $pl->ob->name;
1524 1558
1525 $pl->{deny_save} = 1; 1559 $pl->{deny_save} = 1;
1526 $pl->password ("*"); # this should lock out the player until we nuked the dir 1560 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1527 1561
1528 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1562 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1529 $pl->deactivate; 1563 $pl->deactivate;
1530 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1564 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1531 $pl->ob->check_score; 1565 $pl->ob->check_score;
… …
1617 } 1651 }
1618 1652
1619 \@paths 1653 \@paths
1620} 1654}
1621 1655
1622=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1656=item $protocol_xml = $player->expand_cfpod ($cfpod)
1623 1657
1624Expand crossfire pod fragments into protocol xml. 1658Expand deliantra pod fragments into protocol xml.
1625
1626=cut
1627
1628use re 'eval';
1629
1630my $group;
1631my $interior; $interior = qr{
1632 # match a pod interior sequence sans C<< >>
1633 (?:
1634 \ (.*?)\ (?{ $group = $^N })
1635 | < (??{$interior}) >
1636 )
1637}x;
1638
1639sub expand_cfpod {
1640 my ($self, $pod) = @_;
1641
1642 my $xml;
1643
1644 while () {
1645 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1646 $group = $1;
1647
1648 $group =~ s/&/&amp;/g;
1649 $group =~ s/</&lt;/g;
1650
1651 $xml .= $group;
1652 } elsif ($pod =~ m%\G
1653 ([BCGHITU])
1654 <
1655 (?:
1656 ([^<>]*) (?{ $group = $^N })
1657 | < $interior >
1658 )
1659 >
1660 %gcsx
1661 ) {
1662 my ($code, $data) = ($1, $group);
1663
1664 if ($code eq "B") {
1665 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1666 } elsif ($code eq "I") {
1667 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1668 } elsif ($code eq "U") {
1669 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1670 } elsif ($code eq "C") {
1671 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1672 } elsif ($code eq "T") {
1673 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1674 } elsif ($code eq "G") {
1675 my ($male, $female) = split /\|/, $data;
1676 $data = $self->gender ? $female : $male;
1677 $xml .= expand_cfpod ($self, $data);
1678 } elsif ($code eq "H") {
1679 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1680 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1681 "")
1682 [$self->{hintmode}];
1683 } else {
1684 $xml .= "error processing '$code($data)' directive";
1685 }
1686 } else {
1687 if ($pod =~ /\G(.+)/) {
1688 warn "parse error while expanding $pod (at $1)";
1689 }
1690 last;
1691 }
1692 }
1693
1694 for ($xml) {
1695 # create single paragraphs (very hackish)
1696 s/(?<=\S)\n(?=\w)/ /g;
1697
1698 # compress some whitespace
1699 s/\s+\n/\n/g; # ws line-ends
1700 s/\n\n+/\n/g; # double lines
1701 s/^\n+//; # beginning lines
1702 s/\n+$//; # ending lines
1703 }
1704
1705 $xml
1706}
1707
1708no re 'eval';
1709
1710sub hintmode {
1711 $_[0]{hintmode} = $_[1] if @_ > 1;
1712 $_[0]{hintmode}
1713}
1714 1659
1715=item $player->ext_reply ($msgid, @msg) 1660=item $player->ext_reply ($msgid, @msg)
1716 1661
1717Sends an ext reply to the player. 1662Sends an ext reply to the player.
1718 1663
… …
1931 1876
1932 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1877 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1933 "$UNIQUEDIR/$path" 1878 "$UNIQUEDIR/$path"
1934} 1879}
1935 1880
1936# and all this just because we cannot iterate over
1937# all maps in C++...
1938sub change_all_map_light {
1939 my ($change) = @_;
1940
1941 $_->change_map_light ($change)
1942 for grep $_->outdoor, values %cf::MAP;
1943}
1944
1945sub decay_objects { 1881sub decay_objects {
1946 my ($self) = @_; 1882 my ($self) = @_;
1947 1883
1948 return if $self->{deny_reset}; 1884 return if $self->{deny_reset};
1949 1885
… …
2031sub find { 1967sub find {
2032 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
2033 1969
2034 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
2035 1971
2036 cf::lock_wait "map_data:$path";#d#remove 1972 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2037 cf::lock_wait "map_find:$path"; 1973 my $guard2 = cf::lock_acquire "map_find:$path";
2038 1974
2039 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
2040 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2041 my $guard2 = cf::lock_acquire "map_find:$path";
2042
2043 my $map = new_from_path cf::map $path 1976 my $map = new_from_path cf::map $path
2044 or return; 1977 or return;
2045 1978
2046 $map->{last_save} = $cf::RUNTIME; 1979 $map->{last_save} = $cf::RUNTIME;
2047 1980
… …
2114 2047
2115 unless ($self->{deny_activate}) { 2048 unless ($self->{deny_activate}) {
2116 $self->decay_objects; 2049 $self->decay_objects;
2117 $self->fix_auto_apply; 2050 $self->fix_auto_apply;
2118 $self->update_buttons; 2051 $self->update_buttons;
2119 cf::cede_to_tick;
2120 $self->set_darkness_map;
2121 cf::cede_to_tick; 2052 cf::cede_to_tick;
2122 $self->activate; 2053 $self->activate;
2123 } 2054 }
2124 2055
2125 $self->{last_save} = $cf::RUNTIME; 2056 $self->{last_save} = $cf::RUNTIME;
… …
2467 2398
2468our $SAY_CHANNEL = { 2399our $SAY_CHANNEL = {
2469 id => "say", 2400 id => "say",
2470 title => "Map", 2401 title => "Map",
2471 reply => "say ", 2402 reply => "say ",
2472 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2403 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2473}; 2404};
2474 2405
2475our $CHAT_CHANNEL = { 2406our $CHAT_CHANNEL = {
2476 id => "chat", 2407 id => "chat",
2477 title => "Chat", 2408 title => "Chat",
… …
2532 2463
2533=item $player_object->enter_link 2464=item $player_object->enter_link
2534 2465
2535Freezes the player and moves him/her to a special map (C<{link}>). 2466Freezes the player and moves him/her to a special map (C<{link}>).
2536 2467
2537The player should be reasonably safe there for short amounts of time. You 2468The player should be reasonably safe there for short amounts of time (e.g.
2538I<MUST> call C<leave_link> as soon as possible, though. 2469for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2470though, as the palyer cannot control the character while it is on the link
2471map.
2539 2472
2540Will never block. 2473Will never block.
2541 2474
2542=item $player_object->leave_link ($map, $x, $y) 2475=item $player_object->leave_link ($map, $x, $y)
2543 2476
… …
2601 2534
2602 $map->load; 2535 $map->load;
2603 $map->load_neighbours; 2536 $map->load_neighbours;
2604 2537
2605 return unless $self->contr->active; 2538 return unless $self->contr->active;
2539 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2606 $self->activate_recursive; 2540 $self->activate_recursive;
2607 2541
2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2542 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2609 $self->enter_map ($map, $x, $y); 2543 $self->enter_map ($map, $x, $y);
2610} 2544}
… …
2773 $self->contr->savebed ($map, $x, $y) 2707 $self->contr->savebed ($map, $x, $y)
2774 if $exit->flag (cf::FLAG_DAMNED); 2708 if $exit->flag (cf::FLAG_DAMNED);
2775 2709
2776 1 2710 1
2777 }) { 2711 }) {
2778 $self->message ("Something went wrong deep within the crossfire server. " 2712 $self->message ("Something went wrong deep within the deliantra server. "
2779 . "I'll try to bring you back to the map you were before. " 2713 . "I'll try to bring you back to the map you were before. "
2780 . "Please report this to the dungeon master!", 2714 . "Please report this to the dungeon master!",
2781 cf::NDI_UNIQUE | cf::NDI_RED); 2715 cf::NDI_UNIQUE | cf::NDI_RED);
2782 2716
2783 warn "ERROR in enter_exit: $@"; 2717 warn "ERROR in enter_exit: $@";
… …
2849 id => "infobox", 2783 id => "infobox",
2850 title => "Body Parts", 2784 title => "Body Parts",
2851 reply => undef, 2785 reply => undef,
2852 tooltip => "Shows which body parts you posess and are available", 2786 tooltip => "Shows which body parts you posess and are available",
2853 }, 2787 },
2788 "c/statistics" => {
2789 id => "infobox",
2790 title => "Statistics",
2791 reply => undef,
2792 tooltip => "Shows your primary statistics",
2793 },
2794 "c/skills" => {
2795 id => "infobox",
2796 title => "Skills",
2797 reply => undef,
2798 tooltip => "Shows your experience per skill and item power",
2799 },
2800 "c/shopitems" => {
2801 id => "infobox",
2802 title => "Shop Items",
2803 reply => undef,
2804 tooltip => "Shows the items currently for sale in this shop",
2805 },
2806 "c/resistances" => {
2807 id => "infobox",
2808 title => "Resistances",
2809 reply => undef,
2810 tooltip => "Shows your resistances",
2811 },
2812 "c/pets" => {
2813 id => "infobox",
2814 title => "Pets",
2815 reply => undef,
2816 tooltip => "Shows information abotu your pets/a specific pet",
2817 },
2818 "c/perceiveself" => {
2819 id => "infobox",
2820 title => "Perceive Self",
2821 reply => undef,
2822 tooltip => "You gained detailed knowledge about yourself",
2823 },
2854 "c/uptime" => { 2824 "c/uptime" => {
2855 id => "infobox", 2825 id => "infobox",
2856 title => "Uptime", 2826 title => "Uptime",
2857 reply => undef, 2827 reply => undef,
2858 tooltip => "How long the server has been running since last restart", 2828 tooltip => "How long the server has been running since last restart",
… …
2867 id => "party", 2837 id => "party",
2868 title => "Party", 2838 title => "Party",
2869 reply => "gsay ", 2839 reply => "gsay ",
2870 tooltip => "Messages and chat related to your party", 2840 tooltip => "Messages and chat related to your party",
2871 }, 2841 },
2842 "c/death" => {
2843 id => "death",
2844 title => "Death",
2845 reply => undef,
2846 tooltip => "Reason for and more info about your most recent death",
2847 },
2848 "c/say" => $SAY_CHANNEL,
2849 "c/chat" => $CHAT_CHANNEL,
2872); 2850);
2873 2851
2874sub cf::client::send_msg { 2852sub cf::client::send_msg {
2875 my ($self, $channel, $msg, $color, @extra) = @_; 2853 my ($self, $channel, $msg, $color, @extra) = @_;
2876 2854
2877 $msg = $self->pl->expand_cfpod ($msg); 2855 $msg = $self->pl->expand_cfpod ($msg)
2856 unless $color & cf::NDI_VERBATIM;
2878 2857
2879 $color &= cf::NDI_CLIENT_MASK; # just in case... 2858 $color &= cf::NDI_CLIENT_MASK; # just in case...
2880 2859
2881 # check predefined channels, for the benefit of C 2860 # check predefined channels, for the benefit of C
2882 if ($CHANNEL{$channel}) { 2861 if ($CHANNEL{$channel}) {
2883 $channel = $CHANNEL{$channel}; 2862 $channel = $CHANNEL{$channel};
2884 2863
2885 $self->ext_msg (channel_info => $channel) 2864 $self->ext_msg (channel_info => $channel);
2886 if $self->can_msg;
2887
2888 $channel = $channel->{id}; 2865 $channel = $channel->{id};
2889 2866
2890 } elsif (ref $channel) { 2867 } elsif (ref $channel) {
2891 # send meta info to client, if not yet sent 2868 # send meta info to client, if not yet sent
2892 unless (exists $self->{channel}{$channel->{id}}) { 2869 unless (exists $self->{channel}{$channel->{id}}) {
2893 $self->{channel}{$channel->{id}} = $channel; 2870 $self->{channel}{$channel->{id}} = $channel;
2894 $self->ext_msg (channel_info => $channel) 2871 $self->ext_msg (channel_info => $channel);
2895 if $self->can_msg;
2896 } 2872 }
2897 2873
2898 $channel = $channel->{id}; 2874 $channel = $channel->{id};
2899 } 2875 }
2900 2876
2901 return unless @extra || length $msg; 2877 return unless @extra || length $msg;
2902 2878
2903 if ($self->can_msg) {
2904 # default colour, mask it out 2879 # default colour, mask it out
2905 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2880 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2906 if $color & cf::NDI_DEF; 2881 if $color & cf::NDI_DEF;
2907 2882
2908 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2883 my $pkt = "msg "
2884 . $self->{json_coder}->encode (
2909 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2885 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2910 } else { 2886 );
2911 if ($color >= 0) {
2912 # replace some tags by gcfclient-compatible ones
2913 for ($msg) {
2914 1 while
2915 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2916 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2917 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2918 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2919 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2920 }
2921 2887
2922 $color &= cf::NDI_COLOR_MASK; 2888 # try lzf for large packets
2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2890 if 1024 <= length $pkt and $self->{can_lzf};
2923 2891
2924 utf8::encode $msg; 2892 # split very large packets
2925 2893 if (8192 < length $pkt and $self->{can_lzf}) {
2926 if (0 && $msg =~ /\[/) { 2894 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2927 # COMMAND/INFO 2895 $pkt = "frag";
2928 $self->send_packet ("drawextinfo $color 10 8 $msg")
2929 } else {
2930 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2931 $self->send_packet ("drawinfo $color $msg")
2932 }
2933 }
2934 } 2896 }
2897
2898 $self->send_packet ($pkt);
2935} 2899}
2936 2900
2937=item $client->ext_msg ($type, @msg) 2901=item $client->ext_msg ($type, @msg)
2938 2902
2939Sends an ext event to the client. 2903Sends an ext event to the client.
… …
3114The following functions and methods are available within a safe environment: 3078The following functions and methods are available within a safe environment:
3115 3079
3116 cf::object 3080 cf::object
3117 contr pay_amount pay_player map x y force_find force_add destroy 3081 contr pay_amount pay_player map x y force_find force_add destroy
3118 insert remove name archname title slaying race decrease split 3082 insert remove name archname title slaying race decrease split
3083 value
3119 3084
3120 cf::object::player 3085 cf::object::player
3121 player 3086 player
3122 3087
3123 cf::player 3088 cf::player
… …
3129=cut 3094=cut
3130 3095
3131for ( 3096for (
3132 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3133 insert remove inv nrof name archname title slaying race 3098 insert remove inv nrof name archname title slaying race
3134 decrease split destroy change_exp)], 3099 decrease split destroy change_exp value msg lore send_msg)],
3135 ["cf::object::player" => qw(player)], 3100 ["cf::object::player" => qw(player)],
3136 ["cf::player" => qw(peaceful)], 3101 ["cf::player" => qw(peaceful send_msg)],
3137 ["cf::map" => qw(trigger)], 3102 ["cf::map" => qw(trigger)],
3138) { 3103) {
3139 no strict 'refs'; 3104 no strict 'refs';
3140 my ($pkg, @funs) = @$_; 3105 my ($pkg, @funs) = @$_;
3141 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3158 my ($code, %vars) = @_; 3123 my ($code, %vars) = @_;
3159 3124
3160 my $qcode = $code; 3125 my $qcode = $code;
3161 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3162 $qcode =~ s/\n/\\n/g; 3127 $qcode =~ s/\n/\\n/g;
3128
3129 %vars = (_dummy => 0) unless %vars;
3163 3130
3164 local $_; 3131 local $_;
3165 local @safe::cf::_safe_eval_args = values %vars; 3132 local @safe::cf::_safe_eval_args = values %vars;
3166 3133
3167 my $eval = 3134 my $eval =
… …
3397 reload_treasures; 3364 reload_treasures;
3398 3365
3399 warn "finished reloading resource files\n"; 3366 warn "finished reloading resource files\n";
3400} 3367}
3401 3368
3402sub init {
3403 my $guard = freeze_mainloop;
3404
3405 evthread_start IO::AIO::poll_fileno;
3406
3407 reload_resources;
3408}
3409
3410sub reload_config { 3369sub reload_config {
3411 open my $fh, "<:utf8", "$CONFDIR/config" 3370 open my $fh, "<:utf8", "$CONFDIR/config"
3412 or return; 3371 or return;
3413 3372
3414 local $/; 3373 local $/;
… …
3426 }; 3385 };
3427 warn $@ if $@; 3386 warn $@ if $@;
3428 } 3387 }
3429} 3388}
3430 3389
3390sub pidfile() {
3391 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3392 or die "$PIDFILE: $!";
3393 flock $fh, &Fcntl::LOCK_EX
3394 or die "$PIDFILE: flock: $!";
3395 $fh
3396}
3397
3398# make sure only one server instance is running at any one time
3399sub atomic {
3400 my $fh = pidfile;
3401
3402 my $pid = <$fh>;
3403 kill 9, $pid if $pid > 0;
3404
3405 seek $fh, 0, 0;
3406 print $fh $$;
3407}
3408
3409sub main_loop {
3410 warn "EV::loop starting\n";
3411 if (1) {
3412 EV::loop;
3413 }
3414 warn "EV::loop returned\n";
3415 goto &main_loop unless $REALLY_UNLOOP;
3416}
3417
3431sub main { 3418sub main {
3419 cf::init_globals; # initialise logging
3420
3421 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3422 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3423 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3424 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3425
3426 cf::init_experience;
3427 cf::init_anim;
3428 cf::init_attackmess;
3429 cf::init_dynamic;
3430
3431 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3432
3432 # we must not ever block the main coroutine 3433 # we must not ever block the main coroutine
3433 local $Coro::idle = sub { 3434 local $Coro::idle = sub {
3434 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3435 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3435 (async { 3436 (async {
3436 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3437 $Coro::current->{desc} = "IDLE BUG HANDLER";
3437 EV::loop EV::LOOP_ONESHOT; 3438 EV::loop EV::LOOP_ONESHOT;
3438 })->prio (Coro::PRIO_MAX); 3439 })->prio (Coro::PRIO_MAX);
3439 }; 3440 };
3440 3441
3441 { 3442 evthread_start IO::AIO::poll_fileno;
3442 my $guard = freeze_mainloop; 3443
3444 cf::sync_job {
3445 reload_resources;
3443 reload_config; 3446 reload_config;
3444 db_init; 3447 db_init;
3448
3449 cf::load_settings;
3450 cf::load_materials;
3451 cf::init_uuid;
3452 cf::init_signals;
3453 cf::init_commands;
3454 cf::init_skills;
3455
3456 cf::init_beforeplay;
3457
3458 atomic;
3459
3445 load_extensions; 3460 load_extensions;
3446 3461
3447 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3462 utime time, time, $RUNTIMEFILE;
3463
3464 # no (long-running) fork's whatsoever before this point(!)
3465 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3466
3467 (pop @POST_INIT)->(0) while @POST_INIT;
3448 } 3468 };
3449 3469
3450 EV::loop; 3470 main_loop;
3451} 3471}
3452 3472
3453############################################################################# 3473#############################################################################
3454# initialisation and cleanup 3474# initialisation and cleanup
3455 3475
… …
3462 }; 3482 };
3463 } 3483 }
3464} 3484}
3465 3485
3466sub write_runtime_sync { 3486sub write_runtime_sync {
3467 my $runtime = "$LOCALDIR/runtime";
3468
3469 # first touch the runtime file to show we are still running: 3487 # first touch the runtime file to show we are still running:
3470 # the fsync below can take a very very long time. 3488 # the fsync below can take a very very long time.
3471 3489
3472 IO::AIO::aio_utime $runtime, undef, undef; 3490 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3473 3491
3474 my $guard = cf::lock_acquire "write_runtime"; 3492 my $guard = cf::lock_acquire "write_runtime";
3475 3493
3476 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3494 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3477 or return; 3495 or return;
3478 3496
3479 my $value = $cf::RUNTIME + 90 + 10; 3497 my $value = $cf::RUNTIME + 90 + 10;
3480 # 10 is the runtime save interval, for a monotonic clock 3498 # 10 is the runtime save interval, for a monotonic clock
3481 # 60 allows for the watchdog to kill the server. 3499 # 60 allows for the watchdog to kill the server.
… …
3491 aio_utime $fh, undef, undef; 3509 aio_utime $fh, undef, undef;
3492 3510
3493 close $fh 3511 close $fh
3494 or return; 3512 or return;
3495 3513
3496 aio_rename "$runtime~", $runtime 3514 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3497 and return; 3515 and return;
3498 3516
3499 warn "runtime file written.\n"; 3517 warn "runtime file written.\n";
3500 3518
3501 1 3519 1
… …
3513 my $uuid = "$LOCALDIR/uuid"; 3531 my $uuid = "$LOCALDIR/uuid";
3514 3532
3515 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3533 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3516 or return; 3534 or return;
3517 3535
3518 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3536 my $value = uuid_seq uuid_cur;
3537
3538 unless ($value) {
3539 warn "cowardly refusing to write zero uuid value!\n";
3540 return;
3541 }
3542
3543 my $value = uuid_str $value + $uuid_skip;
3519 $uuid_skip = 0; 3544 $uuid_skip = 0;
3520 3545
3521 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3546 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3522 and return; 3547 and return;
3523 3548
… …
3545} 3570}
3546 3571
3547sub emergency_save() { 3572sub emergency_save() {
3548 my $freeze_guard = cf::freeze_mainloop; 3573 my $freeze_guard = cf::freeze_mainloop;
3549 3574
3550 warn "enter emergency perl save\n"; 3575 warn "emergency_perl_save: enter\n";
3551 3576
3552 cf::sync_job { 3577 cf::sync_job {
3578 # this is a trade-off: we want to be very quick here, so
3579 # save all maps without fsync, and later call a global sync
3580 # (which in turn might be very very slow)
3581 local $USE_FSYNC = 0;
3582
3553 # use a peculiar iteration method to avoid tripping on perl 3583 # use a peculiar iteration method to avoid tripping on perl
3554 # refcount bugs in for. also avoids problems with players 3584 # refcount bugs in for. also avoids problems with players
3555 # and maps saved/destroyed asynchronously. 3585 # and maps saved/destroyed asynchronously.
3556 warn "begin emergency player save\n"; 3586 warn "emergency_perl_save: begin player save\n";
3557 for my $login (keys %cf::PLAYER) { 3587 for my $login (keys %cf::PLAYER) {
3558 my $pl = $cf::PLAYER{$login} or next; 3588 my $pl = $cf::PLAYER{$login} or next;
3559 $pl->valid or next; 3589 $pl->valid or next;
3560 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3590 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3561 $pl->save; 3591 $pl->save;
3562 } 3592 }
3563 warn "end emergency player save\n"; 3593 warn "emergency_perl_save: end player save\n";
3564 3594
3565 warn "begin emergency map save\n"; 3595 warn "emergency_perl_save: begin map save\n";
3566 for my $path (keys %cf::MAP) { 3596 for my $path (keys %cf::MAP) {
3567 my $map = $cf::MAP{$path} or next; 3597 my $map = $cf::MAP{$path} or next;
3568 $map->valid or next; 3598 $map->valid or next;
3569 $map->save; 3599 $map->save;
3570 } 3600 }
3571 warn "end emergency map save\n"; 3601 warn "emergency_perl_save: end map save\n";
3572 3602
3573 warn "begin emergency database checkpoint\n"; 3603 warn "emergency_perl_save: begin database checkpoint\n";
3574 BDB::db_env_txn_checkpoint $DB_ENV; 3604 BDB::db_env_txn_checkpoint $DB_ENV;
3575 warn "end emergency database checkpoint\n"; 3605 warn "emergency_perl_save: end database checkpoint\n";
3576 3606
3577 warn "begin write uuid\n"; 3607 warn "emergency_perl_save: begin write uuid\n";
3578 write_uuid_sync 1; 3608 write_uuid_sync 1;
3579 warn "end write uuid\n"; 3609 warn "emergency_perl_save: end write uuid\n";
3580 }; 3610 };
3581 3611
3612 warn "emergency_perl_save: starting sync()\n";
3613 IO::AIO::aio_sync sub {
3614 warn "emergency_perl_save: finished sync()\n";
3615 };
3616
3582 warn "leave emergency perl save\n"; 3617 warn "emergency_perl_save: leave\n";
3583} 3618}
3584 3619
3585sub post_cleanup { 3620sub post_cleanup {
3586 my ($make_core) = @_; 3621 my ($make_core) = @_;
3587 3622
3588 warn Carp::longmess "post_cleanup backtrace" 3623 warn Carp::longmess "post_cleanup backtrace"
3589 if $make_core; 3624 if $make_core;
3625
3626 my $fh = pidfile;
3627 unlink $PIDFILE if <$fh> == $$;
3628}
3629
3630# a safer delete_package, copied from Symbol
3631sub clear_package($) {
3632 my $pkg = shift;
3633
3634 # expand to full symbol table name if needed
3635 unless ($pkg =~ /^main::.*::$/) {
3636 $pkg = "main$pkg" if $pkg =~ /^::/;
3637 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3638 $pkg .= '::' unless $pkg =~ /::$/;
3639 }
3640
3641 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3642 my $stem_symtab = *{$stem}{HASH};
3643
3644 defined $stem_symtab and exists $stem_symtab->{$leaf}
3645 or return;
3646
3647 # clear all symbols
3648 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3649 for my $name (keys %$leaf_symtab) {
3650 _gv_clear *{"$pkg$name"};
3651# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3652 }
3653 warn "cleared package $pkg\n";#d#
3590} 3654}
3591 3655
3592sub do_reload_perl() { 3656sub do_reload_perl() {
3593 # can/must only be called in main 3657 # can/must only be called in main
3594 if ($Coro::current != $Coro::main) { 3658 if ($Coro::current != $Coro::main) {
3595 warn "can only reload from main coroutine"; 3659 warn "can only reload from main coroutine";
3596 return; 3660 return;
3597 } 3661 }
3598 3662
3663 return if $RELOAD++;
3664
3665 my $t1 = EV::time;
3666
3667 while ($RELOAD) {
3599 warn "reloading..."; 3668 warn "reloading...";
3600 3669
3601 warn "entering sync_job"; 3670 warn "entering sync_job";
3602 3671
3603 cf::sync_job { 3672 cf::sync_job {
3604 cf::write_runtime_sync; # external watchdog should not bark 3673 cf::write_runtime_sync; # external watchdog should not bark
3605 cf::emergency_save; 3674 cf::emergency_save;
3606 cf::write_runtime_sync; # external watchdog should not bark 3675 cf::write_runtime_sync; # external watchdog should not bark
3607 3676
3608 warn "syncing database to disk"; 3677 warn "syncing database to disk";
3609 BDB::db_env_txn_checkpoint $DB_ENV; 3678 BDB::db_env_txn_checkpoint $DB_ENV;
3610 3679
3611 # if anything goes wrong in here, we should simply crash as we already saved 3680 # if anything goes wrong in here, we should simply crash as we already saved
3612 3681
3613 warn "flushing outstanding aio requests"; 3682 warn "flushing outstanding aio requests";
3614 for (;;) {
3615 BDB::flush;
3616 IO::AIO::flush;
3617 Coro::cede_notself;
3618 last unless IO::AIO::nreqs || BDB::nreqs; 3683 while (IO::AIO::nreqs || BDB::nreqs) {
3619 warn "iterate..."; 3684 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3620 }
3621
3622 ++$RELOAD;
3623
3624 warn "cancelling all extension coros";
3625 $_->cancel for values %EXT_CORO;
3626 %EXT_CORO = ();
3627
3628 warn "removing commands";
3629 %COMMAND = ();
3630
3631 warn "removing ext/exti commands";
3632 %EXTCMD = ();
3633 %EXTICMD = ();
3634
3635 warn "unloading/nuking all extensions";
3636 for my $pkg (@EXTS) {
3637 warn "... unloading $pkg";
3638
3639 if (my $cb = $pkg->can ("unload")) {
3640 eval {
3641 $cb->($pkg);
3642 1
3643 } or warn "$pkg unloaded, but with errors: $@";
3644 } 3685 }
3645 3686
3646 warn "... nuking $pkg"; 3687 warn "cancelling all extension coros";
3647 Symbol::delete_package $pkg; 3688 $_->cancel for values %EXT_CORO;
3648 } 3689 %EXT_CORO = ();
3649 3690
3650 warn "unloading all perl modules loaded from $LIBDIR"; 3691 warn "removing commands";
3651 while (my ($k, $v) = each %INC) { 3692 %COMMAND = ();
3652 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3653 3693
3694 warn "removing ext/exti commands";
3695 %EXTCMD = ();
3696 %EXTICMD = ();
3697
3698 warn "unloading/nuking all extensions";
3699 for my $pkg (@EXTS) {
3654 warn "... unloading $k"; 3700 warn "... unloading $pkg";
3655 delete $INC{$k};
3656 3701
3657 $k =~ s/\.pm$//;
3658 $k =~ s/\//::/g;
3659
3660 if (my $cb = $k->can ("unload_module")) { 3702 if (my $cb = $pkg->can ("unload")) {
3703 eval {
3661 $cb->(); 3704 $cb->($pkg);
3705 1
3706 } or warn "$pkg unloaded, but with errors: $@";
3707 }
3708
3709 warn "... clearing $pkg";
3710 clear_package $pkg;
3662 } 3711 }
3663 3712
3664 Symbol::delete_package $k; 3713 warn "unloading all perl modules loaded from $LIBDIR";
3714 while (my ($k, $v) = each %INC) {
3715 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3716
3717 warn "... unloading $k";
3718 delete $INC{$k};
3719
3720 $k =~ s/\.pm$//;
3721 $k =~ s/\//::/g;
3722
3723 if (my $cb = $k->can ("unload_module")) {
3724 $cb->();
3725 }
3726
3727 clear_package $k;
3665 } 3728 }
3666 3729
3667 warn "getting rid of safe::, as good as possible"; 3730 warn "getting rid of safe::, as good as possible";
3668 Symbol::delete_package "safe::$_" 3731 clear_package "safe::$_"
3669 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3732 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3670 3733
3671 warn "unloading cf.pm \"a bit\""; 3734 warn "unloading cf.pm \"a bit\"";
3672 delete $INC{"cf.pm"}; 3735 delete $INC{"cf.pm"};
3673 delete $INC{"cf/pod.pm"}; 3736 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3674 3737
3675 # don't, removes xs symbols, too, 3738 # don't, removes xs symbols, too,
3676 # and global variables created in xs 3739 # and global variables created in xs
3677 #Symbol::delete_package __PACKAGE__; 3740 #clear_package __PACKAGE__;
3678 3741
3679 warn "unload completed, starting to reload now"; 3742 warn "unload completed, starting to reload now";
3680 3743
3681 warn "reloading cf.pm"; 3744 warn "reloading cf.pm";
3682 require cf; 3745 require cf;
3683 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3746 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3684 3747
3685 warn "loading config and database again"; 3748 warn "loading config and database again";
3686 cf::reload_config; 3749 cf::reload_config;
3687 3750
3688 warn "loading extensions"; 3751 warn "loading extensions";
3689 cf::load_extensions; 3752 cf::load_extensions;
3690 3753
3754 if ($REATTACH_ON_RELOAD) {
3691 warn "reattaching attachments to objects/players"; 3755 warn "reattaching attachments to objects/players";
3692 _global_reattach; # objects, sockets 3756 _global_reattach; # objects, sockets
3693 warn "reattaching attachments to maps"; 3757 warn "reattaching attachments to maps";
3694 reattach $_ for values %MAP; 3758 reattach $_ for values %MAP;
3695 warn "reattaching attachments to players"; 3759 warn "reattaching attachments to players";
3696 reattach $_ for values %PLAYER; 3760 reattach $_ for values %PLAYER;
3761 }
3697 3762
3763 warn "running post_init jobs";
3764 (pop @POST_INIT)->(1) while @POST_INIT;
3765
3698 warn "leaving sync_job"; 3766 warn "leaving sync_job";
3699 3767
3700 1 3768 1
3701 } or do { 3769 } or do {
3702 warn $@; 3770 warn $@;
3703 cf::cleanup "error while reloading, exiting."; 3771 cf::cleanup "error while reloading, exiting.";
3704 }; 3772 };
3705 3773
3706 warn "reloaded"; 3774 warn "reloaded";
3775 --$RELOAD;
3776 }
3777
3778 $t1 = EV::time - $t1;
3779 warn "reload completed in ${t1}s\n";
3707}; 3780};
3708 3781
3709our $RELOAD_WATCHER; # used only during reload 3782our $RELOAD_WATCHER; # used only during reload
3710 3783
3711sub reload_perl() { 3784sub reload_perl() {
3712 # doing reload synchronously and two reloads happen back-to-back, 3785 # doing reload synchronously and two reloads happen back-to-back,
3713 # coro crashes during coro_state_free->destroy here. 3786 # coro crashes during coro_state_free->destroy here.
3714 3787
3788 $RELOAD_WATCHER ||= cf::async {
3789 Coro::AIO::aio_wait cache_extensions;
3790
3715 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3791 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3716 do_reload_perl; 3792 do_reload_perl;
3717 undef $RELOAD_WATCHER; 3793 undef $RELOAD_WATCHER;
3794 };
3718 }; 3795 };
3719} 3796}
3720 3797
3721register_command "reload" => sub { 3798register_command "reload" => sub {
3722 my ($who, $arg) = @_; 3799 my ($who, $arg) = @_;
… …
3848 $msg =~ s/\n//; 3925 $msg =~ s/\n//;
3849 3926
3850 # limit the # of concurrent backtraces 3927 # limit the # of concurrent backtraces
3851 if ($_log_backtrace < 2) { 3928 if ($_log_backtrace < 2) {
3852 ++$_log_backtrace; 3929 ++$_log_backtrace;
3930 my $perl_bt = Carp::longmess $msg;
3853 async { 3931 async {
3854 $Coro::current->{desc} = "abt $msg"; 3932 $Coro::current->{desc} = "abt $msg";
3855 3933
3856 my @bt = fork_call { 3934 my @bt = fork_call {
3857 @addr = map { sprintf "%x", $_ } @addr; 3935 @addr = map { sprintf "%x", $_ } @addr;
… …
3868 } 3946 }
3869 3947
3870 @funcs 3948 @funcs
3871 }; 3949 };
3872 3950
3873 LOG llevInfo, "[ABT] $msg\n"; 3951 LOG llevInfo, "[ABT] $perl_bt\n";
3952 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3874 LOG llevInfo, "[ABT] $_\n" for @bt; 3953 LOG llevInfo, "[ABT] $_\n" for @bt;
3875 --$_log_backtrace; 3954 --$_log_backtrace;
3876 }; 3955 };
3877 } else { 3956 } else {
3878 LOG llevInfo, "[ABT] $msg\n"; 3957 LOG llevInfo, "[ABT] $msg\n";
3879 LOG llevInfo, "[ABT] [suppressed]\n"; 3958 LOG llevInfo, "[ABT] [suppressed]\n";
3880 } 3959 }
3881} 3960}
3882 3961
3883# load additional modules 3962# load additional modules
3884use cf::pod; 3963require "cf/$_.pm" for @EXTRA_MODULES;
3885 3964
3886END { cf::emergency_save } 3965END { cf::emergency_save }
3887 3966
38881 39671
3889 3968

Diff Legend

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