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.436 by root, Sun Jun 15 20:32:51 2008 UTC vs.
Revision 1.475 by root, Tue Jul 21 06:17:00 2009 UTC

… …
19# The authors can be reached via e-mail to <support@deliantra.net> 19# The authors can be reached via e-mail to <support@deliantra.net>
20# 20#
21 21
22package cf; 22package cf;
23 23
24use 5.10.0;
24use utf8; 25use utf8;
25use strict; 26use strict qw(vars subs);
26 27
27use Symbol; 28use Symbol;
28use List::Util; 29use List::Util;
29use Socket; 30use Socket;
30use EV; 31use EV;
31use Opcode; 32use Opcode;
32use Safe; 33use Safe;
33use Safe::Hole; 34use Safe::Hole;
34use Storable (); 35use Storable ();
35 36
37use Guard ();
36use Coro (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
39use Coro::AnyEvent; 42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
43use Coro::AnyEvent; 47use Coro::AnyEvent;
44use Coro::AIO; 48use Coro::AIO;
45use Coro::BDB; 49use Coro::BDB 1.6;
46use Coro::Storable; 50use Coro::Storable;
47use Coro::Util (); 51use Coro::Util ();
48 52
49use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
50use BDB (); 54use BDB ();
… …
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;
… …
243for my $pkg (qw( 265for my $pkg (qw(
244 cf::global cf::attachable 266 cf::global cf::attachable
245 cf::object cf::object::player 267 cf::object cf::object::player
246 cf::client cf::player 268 cf::client cf::player
247 cf::arch cf::living 269 cf::arch cf::living
270 cf::map cf::mapspace
248 cf::map cf::party cf::region 271 cf::party cf::region
249)) { 272)) {
250 no strict 'refs';
251 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 273 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
252} 274}
253 275
254$EV::DIED = sub { 276$EV::DIED = sub {
255 warn "error in event callback: @_"; 277 warn "error in event callback: @_";
… …
297our $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
298 320
299sub encode_json($) { $json_coder->encode ($_[0]) } 321sub encode_json($) { $json_coder->encode ($_[0]) }
300sub decode_json($) { $json_coder->decode ($_[0]) } 322sub decode_json($) { $json_coder->decode ($_[0]) }
301 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
302=item cf::lock_wait $string 338=item cf::lock_wait $string
303 339
304Wait until the given lock is available. See cf::lock_acquire. 340Wait until the given lock is available. See cf::lock_acquire.
305 341
306=item my $lock = cf::lock_acquire $string 342=item my $lock = cf::lock_acquire $string
307 343
308Wait 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
309a 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,
310for example when the coroutine gets canceled), the lock is automatically 346for example when the coroutine gets canceled), the lock is automatically
311returned. 347returned.
312 348
313Locks 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
314deadlocked coro. 350deadlocked coro.
… …
320 356
321Return 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.
322 358
323=cut 359=cut
324 360
325our %LOCK; 361our $LOCKS = new Coro::SemaphoreSet;
326our %LOCKER;#d#
327 362
328sub lock_wait($) { 363sub lock_wait($) {
329 my ($key) = @_; 364 $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} 365}
342 366
343sub lock_acquire($) { 367sub lock_acquire($) {
344 my ($key) = @_; 368 $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} 369}
358 370
359sub lock_active($) { 371sub lock_active($) {
360 my ($key) = @_; 372 $LOCKS->count ($_[0]) < 1
361
362 ! ! $LOCK{$key}
363} 373}
364 374
365sub freeze_mainloop { 375sub freeze_mainloop {
366 tick_inhibit_inc; 376 tick_inhibit_inc;
367 377
368 Coro::guard \&tick_inhibit_dec; 378 &Guard::guard (\&tick_inhibit_dec);
369} 379}
370 380
371=item cf::periodic $interval, $cb 381=item cf::periodic $interval, $cb
372 382
373Like 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
… …
725 735
726############################################################################# 736#############################################################################
727 737
728=head2 ATTACHABLE OBJECTS 738=head2 ATTACHABLE OBJECTS
729 739
730Many 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
731attach callbacks/event handlers (a collection of which is called an "attachment") 741attach callbacks/event handlers (a collection of which is called an "attachment")
732to it. All such attachable objects support the following methods. 742to it. All such attachable objects support the following methods.
733 743
734In 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>
735C<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
… …
785=item cf::CLASS::attachment $name, ... 795=item cf::CLASS::attachment $name, ...
786 796
787Register an attachment by C<$name> through which attachable objects of the 797Register an attachment by C<$name> through which attachable objects of the
788given CLASS can refer to this attachment. 798given CLASS can refer to this attachment.
789 799
790Some classes such as crossfire maps and objects can specify attachments 800Some classes such as deliantra maps and objects can specify attachments
791that 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.
792 802
793These calls expect any number of the following handler/hook descriptions: 803These calls expect any number of the following handler/hook descriptions:
794 804
795=over 4 805=over 4
… …
1086 1096
1087sub reattach { 1097sub reattach {
1088 # basically do the same as instantiate, without calling instantiate 1098 # basically do the same as instantiate, without calling instantiate
1089 my ($obj) = @_; 1099 my ($obj) = @_;
1090 1100
1101 # no longer needed after getting rid of delete_package?
1091 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
1092 1103
1093 my $registry = $obj->registry; 1104 my $registry = $obj->registry;
1094 1105
1095 @$registry = (); 1106 @$registry = ();
1096 1107
… …
1144 $decname, length $$rdata, scalar @$objs; 1155 $decname, length $$rdata, scalar @$objs;
1145 1156
1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1157 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1147 aio_chmod $fh, SAVE_MODE; 1158 aio_chmod $fh, SAVE_MODE;
1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1159 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1149 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 }
1150 aio_close $fh; 1164 aio_close $fh;
1151 1165
1152 if (@$objs) { 1166 if (@$objs) {
1153 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) {
1154 aio_chmod $fh, SAVE_MODE; 1168 aio_chmod $fh, SAVE_MODE;
1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1169 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1156 aio_write $fh, 0, (length $data), $data, 0; 1170 aio_write $fh, 0, (length $data), $data, 0;
1157 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 }
1158 aio_close $fh; 1175 aio_close $fh;
1159 aio_rename "$filename.pst~", "$filename.pst"; 1176 aio_rename "$filename.pst~", "$filename.pst";
1160 } 1177 }
1161 } else { 1178 } else {
1162 aio_unlink "$filename.pst"; 1179 aio_unlink "$filename.pst";
1163 } 1180 }
1164 1181
1165 aio_rename "$filename~", $filename; 1182 aio_rename "$filename~", $filename;
1183
1184 $filename =~ s%/[^/]+$%%;
1185 aio_pathsync $filename if $cf::USE_FSYNC;
1166 } else { 1186 } else {
1167 warn "FATAL: $filename~: $!\n"; 1187 warn "unable to save objects: $filename~: $!\n";
1168 } 1188 }
1169 } else { 1189 } else {
1170 aio_unlink $filename; 1190 aio_unlink $filename;
1171 aio_unlink "$filename.pst"; 1191 aio_unlink "$filename.pst";
1172 } 1192 }
… …
1263 my ($name, $cb) = @_; 1283 my ($name, $cb) = @_;
1264 1284
1265 $EXTICMD{$name} = $cb; 1285 $EXTICMD{$name} = $cb;
1266} 1286}
1267 1287
1288use File::Glob ();
1289
1268cf::player->attach ( 1290cf::player->attach (
1269 on_command => sub { 1291 on_command => sub {
1270 my ($pl, $name, $params) = @_; 1292 my ($pl, $name, $params) = @_;
1271 1293
1272 my $cb = $COMMAND{$name} 1294 my $cb = $COMMAND{$name}
… …
1304 1326
1305 cf::override; 1327 cf::override;
1306 }, 1328 },
1307); 1329);
1308 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
1309sub load_extensions { 1344sub load_extensions {
1310 cf::sync_job { 1345 cf::sync_job {
1311 my %todo; 1346 my %todo;
1312 1347
1313 for my $path (<$LIBDIR/*.ext>) { 1348 for my $path (<$LIBDIR/*.ext>) {
… …
1332 1367
1333 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1368 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1334 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1369 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1335 1370
1336 $ext{source} = 1371 $ext{source} =
1337 "package $pkg; use strict; use utf8;\n" 1372 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1338 . "#line 1 \"$path\"\n{\n" 1373 . "#line 1 \"$path\"\n{\n"
1339 . $source 1374 . $source
1340 . "\n};\n1"; 1375 . "\n};\n1";
1341 1376
1342 $todo{$base} = \%ext; 1377 $todo{$base} = \%ext;
… …
1382 1417
1383=back 1418=back
1384 1419
1385=head2 CORE EXTENSIONS 1420=head2 CORE EXTENSIONS
1386 1421
1387Functions and methods that extend core crossfire objects. 1422Functions and methods that extend core deliantra objects.
1388 1423
1389=cut 1424=cut
1390 1425
1391package cf::player; 1426package cf::player;
1392 1427
… …
1435 1470
1436sub exists($) { 1471sub exists($) {
1437 my ($login) = @_; 1472 my ($login) = @_;
1438 1473
1439 $cf::PLAYER{$login} 1474 $cf::PLAYER{$login}
1440 or cf::sync_job { !aio_stat path $login } 1475 or !aio_stat path $login
1441} 1476}
1442 1477
1443sub find($) { 1478sub find($) {
1444 return $cf::PLAYER{$_[0]} || do { 1479 return $cf::PLAYER{$_[0]} || do {
1445 my $login = $_[0]; 1480 my $login = $_[0];
… …
1520 my ($pl) = @_; 1555 my ($pl) = @_;
1521 1556
1522 my $name = $pl->ob->name; 1557 my $name = $pl->ob->name;
1523 1558
1524 $pl->{deny_save} = 1; 1559 $pl->{deny_save} = 1;
1525 $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
1526 1561
1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1562 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1528 $pl->deactivate; 1563 $pl->deactivate;
1529 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;
1530 $pl->ob->check_score; 1565 $pl->ob->check_score;
… …
1616 } 1651 }
1617 1652
1618 \@paths 1653 \@paths
1619} 1654}
1620 1655
1621=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1656=item $protocol_xml = $player->expand_cfpod ($cfpod)
1622 1657
1623Expand crossfire pod fragments into protocol xml. 1658Expand 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 1659
1714=item $player->ext_reply ($msgid, @msg) 1660=item $player->ext_reply ($msgid, @msg)
1715 1661
1716Sends an ext reply to the player. 1662Sends an ext reply to the player.
1717 1663
… …
1930 1876
1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1877 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1932 "$UNIQUEDIR/$path" 1878 "$UNIQUEDIR/$path"
1933} 1879}
1934 1880
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 { 1881sub decay_objects {
1945 my ($self) = @_; 1882 my ($self) = @_;
1946 1883
1947 return if $self->{deny_reset}; 1884 return if $self->{deny_reset};
1948 1885
… …
2030sub find { 1967sub find {
2031 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
2032 1969
2033 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
2034 1971
2035 cf::lock_wait "map_data:$path";#d#remove 1972 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036 cf::lock_wait "map_find:$path"; 1973 my $guard2 = cf::lock_acquire "map_find:$path";
2037 1974
2038 $cf::MAP{$path} || do { 1975 $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 1976 my $map = new_from_path cf::map $path
2043 or return; 1977 or return;
2044 1978
2045 $map->{last_save} = $cf::RUNTIME; 1979 $map->{last_save} = $cf::RUNTIME;
2046 1980
… …
2086 my $f = new_from_file cf::object::thawer $self->{load_path}; 2020 my $f = new_from_file cf::object::thawer $self->{load_path};
2087 $f->skip_block; 2021 $f->skip_block;
2088 $self->_load_objects ($f) 2022 $self->_load_objects ($f)
2089 or return; 2023 or return;
2090 2024
2091 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2025 $self->post_load_original
2092 if delete $self->{load_original}; 2026 if delete $self->{load_original};
2093 2027
2094 if (my $uniq = $self->uniq_path) { 2028 if (my $uniq = $self->uniq_path) {
2095 utf8::encode $uniq; 2029 utf8::encode $uniq;
2096 unless (aio_stat $uniq) { 2030 unless (aio_stat $uniq) {
… …
2113 2047
2114 unless ($self->{deny_activate}) { 2048 unless ($self->{deny_activate}) {
2115 $self->decay_objects; 2049 $self->decay_objects;
2116 $self->fix_auto_apply; 2050 $self->fix_auto_apply;
2117 $self->update_buttons; 2051 $self->update_buttons;
2118 cf::cede_to_tick;
2119 $self->set_darkness_map;
2120 cf::cede_to_tick; 2052 cf::cede_to_tick;
2121 $self->activate; 2053 $self->activate;
2122 } 2054 }
2123 2055
2124 $self->{last_save} = $cf::RUNTIME; 2056 $self->{last_save} = $cf::RUNTIME;
… …
2466 2398
2467our $SAY_CHANNEL = { 2399our $SAY_CHANNEL = {
2468 id => "say", 2400 id => "say",
2469 title => "Map", 2401 title => "Map",
2470 reply => "say ", 2402 reply => "say ",
2471 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.",
2472}; 2404};
2473 2405
2474our $CHAT_CHANNEL = { 2406our $CHAT_CHANNEL = {
2475 id => "chat", 2407 id => "chat",
2476 title => "Chat", 2408 title => "Chat",
… …
2531 2463
2532=item $player_object->enter_link 2464=item $player_object->enter_link
2533 2465
2534Freezes 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}>).
2535 2467
2536The 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.
2537I<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.
2538 2472
2539Will never block. 2473Will never block.
2540 2474
2541=item $player_object->leave_link ($map, $x, $y) 2475=item $player_object->leave_link ($map, $x, $y)
2542 2476
… …
2600 2534
2601 $map->load; 2535 $map->load;
2602 $map->load_neighbours; 2536 $map->load_neighbours;
2603 2537
2604 return unless $self->contr->active; 2538 return unless $self->contr->active;
2539 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2605 $self->activate_recursive; 2540 $self->activate_recursive;
2606 2541
2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2542 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2608 $self->enter_map ($map, $x, $y); 2543 $self->enter_map ($map, $x, $y);
2609} 2544}
… …
2772 $self->contr->savebed ($map, $x, $y) 2707 $self->contr->savebed ($map, $x, $y)
2773 if $exit->flag (cf::FLAG_DAMNED); 2708 if $exit->flag (cf::FLAG_DAMNED);
2774 2709
2775 1 2710 1
2776 }) { 2711 }) {
2777 $self->message ("Something went wrong deep within the crossfire server. " 2712 $self->message ("Something went wrong deep within the deliantra server. "
2778 . "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. "
2779 . "Please report this to the dungeon master!", 2714 . "Please report this to the dungeon master!",
2780 cf::NDI_UNIQUE | cf::NDI_RED); 2715 cf::NDI_UNIQUE | cf::NDI_RED);
2781 2716
2782 warn "ERROR in enter_exit: $@"; 2717 warn "ERROR in enter_exit: $@";
… …
2848 id => "infobox", 2783 id => "infobox",
2849 title => "Body Parts", 2784 title => "Body Parts",
2850 reply => undef, 2785 reply => undef,
2851 tooltip => "Shows which body parts you posess and are available", 2786 tooltip => "Shows which body parts you posess and are available",
2852 }, 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 },
2853 "c/uptime" => { 2824 "c/uptime" => {
2854 id => "infobox", 2825 id => "infobox",
2855 title => "Uptime", 2826 title => "Uptime",
2856 reply => undef, 2827 reply => undef,
2857 tooltip => "How long the server has been running since last restart", 2828 tooltip => "How long the server has been running since last restart",
… …
2866 id => "party", 2837 id => "party",
2867 title => "Party", 2838 title => "Party",
2868 reply => "gsay ", 2839 reply => "gsay ",
2869 tooltip => "Messages and chat related to your party", 2840 tooltip => "Messages and chat related to your party",
2870 }, 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,
2871); 2850);
2872 2851
2873sub cf::client::send_msg { 2852sub cf::client::send_msg {
2874 my ($self, $channel, $msg, $color, @extra) = @_; 2853 my ($self, $channel, $msg, $color, @extra) = @_;
2875 2854
2876 $msg = $self->pl->expand_cfpod ($msg); 2855 $msg = $self->pl->expand_cfpod ($msg)
2856 unless $color & cf::NDI_VERBATIM;
2877 2857
2878 $color &= cf::NDI_CLIENT_MASK; # just in case... 2858 $color &= cf::NDI_CLIENT_MASK; # just in case...
2879 2859
2880 # check predefined channels, for the benefit of C 2860 # check predefined channels, for the benefit of C
2881 if ($CHANNEL{$channel}) { 2861 if ($CHANNEL{$channel}) {
2882 $channel = $CHANNEL{$channel}; 2862 $channel = $CHANNEL{$channel};
2883 2863
2884 $self->ext_msg (channel_info => $channel) 2864 $self->ext_msg (channel_info => $channel);
2885 if $self->can_msg;
2886
2887 $channel = $channel->{id}; 2865 $channel = $channel->{id};
2888 2866
2889 } elsif (ref $channel) { 2867 } elsif (ref $channel) {
2890 # send meta info to client, if not yet sent 2868 # send meta info to client, if not yet sent
2891 unless (exists $self->{channel}{$channel->{id}}) { 2869 unless (exists $self->{channel}{$channel->{id}}) {
2892 $self->{channel}{$channel->{id}} = $channel; 2870 $self->{channel}{$channel->{id}} = $channel;
2893 $self->ext_msg (channel_info => $channel) 2871 $self->ext_msg (channel_info => $channel);
2894 if $self->can_msg;
2895 } 2872 }
2896 2873
2897 $channel = $channel->{id}; 2874 $channel = $channel->{id};
2898 } 2875 }
2899 2876
2900 return unless @extra || length $msg; 2877 return unless @extra || length $msg;
2901 2878
2902 if ($self->can_msg) {
2903 # default colour, mask it out 2879 # default colour, mask it out
2904 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2880 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2905 if $color & cf::NDI_DEF; 2881 if $color & cf::NDI_DEF;
2906 2882
2907 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2883 my $pkt = "msg "
2884 . $self->{json_coder}->encode (
2908 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2885 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2909 } else { 2886 );
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 2887
2921 $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};
2922 2891
2923 utf8::encode $msg; 2892 # split very large packets
2924 2893 if (8192 < length $pkt and $self->{can_lzf}) {
2925 if (0 && $msg =~ /\[/) { 2894 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2926 # COMMAND/INFO 2895 $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 } 2896 }
2897
2898 $self->send_packet ($pkt);
2934} 2899}
2935 2900
2936=item $client->ext_msg ($type, @msg) 2901=item $client->ext_msg ($type, @msg)
2937 2902
2938Sends an ext event to the client. 2903Sends an ext event to the client.
… …
3113The following functions and methods are available within a safe environment: 3078The following functions and methods are available within a safe environment:
3114 3079
3115 cf::object 3080 cf::object
3116 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
3117 insert remove name archname title slaying race decrease split 3082 insert remove name archname title slaying race decrease split
3083 value
3118 3084
3119 cf::object::player 3085 cf::object::player
3120 player 3086 player
3121 3087
3122 cf::player 3088 cf::player
… …
3128=cut 3094=cut
3129 3095
3130for ( 3096for (
3131 ["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
3132 insert remove inv nrof name archname title slaying race 3098 insert remove inv nrof name archname title slaying race
3133 decrease split destroy)], 3099 decrease split destroy change_exp value msg lore send_msg)],
3134 ["cf::object::player" => qw(player)], 3100 ["cf::object::player" => qw(player)],
3135 ["cf::player" => qw(peaceful)], 3101 ["cf::player" => qw(peaceful send_msg)],
3136 ["cf::map" => qw(trigger)], 3102 ["cf::map" => qw(trigger)],
3137) { 3103) {
3138 no strict 'refs'; 3104 no strict 'refs';
3139 my ($pkg, @funs) = @$_; 3105 my ($pkg, @funs) = @$_;
3140 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3157 my ($code, %vars) = @_; 3123 my ($code, %vars) = @_;
3158 3124
3159 my $qcode = $code; 3125 my $qcode = $code;
3160 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3161 $qcode =~ s/\n/\\n/g; 3127 $qcode =~ s/\n/\\n/g;
3128
3129 %vars = (_dummy => 0) unless %vars;
3162 3130
3163 local $_; 3131 local $_;
3164 local @safe::cf::_safe_eval_args = values %vars; 3132 local @safe::cf::_safe_eval_args = values %vars;
3165 3133
3166 my $eval = 3134 my $eval =
… …
3396 reload_treasures; 3364 reload_treasures;
3397 3365
3398 warn "finished reloading resource files\n"; 3366 warn "finished reloading resource files\n";
3399} 3367}
3400 3368
3401sub init {
3402 my $guard = freeze_mainloop;
3403
3404 evthread_start IO::AIO::poll_fileno;
3405
3406 reload_resources;
3407}
3408
3409sub reload_config { 3369sub reload_config {
3410 open my $fh, "<:utf8", "$CONFDIR/config" 3370 open my $fh, "<:utf8", "$CONFDIR/config"
3411 or return; 3371 or return;
3412 3372
3413 local $/; 3373 local $/;
… …
3425 }; 3385 };
3426 warn $@ if $@; 3386 warn $@ if $@;
3427 } 3387 }
3428} 3388}
3429 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
3430sub 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
3431 # we must not ever block the main coroutine 3433 # we must not ever block the main coroutine
3432 local $Coro::idle = sub { 3434 local $Coro::idle = sub {
3433 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#
3434 (async { 3436 (async {
3435 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3437 $Coro::current->{desc} = "IDLE BUG HANDLER";
3436 EV::loop EV::LOOP_ONESHOT; 3438 EV::loop EV::LOOP_ONESHOT;
3437 })->prio (Coro::PRIO_MAX); 3439 })->prio (Coro::PRIO_MAX);
3438 }; 3440 };
3439 3441
3440 { 3442 evthread_start IO::AIO::poll_fileno;
3441 my $guard = freeze_mainloop; 3443
3444 cf::sync_job {
3445 reload_resources;
3442 reload_config; 3446 reload_config;
3443 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
3444 load_extensions; 3460 load_extensions;
3445 3461
3446 $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 use POSIX ();
3466 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3467
3468 (pop @POST_INIT)->(0) while @POST_INIT;
3447 } 3469 };
3448 3470
3449 EV::loop; 3471 main_loop;
3450} 3472}
3451 3473
3452############################################################################# 3474#############################################################################
3453# initialisation and cleanup 3475# initialisation and cleanup
3454 3476
… …
3461 }; 3483 };
3462 } 3484 }
3463} 3485}
3464 3486
3465sub write_runtime_sync { 3487sub write_runtime_sync {
3466 my $runtime = "$LOCALDIR/runtime";
3467
3468 # first touch the runtime file to show we are still running: 3488 # first touch the runtime file to show we are still running:
3469 # the fsync below can take a very very long time. 3489 # the fsync below can take a very very long time.
3470 3490
3471 IO::AIO::aio_utime $runtime, undef, undef; 3491 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3472 3492
3473 my $guard = cf::lock_acquire "write_runtime"; 3493 my $guard = cf::lock_acquire "write_runtime";
3474 3494
3475 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3495 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3476 or return; 3496 or return;
3477 3497
3478 my $value = $cf::RUNTIME + 90 + 10; 3498 my $value = $cf::RUNTIME + 90 + 10;
3479 # 10 is the runtime save interval, for a monotonic clock 3499 # 10 is the runtime save interval, for a monotonic clock
3480 # 60 allows for the watchdog to kill the server. 3500 # 60 allows for the watchdog to kill the server.
… …
3490 aio_utime $fh, undef, undef; 3510 aio_utime $fh, undef, undef;
3491 3511
3492 close $fh 3512 close $fh
3493 or return; 3513 or return;
3494 3514
3495 aio_rename "$runtime~", $runtime 3515 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3496 and return; 3516 and return;
3497 3517
3498 warn "runtime file written.\n"; 3518 warn "runtime file written.\n";
3499 3519
3500 1 3520 1
… …
3512 my $uuid = "$LOCALDIR/uuid"; 3532 my $uuid = "$LOCALDIR/uuid";
3513 3533
3514 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3534 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3515 or return; 3535 or return;
3516 3536
3517 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3537 my $value = uuid_seq uuid_cur;
3538
3539 unless ($value) {
3540 warn "cowardly refusing to write zero uuid value!\n";
3541 return;
3542 }
3543
3544 my $value = uuid_str $value + $uuid_skip;
3518 $uuid_skip = 0; 3545 $uuid_skip = 0;
3519 3546
3520 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3547 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3521 and return; 3548 and return;
3522 3549
… …
3544} 3571}
3545 3572
3546sub emergency_save() { 3573sub emergency_save() {
3547 my $freeze_guard = cf::freeze_mainloop; 3574 my $freeze_guard = cf::freeze_mainloop;
3548 3575
3549 warn "enter emergency perl save\n"; 3576 warn "emergency_perl_save: enter\n";
3550 3577
3551 cf::sync_job { 3578 cf::sync_job {
3579 # this is a trade-off: we want to be very quick here, so
3580 # save all maps without fsync, and later call a global sync
3581 # (which in turn might be very very slow)
3582 local $USE_FSYNC = 0;
3583
3552 # use a peculiar iteration method to avoid tripping on perl 3584 # use a peculiar iteration method to avoid tripping on perl
3553 # refcount bugs in for. also avoids problems with players 3585 # refcount bugs in for. also avoids problems with players
3554 # and maps saved/destroyed asynchronously. 3586 # and maps saved/destroyed asynchronously.
3555 warn "begin emergency player save\n"; 3587 warn "emergency_perl_save: begin player save\n";
3556 for my $login (keys %cf::PLAYER) { 3588 for my $login (keys %cf::PLAYER) {
3557 my $pl = $cf::PLAYER{$login} or next; 3589 my $pl = $cf::PLAYER{$login} or next;
3558 $pl->valid or next; 3590 $pl->valid or next;
3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3591 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3560 $pl->save; 3592 $pl->save;
3561 } 3593 }
3562 warn "end emergency player save\n"; 3594 warn "emergency_perl_save: end player save\n";
3563 3595
3564 warn "begin emergency map save\n"; 3596 warn "emergency_perl_save: begin map save\n";
3565 for my $path (keys %cf::MAP) { 3597 for my $path (keys %cf::MAP) {
3566 my $map = $cf::MAP{$path} or next; 3598 my $map = $cf::MAP{$path} or next;
3567 $map->valid or next; 3599 $map->valid or next;
3568 $map->save; 3600 $map->save;
3569 } 3601 }
3570 warn "end emergency map save\n"; 3602 warn "emergency_perl_save: end map save\n";
3571 3603
3572 warn "begin emergency database checkpoint\n"; 3604 warn "emergency_perl_save: begin database checkpoint\n";
3573 BDB::db_env_txn_checkpoint $DB_ENV; 3605 BDB::db_env_txn_checkpoint $DB_ENV;
3574 warn "end emergency database checkpoint\n"; 3606 warn "emergency_perl_save: end database checkpoint\n";
3575 3607
3576 warn "begin write uuid\n"; 3608 warn "emergency_perl_save: begin write uuid\n";
3577 write_uuid_sync 1; 3609 write_uuid_sync 1;
3578 warn "end write uuid\n"; 3610 warn "emergency_perl_save: end write uuid\n";
3579 }; 3611 };
3580 3612
3613 warn "emergency_perl_save: starting sync()\n";
3614 IO::AIO::aio_sync sub {
3615 warn "emergency_perl_save: finished sync()\n";
3616 };
3617
3581 warn "leave emergency perl save\n"; 3618 warn "emergency_perl_save: leave\n";
3582} 3619}
3583 3620
3584sub post_cleanup { 3621sub post_cleanup {
3585 my ($make_core) = @_; 3622 my ($make_core) = @_;
3586 3623
3587 warn Carp::longmess "post_cleanup backtrace" 3624 warn Carp::longmess "post_cleanup backtrace"
3588 if $make_core; 3625 if $make_core;
3626
3627 my $fh = pidfile;
3628 unlink $PIDFILE if <$fh> == $$;
3629}
3630
3631# a safer delete_package, copied from Symbol
3632sub clear_package($) {
3633 my $pkg = shift;
3634
3635 # expand to full symbol table name if needed
3636 unless ($pkg =~ /^main::.*::$/) {
3637 $pkg = "main$pkg" if $pkg =~ /^::/;
3638 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3639 $pkg .= '::' unless $pkg =~ /::$/;
3640 }
3641
3642 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3643 my $stem_symtab = *{$stem}{HASH};
3644
3645 defined $stem_symtab and exists $stem_symtab->{$leaf}
3646 or return;
3647
3648 # clear all symbols
3649 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3650 for my $name (keys %$leaf_symtab) {
3651 _gv_clear *{"$pkg$name"};
3652# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3653 }
3654 warn "cleared package $pkg\n";#d#
3589} 3655}
3590 3656
3591sub do_reload_perl() { 3657sub do_reload_perl() {
3592 # can/must only be called in main 3658 # can/must only be called in main
3593 if ($Coro::current != $Coro::main) { 3659 if ($Coro::current != $Coro::main) {
3594 warn "can only reload from main coroutine"; 3660 warn "can only reload from main coroutine";
3595 return; 3661 return;
3596 } 3662 }
3597 3663
3664 return if $RELOAD++;
3665
3666 my $t1 = EV::time;
3667
3668 while ($RELOAD) {
3598 warn "reloading..."; 3669 warn "reloading...";
3599 3670
3600 warn "entering sync_job"; 3671 warn "entering sync_job";
3601 3672
3602 cf::sync_job { 3673 cf::sync_job {
3603 cf::write_runtime_sync; # external watchdog should not bark 3674 cf::write_runtime_sync; # external watchdog should not bark
3604 cf::emergency_save; 3675 cf::emergency_save;
3605 cf::write_runtime_sync; # external watchdog should not bark 3676 cf::write_runtime_sync; # external watchdog should not bark
3606 3677
3607 warn "syncing database to disk"; 3678 warn "syncing database to disk";
3608 BDB::db_env_txn_checkpoint $DB_ENV; 3679 BDB::db_env_txn_checkpoint $DB_ENV;
3609 3680
3610 # if anything goes wrong in here, we should simply crash as we already saved 3681 # if anything goes wrong in here, we should simply crash as we already saved
3611 3682
3612 warn "flushing outstanding aio requests"; 3683 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; 3684 while (IO::AIO::nreqs || BDB::nreqs) {
3618 warn "iterate..."; 3685 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 } 3686 }
3644 3687
3645 warn "... nuking $pkg"; 3688 warn "cancelling all extension coros";
3646 Symbol::delete_package $pkg; 3689 $_->cancel for values %EXT_CORO;
3647 } 3690 %EXT_CORO = ();
3648 3691
3649 warn "unloading all perl modules loaded from $LIBDIR"; 3692 warn "removing commands";
3650 while (my ($k, $v) = each %INC) { 3693 %COMMAND = ();
3651 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3652 3694
3695 warn "removing ext/exti commands";
3696 %EXTCMD = ();
3697 %EXTICMD = ();
3698
3699 warn "unloading/nuking all extensions";
3700 for my $pkg (@EXTS) {
3653 warn "... unloading $k"; 3701 warn "... unloading $pkg";
3654 delete $INC{$k};
3655 3702
3656 $k =~ s/\.pm$//;
3657 $k =~ s/\//::/g;
3658
3659 if (my $cb = $k->can ("unload_module")) { 3703 if (my $cb = $pkg->can ("unload")) {
3704 eval {
3660 $cb->(); 3705 $cb->($pkg);
3706 1
3707 } or warn "$pkg unloaded, but with errors: $@";
3708 }
3709
3710 warn "... clearing $pkg";
3711 clear_package $pkg;
3661 } 3712 }
3662 3713
3663 Symbol::delete_package $k; 3714 warn "unloading all perl modules loaded from $LIBDIR";
3715 while (my ($k, $v) = each %INC) {
3716 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3717
3718 warn "... unloading $k";
3719 delete $INC{$k};
3720
3721 $k =~ s/\.pm$//;
3722 $k =~ s/\//::/g;
3723
3724 if (my $cb = $k->can ("unload_module")) {
3725 $cb->();
3726 }
3727
3728 clear_package $k;
3664 } 3729 }
3665 3730
3666 warn "getting rid of safe::, as good as possible"; 3731 warn "getting rid of safe::, as good as possible";
3667 Symbol::delete_package "safe::$_" 3732 clear_package "safe::$_"
3668 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3733 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3669 3734
3670 warn "unloading cf.pm \"a bit\""; 3735 warn "unloading cf.pm \"a bit\"";
3671 delete $INC{"cf.pm"}; 3736 delete $INC{"cf.pm"};
3672 delete $INC{"cf/pod.pm"}; 3737 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3673 3738
3674 # don't, removes xs symbols, too, 3739 # don't, removes xs symbols, too,
3675 # and global variables created in xs 3740 # and global variables created in xs
3676 #Symbol::delete_package __PACKAGE__; 3741 #clear_package __PACKAGE__;
3677 3742
3678 warn "unload completed, starting to reload now"; 3743 warn "unload completed, starting to reload now";
3679 3744
3680 warn "reloading cf.pm"; 3745 warn "reloading cf.pm";
3681 require cf; 3746 require cf;
3682 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3747 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3683 3748
3684 warn "loading config and database again"; 3749 warn "loading config and database again";
3685 cf::reload_config; 3750 cf::reload_config;
3686 3751
3687 warn "loading extensions"; 3752 warn "loading extensions";
3688 cf::load_extensions; 3753 cf::load_extensions;
3689 3754
3755 if ($REATTACH_ON_RELOAD) {
3690 warn "reattaching attachments to objects/players"; 3756 warn "reattaching attachments to objects/players";
3691 _global_reattach; # objects, sockets 3757 _global_reattach; # objects, sockets
3692 warn "reattaching attachments to maps"; 3758 warn "reattaching attachments to maps";
3693 reattach $_ for values %MAP; 3759 reattach $_ for values %MAP;
3694 warn "reattaching attachments to players"; 3760 warn "reattaching attachments to players";
3695 reattach $_ for values %PLAYER; 3761 reattach $_ for values %PLAYER;
3762 }
3696 3763
3764 warn "running post_init jobs";
3765 (pop @POST_INIT)->(1) while @POST_INIT;
3766
3697 warn "leaving sync_job"; 3767 warn "leaving sync_job";
3698 3768
3699 1 3769 1
3700 } or do { 3770 } or do {
3701 warn $@; 3771 warn $@;
3702 cf::cleanup "error while reloading, exiting."; 3772 cf::cleanup "error while reloading, exiting.";
3703 }; 3773 };
3704 3774
3705 warn "reloaded"; 3775 warn "reloaded";
3776 --$RELOAD;
3777 }
3778
3779 $t1 = EV::time - $t1;
3780 warn "reload completed in ${t1}s\n";
3706}; 3781};
3707 3782
3708our $RELOAD_WATCHER; # used only during reload 3783our $RELOAD_WATCHER; # used only during reload
3709 3784
3710sub reload_perl() { 3785sub reload_perl() {
3711 # doing reload synchronously and two reloads happen back-to-back, 3786 # doing reload synchronously and two reloads happen back-to-back,
3712 # coro crashes during coro_state_free->destroy here. 3787 # coro crashes during coro_state_free->destroy here.
3713 3788
3789 $RELOAD_WATCHER ||= cf::async {
3790 Coro::AIO::aio_wait cache_extensions;
3791
3714 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3792 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3715 do_reload_perl; 3793 do_reload_perl;
3716 undef $RELOAD_WATCHER; 3794 undef $RELOAD_WATCHER;
3795 };
3717 }; 3796 };
3718} 3797}
3719 3798
3720register_command "reload" => sub { 3799register_command "reload" => sub {
3721 my ($who, $arg) = @_; 3800 my ($who, $arg) = @_;
… …
3796 BDB::max_poll_reqs $TICK * 0.1; 3875 BDB::max_poll_reqs $TICK * 0.1;
3797 $AnyEvent::BDB::WATCHER->priority (1); 3876 $AnyEvent::BDB::WATCHER->priority (1);
3798 3877
3799 unless ($DB_ENV) { 3878 unless ($DB_ENV) {
3800 $DB_ENV = BDB::db_env_create; 3879 $DB_ENV = BDB::db_env_create;
3801 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3880 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3802 | BDB::LOG_AUTOREMOVE, 1); 3881 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3882 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3803 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3883 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3804 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3884 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3805 3885
3806 cf::sync_job { 3886 cf::sync_job {
3807 eval { 3887 eval {
… …
3846 $msg =~ s/\n//; 3926 $msg =~ s/\n//;
3847 3927
3848 # limit the # of concurrent backtraces 3928 # limit the # of concurrent backtraces
3849 if ($_log_backtrace < 2) { 3929 if ($_log_backtrace < 2) {
3850 ++$_log_backtrace; 3930 ++$_log_backtrace;
3931 my $perl_bt = Carp::longmess $msg;
3851 async { 3932 async {
3852 $Coro::current->{desc} = "abt $msg"; 3933 $Coro::current->{desc} = "abt $msg";
3853 3934
3854 my @bt = fork_call { 3935 my @bt = fork_call {
3855 @addr = map { sprintf "%x", $_ } @addr; 3936 @addr = map { sprintf "%x", $_ } @addr;
… …
3866 } 3947 }
3867 3948
3868 @funcs 3949 @funcs
3869 }; 3950 };
3870 3951
3871 LOG llevInfo, "[ABT] $msg\n"; 3952 LOG llevInfo, "[ABT] $perl_bt\n";
3953 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3872 LOG llevInfo, "[ABT] $_\n" for @bt; 3954 LOG llevInfo, "[ABT] $_\n" for @bt;
3873 --$_log_backtrace; 3955 --$_log_backtrace;
3874 }; 3956 };
3875 } else { 3957 } else {
3876 LOG llevInfo, "[ABT] $msg\n"; 3958 LOG llevInfo, "[ABT] $msg\n";
3877 LOG llevInfo, "[ABT] [suppressed]\n"; 3959 LOG llevInfo, "[ABT] [suppressed]\n";
3878 } 3960 }
3879} 3961}
3880 3962
3881# load additional modules 3963# load additional modules
3882use cf::pod; 3964require "cf/$_.pm" for @EXTRA_MODULES;
3883 3965
3884END { cf::emergency_save } 3966END { cf::emergency_save }
3885 3967
38861 39681
3887 3969

Diff Legend

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