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.438 by elmex, Sun Jul 13 20:15:51 2008 UTC vs.
Revision 1.473 by root, Fri Jun 26 16:32:10 2009 UTC

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

Diff Legend

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