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.414 by root, Thu Apr 10 09:10:45 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 3.2; 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 4.50 (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
39use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
43use Coro::AIO; 48use Coro::AIO;
44use Coro::BDB; 49use Coro::BDB 1.6;
45use Coro::Storable; 50use Coro::Storable;
46use Coro::Util (); 51use Coro::Util ();
47 52
48use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
49use BDB (); 54use BDB ();
50use Data::Dumper; 55use Data::Dumper;
51use Digest::MD5; 56use Digest::MD5;
52use Fcntl; 57use Fcntl;
53use YAML (); 58use YAML ();
54use IO::AIO 2.51 (); 59use IO::AIO ();
55use Time::HiRes; 60use Time::HiRes;
56use Compress::LZF; 61use Compress::LZF;
57use Digest::MD5 (); 62use Digest::MD5 ();
63
64AnyEvent::detect;
58 65
59# configure various modules to our taste 66# configure various modules to our taste
60# 67#
61$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
62Coro::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";
63Compress::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
64
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
66 76
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 78
69our %COMMAND = (); 79our %COMMAND = ();
70our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
73our %EXTCMD = (); 83our %EXTCMD = ();
74our %EXTICMD = (); 84our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
77 87
78our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 89our @EVENT;
80 90
81our $CONFDIR = confdir; 91our $CONFDIR = confdir;
82our $DATADIR = datadir; 92our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 94our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 95our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 96our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 97our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 99our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 100our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 101our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime";
104
92our %RESOURCE; 105our %RESOURCE;
93 106
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 109our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 110our $USE_FSYNC = 1; # use fsync to write maps - default on
99 111
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 112our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 113our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 114our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 115our $DB_ENV;
105 116
117our @EXTRA_MODULES = qw(pod mapscript);
118
106our %CFG; 119our %CFG;
107 120
108our $UPTIME; $UPTIME ||= time; 121our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 122our $RUNTIME;
110our $NOW; 123our $NOW;
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 132our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 133our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 134our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 135our $TICK_START; # for load detecting purposes
123 136
137our @POST_INIT;
138
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
140
124binmode STDOUT; 141binmode STDOUT;
125binmode STDERR; 142binmode STDERR;
126 143
127# read virtual server time, if available 144# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 145unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 146 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 147 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 148 $RUNTIME = <$fh> + 0.;
132} 149}
150
151eval "sub TICK() { $TICK } 1" or die;
133 152
134mkdir $_ 153mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 154 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 155
137our $EMERGENCY_POSITION; 156our $EMERGENCY_POSITION;
242for my $pkg (qw( 261for my $pkg (qw(
243 cf::global cf::attachable 262 cf::global cf::attachable
244 cf::object cf::object::player 263 cf::object cf::object::player
245 cf::client cf::player 264 cf::client cf::player
246 cf::arch cf::living 265 cf::arch cf::living
266 cf::map cf::mapspace
247 cf::map cf::party cf::region 267 cf::party cf::region
248)) { 268)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 270}
252 271
253$EV::DIED = sub { 272$EV::DIED = sub {
254 warn "error in event callback: @_"; 273 warn "error in event callback: @_";
296our $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
297 316
298sub encode_json($) { $json_coder->encode ($_[0]) } 317sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 318sub decode_json($) { $json_coder->decode ($_[0]) }
300 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
301=item cf::lock_wait $string 334=item cf::lock_wait $string
302 335
303Wait until the given lock is available. See cf::lock_acquire. 336Wait until the given lock is available. See cf::lock_acquire.
304 337
305=item my $lock = cf::lock_acquire $string 338=item my $lock = cf::lock_acquire $string
306 339
307Wait 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
308a 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,
309for example when the coroutine gets canceled), the lock is automatically 342for example when the coroutine gets canceled), the lock is automatically
310returned. 343returned.
311 344
312Locks 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
313deadlocked coro. 346deadlocked coro.
319 352
320Return 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.
321 354
322=cut 355=cut
323 356
324our %LOCK; 357our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 358
327sub lock_wait($) { 359sub lock_wait($) {
328 my ($key) = @_; 360 $LOCKS->wait ($_[0]);
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
334
335 # wait for lock, if any
336 while ($LOCK{$key}) {
337 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule;
339 }
340} 361}
341 362
342sub lock_acquire($) { 363sub lock_acquire($) {
343 my ($key) = @_; 364 $LOCKS->guard ($_[0])
344
345 # wait, to be sure we are not locked
346 lock_wait $key;
347
348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
350
351 Coro::guard {
352 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} };
355 }
356} 365}
357 366
358sub lock_active($) { 367sub lock_active($) {
359 my ($key) = @_; 368 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 369}
363 370
364sub freeze_mainloop { 371sub freeze_mainloop {
365 tick_inhibit_inc; 372 tick_inhibit_inc;
366 373
367 Coro::guard \&tick_inhibit_dec; 374 &Guard::guard (\&tick_inhibit_dec);
368} 375}
369 376
370=item cf::periodic $interval, $cb 377=item cf::periodic $interval, $cb
371 378
372Like 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
427 } 434 }
428 } 435 }
429}; 436};
430 437
431sub get_slot($;$$) { 438sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main;
440
432 my ($time, $pri, $name) = @_; 441 my ($time, $pri, $name) = @_;
433 442
434 $time = $TICK * .6 if $time > $TICK * .6; 443 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal; 444 my $sig = new Coro::Signal;
436 445
547 reset_signals; 556 reset_signals;
548 &$cb 557 &$cb
549 }, @args; 558 }, @args;
550 559
551 wantarray ? @res : $res[-1] 560 wantarray ? @res : $res[-1]
561}
562
563=item $coin = coin_from_name $name
564
565=cut
566
567our %coin_alias = (
568 "silver" => "silvercoin",
569 "silvercoin" => "silvercoin",
570 "silvercoins" => "silvercoin",
571 "gold" => "goldcoin",
572 "goldcoin" => "goldcoin",
573 "goldcoins" => "goldcoin",
574 "platinum" => "platinacoin",
575 "platinumcoin" => "platinacoin",
576 "platinumcoins" => "platinacoin",
577 "platina" => "platinacoin",
578 "platinacoin" => "platinacoin",
579 "platinacoins" => "platinacoin",
580 "royalty" => "royalty",
581 "royalties" => "royalty",
582);
583
584sub coin_from_name($) {
585 $coin_alias{$_[0]}
586 ? cf::arch::find $coin_alias{$_[0]}
587 : undef
552} 588}
553 589
554=item $value = cf::db_get $family => $key 590=item $value = cf::db_get $family => $key
555 591
556Returns a single value from the environment database. 592Returns a single value from the environment database.
695 731
696############################################################################# 732#############################################################################
697 733
698=head2 ATTACHABLE OBJECTS 734=head2 ATTACHABLE OBJECTS
699 735
700Many 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
701attach callbacks/event handlers (a collection of which is called an "attachment") 737attach callbacks/event handlers (a collection of which is called an "attachment")
702to it. All such attachable objects support the following methods. 738to it. All such attachable objects support the following methods.
703 739
704In 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>
705C<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
755=item cf::CLASS::attachment $name, ... 791=item cf::CLASS::attachment $name, ...
756 792
757Register an attachment by C<$name> through which attachable objects of the 793Register an attachment by C<$name> through which attachable objects of the
758given CLASS can refer to this attachment. 794given CLASS can refer to this attachment.
759 795
760Some classes such as crossfire maps and objects can specify attachments 796Some classes such as deliantra maps and objects can specify attachments
761that 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.
762 798
763These calls expect any number of the following handler/hook descriptions: 799These calls expect any number of the following handler/hook descriptions:
764 800
765=over 4 801=over 4
1056 1092
1057sub reattach { 1093sub reattach {
1058 # basically do the same as instantiate, without calling instantiate 1094 # basically do the same as instantiate, without calling instantiate
1059 my ($obj) = @_; 1095 my ($obj) = @_;
1060 1096
1097 # no longer needed after getting rid of delete_package?
1061 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
1062 1099
1063 my $registry = $obj->registry; 1100 my $registry = $obj->registry;
1064 1101
1065 @$registry = (); 1102 @$registry = ();
1066 1103
1112 utf8::decode (my $decname = $filename); 1149 utf8::decode (my $decname = $filename);
1113 warn sprintf "saving %s (%d,%d)\n", 1150 warn sprintf "saving %s (%d,%d)\n",
1114 $decname, length $$rdata, scalar @$objs; 1151 $decname, length $$rdata, scalar @$objs;
1115 1152
1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1117 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1119 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 }
1120 close $fh; 1160 aio_close $fh;
1121 1161
1122 if (@$objs) { 1162 if (@$objs) {
1123 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) {
1124 chmod SAVE_MODE, $fh; 1164 aio_chmod $fh, SAVE_MODE;
1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1165 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1126 aio_write $fh, 0, (length $data), $data, 0; 1166 aio_write $fh, 0, (length $data), $data, 0;
1127 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 }
1128 close $fh; 1171 aio_close $fh;
1129 aio_rename "$filename.pst~", "$filename.pst"; 1172 aio_rename "$filename.pst~", "$filename.pst";
1130 } 1173 }
1131 } else { 1174 } else {
1132 aio_unlink "$filename.pst"; 1175 aio_unlink "$filename.pst";
1133 } 1176 }
1134 1177
1135 aio_rename "$filename~", $filename; 1178 aio_rename "$filename~", $filename;
1179
1180 $filename =~ s%/[^/]+$%%;
1181 aio_pathsync $filename if $cf::USE_FSYNC;
1136 } else { 1182 } else {
1137 warn "FATAL: $filename~: $!\n"; 1183 warn "unable to save objects: $filename~: $!\n";
1138 } 1184 }
1139 } else { 1185 } else {
1140 aio_unlink $filename; 1186 aio_unlink $filename;
1141 aio_unlink "$filename.pst"; 1187 aio_unlink "$filename.pst";
1142 } 1188 }
1233 my ($name, $cb) = @_; 1279 my ($name, $cb) = @_;
1234 1280
1235 $EXTICMD{$name} = $cb; 1281 $EXTICMD{$name} = $cb;
1236} 1282}
1237 1283
1284use File::Glob ();
1285
1238cf::player->attach ( 1286cf::player->attach (
1239 on_command => sub { 1287 on_command => sub {
1240 my ($pl, $name, $params) = @_; 1288 my ($pl, $name, $params) = @_;
1241 1289
1242 my $cb = $COMMAND{$name} 1290 my $cb = $COMMAND{$name}
1274 1322
1275 cf::override; 1323 cf::override;
1276 }, 1324 },
1277); 1325);
1278 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
1279sub load_extensions { 1340sub load_extensions {
1280 cf::sync_job { 1341 cf::sync_job {
1281 my %todo; 1342 my %todo;
1282 1343
1283 for my $path (<$LIBDIR/*.ext>) { 1344 for my $path (<$LIBDIR/*.ext>) {
1302 1363
1303 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1364 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1304 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1365 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1305 1366
1306 $ext{source} = 1367 $ext{source} =
1307 "package $pkg; use strict; use utf8;\n" 1368 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1308 . "#line 1 \"$path\"\n{\n" 1369 . "#line 1 \"$path\"\n{\n"
1309 . $source 1370 . $source
1310 . "\n};\n1"; 1371 . "\n};\n1";
1311 1372
1312 $todo{$base} = \%ext; 1373 $todo{$base} = \%ext;
1352 1413
1353=back 1414=back
1354 1415
1355=head2 CORE EXTENSIONS 1416=head2 CORE EXTENSIONS
1356 1417
1357Functions and methods that extend core crossfire objects. 1418Functions and methods that extend core deliantra objects.
1358 1419
1359=cut 1420=cut
1360 1421
1361package cf::player; 1422package cf::player;
1362 1423
1405 1466
1406sub exists($) { 1467sub exists($) {
1407 my ($login) = @_; 1468 my ($login) = @_;
1408 1469
1409 $cf::PLAYER{$login} 1470 $cf::PLAYER{$login}
1410 or cf::sync_job { !aio_stat path $login } 1471 or !aio_stat path $login
1411} 1472}
1412 1473
1413sub find($) { 1474sub find($) {
1414 return $cf::PLAYER{$_[0]} || do { 1475 return $cf::PLAYER{$_[0]} || do {
1415 my $login = $_[0]; 1476 my $login = $_[0];
1427 my $f = new_from_file cf::object::thawer path $login 1488 my $f = new_from_file cf::object::thawer path $login
1428 or return; 1489 or return;
1429 1490
1430 my $pl = cf::player::load_pl $f 1491 my $pl = cf::player::load_pl $f
1431 or return; 1492 or return;
1493
1432 local $cf::PLAYER_LOADING{$login} = $pl; 1494 local $cf::PLAYER_LOADING{$login} = $pl;
1433 $f->resolve_delayed_derefs; 1495 $f->resolve_delayed_derefs;
1434 $cf::PLAYER{$login} = $pl 1496 $cf::PLAYER{$login} = $pl
1435 } 1497 }
1436 } 1498 }
1446 1508
1447 return if $pl->{deny_save}; 1509 return if $pl->{deny_save};
1448 1510
1449 aio_mkdir playerdir $pl, 0770; 1511 aio_mkdir playerdir $pl, 0770;
1450 $pl->{last_save} = $cf::RUNTIME; 1512 $pl->{last_save} = $cf::RUNTIME;
1513
1514 cf::get_slot 0.01;
1451 1515
1452 $pl->save_pl ($path); 1516 $pl->save_pl ($path);
1453 cf::cede_to_tick; 1517 cf::cede_to_tick;
1454} 1518}
1455 1519
1487 my ($pl) = @_; 1551 my ($pl) = @_;
1488 1552
1489 my $name = $pl->ob->name; 1553 my $name = $pl->ob->name;
1490 1554
1491 $pl->{deny_save} = 1; 1555 $pl->{deny_save} = 1;
1492 $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
1493 1557
1494 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1558 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1495 $pl->deactivate; 1559 $pl->deactivate;
1560 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1561 $pl->ob->check_score;
1496 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1562 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1497 $pl->ns->destroy if $pl->ns; 1563 $pl->ns->destroy if $pl->ns;
1498 1564
1499 my $path = playerdir $pl; 1565 my $path = playerdir $pl;
1500 my $temp = "$path~$cf::RUNTIME~deleting~"; 1566 my $temp = "$path~$cf::RUNTIME~deleting~";
1539 1605
1540 for my $login (@$dirs) { 1606 for my $login (@$dirs) {
1541 my $path = path $login; 1607 my $path = path $login;
1542 1608
1543 # a .pst is a dead give-away for a valid player 1609 # a .pst is a dead give-away for a valid player
1544 unless (-e "$path.pst") { 1610 # if no pst file found, open and chekc for blocked users
1611 if (aio_stat "$path.pst") {
1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1612 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1546 aio_read $fh, 0, 512, my $buf, 0 or next; 1613 aio_read $fh, 0, 512, my $buf, 0 or next;
1547 $buf !~ /^password -------------$/m or next; # official not-valid tag 1614 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 } 1615 }
1549 1616
1580 } 1647 }
1581 1648
1582 \@paths 1649 \@paths
1583} 1650}
1584 1651
1585=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1652=item $protocol_xml = $player->expand_cfpod ($cfpod)
1586 1653
1587Expand crossfire pod fragments into protocol xml. 1654Expand deliantra pod fragments into protocol xml.
1588
1589=cut
1590
1591use re 'eval';
1592
1593my $group;
1594my $interior; $interior = qr{
1595 # match a pod interior sequence sans C<< >>
1596 (?:
1597 \ (.*?)\ (?{ $group = $^N })
1598 | < (??{$interior}) >
1599 )
1600}x;
1601
1602sub expand_cfpod {
1603 my ($self, $pod) = @_;
1604
1605 my $xml;
1606
1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1610
1611 $group =~ s/&/&amp;/g;
1612 $group =~ s/</&lt;/g;
1613
1614 $xml .= $group;
1615 } elsif ($pod =~ m%\G
1616 ([BCGHITU])
1617 <
1618 (?:
1619 ([^<>]*) (?{ $group = $^N })
1620 | < $interior >
1621 )
1622 >
1623 %gcsx
1624 ) {
1625 my ($code, $data) = ($1, $group);
1626
1627 if ($code eq "B") {
1628 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1629 } elsif ($code eq "I") {
1630 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1631 } elsif ($code eq "U") {
1632 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1633 } elsif ($code eq "C") {
1634 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1635 } elsif ($code eq "T") {
1636 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1637 } elsif ($code eq "G") {
1638 my ($male, $female) = split /\|/, $data;
1639 $data = $self->gender ? $female : $male;
1640 $xml .= expand_cfpod ($self, $data);
1641 } elsif ($code eq "H") {
1642 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1644 "")
1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
1653 last;
1654 }
1655 }
1656
1657 for ($xml) {
1658 # create single paragraphs (very hackish)
1659 s/(?<=\S)\n(?=\w)/ /g;
1660
1661 # compress some whitespace
1662 s/\s+\n/\n/g; # ws line-ends
1663 s/\n\n+/\n/g; # double lines
1664 s/^\n+//; # beginning lines
1665 s/\n+$//; # ending lines
1666 }
1667
1668 $xml
1669}
1670
1671no re 'eval';
1672
1673sub hintmode {
1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1675 $_[0]{hintmode}
1676}
1677 1655
1678=item $player->ext_reply ($msgid, @msg) 1656=item $player->ext_reply ($msgid, @msg)
1679 1657
1680Sends an ext reply to the player. 1658Sends an ext reply to the player.
1681 1659
1748our $MAX_RESET = 3600; 1726our $MAX_RESET = 3600;
1749our $DEFAULT_RESET = 3000; 1727our $DEFAULT_RESET = 3000;
1750 1728
1751sub generate_random_map { 1729sub generate_random_map {
1752 my ($self, $rmp) = @_; 1730 my ($self, $rmp) = @_;
1731
1732 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1733
1753 # mit "rum" bekleckern, nicht 1734 # mit "rum" bekleckern, nicht
1754 $self->_create_random_map ( 1735 $self->_create_random_map (
1755 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1736 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1756 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1737 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1757 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1738 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1879 1860
1880# the temporary/swap location 1861# the temporary/swap location
1881sub save_path { 1862sub save_path {
1882 my ($self) = @_; 1863 my ($self) = @_;
1883 1864
1884 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1865 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1885 "$TMPDIR/$path.map" 1866 "$TMPDIR/$path.map"
1886} 1867}
1887 1868
1888# the unique path, undef == no special unique path 1869# the unique path, undef == no special unique path
1889sub uniq_path { 1870sub uniq_path {
1890 my ($self) = @_; 1871 my ($self) = @_;
1891 1872
1892 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1873 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1893 "$UNIQUEDIR/$path" 1874 "$UNIQUEDIR/$path"
1894}
1895
1896# and all this just because we cannot iterate over
1897# all maps in C++...
1898sub change_all_map_light {
1899 my ($change) = @_;
1900
1901 $_->change_map_light ($change)
1902 for grep $_->outdoor, values %cf::MAP;
1903} 1875}
1904 1876
1905sub decay_objects { 1877sub decay_objects {
1906 my ($self) = @_; 1878 my ($self) = @_;
1907 1879
1991sub find { 1963sub find {
1992 my ($path, $origin) = @_; 1964 my ($path, $origin) = @_;
1993 1965
1994 $path = normalise $path, $origin && $origin->path; 1966 $path = normalise $path, $origin && $origin->path;
1995 1967
1996 cf::lock_wait "map_data:$path";#d#remove 1968 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1997 cf::lock_wait "map_find:$path"; 1969 my $guard2 = cf::lock_acquire "map_find:$path";
1998 1970
1999 $cf::MAP{$path} || do { 1971 $cf::MAP{$path} || do {
2000 my $guard1 = cf::lock_acquire "map_find:$path";
2001 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2002
2003 my $map = new_from_path cf::map $path 1972 my $map = new_from_path cf::map $path
2004 or return; 1973 or return;
2005 1974
2006 $map->{last_save} = $cf::RUNTIME; 1975 $map->{last_save} = $cf::RUNTIME;
2007 1976
2009 or return; 1978 or return;
2010 1979
2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1980 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2012 # doing this can freeze the server in a sync job, obviously 1981 # doing this can freeze the server in a sync job, obviously
2013 #$cf::WAIT_FOR_TICK->wait; 1982 #$cf::WAIT_FOR_TICK->wait;
1983 undef $guard2;
2014 undef $guard1; 1984 undef $guard1;
2015 undef $guard2;
2016 $map->reset; 1985 $map->reset;
2017 return find $path; 1986 return find $path;
2018 } 1987 }
2019 1988
2020 $cf::MAP{$path} = $map 1989 $cf::MAP{$path} = $map
2047 my $f = new_from_file cf::object::thawer $self->{load_path}; 2016 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block; 2017 $f->skip_block;
2049 $self->_load_objects ($f) 2018 $self->_load_objects ($f)
2050 or return; 2019 or return;
2051 2020
2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2021 $self->post_load_original
2053 if delete $self->{load_original}; 2022 if delete $self->{load_original};
2054 2023
2055 if (my $uniq = $self->uniq_path) { 2024 if (my $uniq = $self->uniq_path) {
2056 utf8::encode $uniq; 2025 utf8::encode $uniq;
2057 unless (aio_stat $uniq) { 2026 unless (aio_stat $uniq) {
2075 unless ($self->{deny_activate}) { 2044 unless ($self->{deny_activate}) {
2076 $self->decay_objects; 2045 $self->decay_objects;
2077 $self->fix_auto_apply; 2046 $self->fix_auto_apply;
2078 $self->update_buttons; 2047 $self->update_buttons;
2079 cf::cede_to_tick; 2048 cf::cede_to_tick;
2080 $self->set_darkness_map;
2081 cf::cede_to_tick;
2082 $self->activate; 2049 $self->activate;
2083 } 2050 }
2084 2051
2085 $self->{last_save} = $cf::RUNTIME; 2052 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME); 2053 $self->last_access ($cf::RUNTIME);
2087 2054
2088 $self->in_memory (cf::MAP_IN_MEMORY); 2055 $self->in_memory (cf::MAP_ACTIVE);
2089 } 2056 }
2090 2057
2091 $self->post_load; 2058 $self->post_load;
2092} 2059}
2093 2060
2151 my ($path, $origin, $load) = @_; 2118 my ($path, $origin, $load) = @_;
2152 2119
2153 $path = normalise $path, $origin && $origin->{path}; 2120 $path = normalise $path, $origin && $origin->{path};
2154 2121
2155 if (my $map = $cf::MAP{$path}) { 2122 if (my $map = $cf::MAP{$path}) {
2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2123 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2157 } 2124 }
2158 2125
2159 $MAP_PREFETCH{$path} |= $load; 2126 $MAP_PREFETCH{$path} |= $load;
2160 2127
2161 $MAP_PREFETCHER ||= cf::async { 2128 $MAP_PREFETCHER ||= cf::async {
2198 cf::async { 2165 cf::async {
2199 $Coro::current->{desc} = "map player save"; 2166 $Coro::current->{desc} = "map player save";
2200 $_->contr->save for $self->players; 2167 $_->contr->save for $self->players;
2201 }; 2168 };
2202 2169
2170 cf::get_slot 0.02;
2171
2203 if ($uniq) { 2172 if ($uniq) {
2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2173 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2205 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2174 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2206 } else { 2175 } else {
2207 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2176 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2215 $self->save; 2184 $self->save;
2216 2185
2217 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2186 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2187
2219 return if $self->players; 2188 return if $self->players;
2220 return if $self->in_memory != cf::MAP_IN_MEMORY; 2189 return if $self->in_memory != cf::MAP_ACTIVE;
2221 return if $self->{deny_save}; 2190 return if $self->{deny_save};
2222 2191
2223 $self->in_memory (cf::MAP_SWAPPED); 2192 $self->in_memory (cf::MAP_SWAPPED);
2224 2193
2225 $self->deactivate; 2194 $self->deactivate;
2343 2312
2344sub unique_maps() { 2313sub unique_maps() {
2345 [ 2314 [
2346 map { 2315 map {
2347 utf8::decode $_; 2316 utf8::decode $_;
2348 /\.map$/ 2317 s/\.map$//; # TODO future compatibility hack
2318 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2319 ? ()
2349 ? normalise $_ 2320 : normalise $_
2350 : ()
2351 } @{ aio_readdir $UNIQUEDIR or [] } 2321 } @{ aio_readdir $UNIQUEDIR or [] }
2352 ] 2322 ]
2353} 2323}
2354 2324
2355package cf;
2356
2357=back 2325=back
2358 2326
2359=head3 cf::object 2327=head3 cf::object
2360 2328
2361=cut 2329=cut
2364 2332
2365=over 4 2333=over 4
2366 2334
2367=item $ob->inv_recursive 2335=item $ob->inv_recursive
2368 2336
2369Returns the inventory of the object _and_ their inventories, recursively. 2337Returns the inventory of the object I<and> their inventories, recursively,
2338but I<not> the object itself.
2370 2339
2371=cut 2340=cut
2372 2341
2373sub inv_recursive_; 2342sub inv_recursive_;
2374sub inv_recursive_ { 2343sub inv_recursive_ {
2379 inv_recursive_ inv $_[0] 2348 inv_recursive_ inv $_[0]
2380} 2349}
2381 2350
2382=item $ref = $ob->ref 2351=item $ref = $ob->ref
2383 2352
2384creates and returns a persistent reference to an objetc that can be stored as a string. 2353Creates and returns a persistent reference to an object that can be stored as a string.
2385 2354
2386=item $ob = cf::object::deref ($refstring) 2355=item $ob = cf::object::deref ($refstring)
2387 2356
2388returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2357returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2389even if the object actually exists. May block. 2358even if the object actually exists. May block.
2421can be C<undef>. Does the right thing when the player is currently in a 2390can be C<undef>. Does the right thing when the player is currently in a
2422dialogue with the given NPC character. 2391dialogue with the given NPC character.
2423 2392
2424=cut 2393=cut
2425 2394
2395our $SAY_CHANNEL = {
2396 id => "say",
2397 title => "Map",
2398 reply => "say ",
2399 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2400};
2401
2402our $CHAT_CHANNEL = {
2403 id => "chat",
2404 title => "Chat",
2405 reply => "chat ",
2406 tooltip => "Player chat and shouts, global to the server.",
2407};
2408
2426# rough implementation of a future "reply" method that works 2409# rough implementation of a future "reply" method that works
2427# with dialog boxes. 2410# with dialog boxes.
2428#TODO: the first argument must go, split into a $npc->reply_to ( method 2411#TODO: the first argument must go, split into a $npc->reply_to ( method
2429sub cf::object::player::reply($$$;$) { 2412sub cf::object::player::reply($$$;$) {
2430 my ($self, $npc, $msg, $flags) = @_; 2413 my ($self, $npc, $msg, $flags) = @_;
2441 my $dialog = $pl->{npc_dialog}; 2424 my $dialog = $pl->{npc_dialog};
2442 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2425 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2443 2426
2444 } else { 2427 } else {
2445 $msg = $npc->name . " says: $msg" if $npc; 2428 $msg = $npc->name . " says: $msg" if $npc;
2446 $self->message ($msg, $flags); 2429 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2447 } 2430 }
2448 } 2431 }
2449} 2432}
2450 2433
2451=item $object->send_msg ($channel, $msg, $color, [extra...]) 2434=item $object->send_msg ($channel, $msg, $color, [extra...])
2476 2459
2477=item $player_object->enter_link 2460=item $player_object->enter_link
2478 2461
2479Freezes 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}>).
2480 2463
2481The 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.
2482I<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.
2483 2468
2484Will never block. 2469Will never block.
2485 2470
2486=item $player_object->leave_link ($map, $x, $y) 2471=item $player_object->leave_link ($map, $x, $y)
2487 2472
2545 2530
2546 $map->load; 2531 $map->load;
2547 $map->load_neighbours; 2532 $map->load_neighbours;
2548 2533
2549 return unless $self->contr->active; 2534 return unless $self->contr->active;
2535 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2550 $self->activate_recursive; 2536 $self->activate_recursive;
2551 2537
2552 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2538 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2553 $self->enter_map ($map, $x, $y); 2539 $self->enter_map ($map, $x, $y);
2554} 2540}
2558Moves the player to the given map-path and coordinates by first freezing 2544Moves the player to the given map-path and coordinates by first freezing
2559her, loading and preparing them map, calling the provided $check callback 2545her, loading and preparing them map, calling the provided $check callback
2560that has to return the map if sucecssful, and then unfreezes the player on 2546that has to return the map if sucecssful, and then unfreezes the player on
2561the new (success) or old (failed) map position. In either case, $done will 2547the new (success) or old (failed) map position. In either case, $done will
2562be called at the end of this process. 2548be called at the end of this process.
2549
2550Note that $check will be called with a potentially non-loaded map, so if
2551it needs a loaded map it has to call C<< ->load >>.
2563 2552
2564=cut 2553=cut
2565 2554
2566our $GOTOGEN; 2555our $GOTOGEN;
2567 2556
2646} 2635}
2647 2636
2648sub prepare_random_map { 2637sub prepare_random_map {
2649 my ($exit) = @_; 2638 my ($exit) = @_;
2650 2639
2651 my $guard = cf::lock_acquire "exit_prepare:$exit";
2652
2653 # all this does is basically replace the /! path by 2640 # all this does is basically replace the /! path by
2654 # a new random map path (?random/...) with a seed 2641 # a new random map path (?random/...) with a seed
2655 # that depends on the exit object 2642 # that depends on the exit object
2656 2643
2657 my $rmp = parse_random_map_params $exit->msg; 2644 my $rmp = parse_random_map_params $exit->msg;
2659 if ($exit->map) { 2646 if ($exit->map) {
2660 $rmp->{region} = $exit->region->name; 2647 $rmp->{region} = $exit->region->name;
2661 $rmp->{origin_map} = $exit->map->path; 2648 $rmp->{origin_map} = $exit->map->path;
2662 $rmp->{origin_x} = $exit->x; 2649 $rmp->{origin_x} = $exit->x;
2663 $rmp->{origin_y} = $exit->y; 2650 $rmp->{origin_y} = $exit->y;
2651
2652 $exit->map->touch;
2664 } 2653 }
2665 2654
2666 $rmp->{random_seed} ||= $exit->random_seed; 2655 $rmp->{random_seed} ||= $exit->random_seed;
2667 2656
2668 my $data = cf::encode_json $rmp; 2657 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2669 my $md5 = Digest::MD5::md5_hex $data; 2658 my $md5 = Digest::MD5::md5_hex $data;
2670 my $meta = "$RANDOMDIR/$md5.meta"; 2659 my $meta = "$RANDOMDIR/$md5.meta";
2671 2660
2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2661 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2673 aio_write $fh, 0, (length $data), $data, 0; 2662 aio_write $fh, 0, (length $data), $data, 0;
2674 undef $fh; 2663 undef $fh;
2675 aio_rename "$meta~", $meta; 2664 aio_rename "$meta~", $meta;
2676 2665
2666 my $slaying = "?random/$md5";
2667
2668 if ($exit->valid) {
2677 $exit->slaying ("?random/$md5"); 2669 $exit->slaying ("?random/$md5");
2678 $exit->msg (undef); 2670 $exit->msg (undef);
2671 }
2679 } 2672 }
2680} 2673}
2681 2674
2682sub cf::object::player::enter_exit { 2675sub cf::object::player::enter_exit {
2683 my ($self, $exit) = @_; 2676 my ($self, $exit) = @_;
2684 2677
2685 return unless $self->type == cf::PLAYER; 2678 return unless $self->type == cf::PLAYER;
2686 2679
2687 if ($exit->slaying eq "/!") {
2688 #TODO: this should de-fi-ni-te-ly not be a sync-job
2689 # the problem is that $exit might not survive long enough
2690 # so it needs to be done right now, right here
2691 cf::sync_job { prepare_random_map $exit };
2692 }
2693
2694 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2695 my $hp = $exit->stats->hp;
2696 my $sp = $exit->stats->sp;
2697
2698 $self->enter_link; 2680 $self->enter_link;
2699 2681
2700 # if exit is damned, update players death & WoR home-position
2701 $self->contr->savebed ($slaying, $hp, $sp)
2702 if $exit->flag (FLAG_DAMNED);
2703
2704 (async { 2682 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2683 $Coro::current->{desc} = "enter_exit";
2706 2684
2707 $self->deactivate_recursive; # just to be sure
2708 unless (eval { 2685 unless (eval {
2686 $self->deactivate_recursive; # just to be sure
2687
2688 # random map handling
2689 {
2690 my $guard = cf::lock_acquire "exit_prepare:$exit";
2691
2692 prepare_random_map $exit
2693 if $exit->slaying eq "/!";
2694 }
2695
2696 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2697 my $x = $exit->stats->hp;
2698 my $y = $exit->stats->sp;
2699
2709 $self->goto ($slaying, $hp, $sp); 2700 $self->goto ($map, $x, $y);
2710 2701
2702 # if exit is damned, update players death & WoR home-position
2703 $self->contr->savebed ($map, $x, $y)
2704 if $exit->flag (cf::FLAG_DAMNED);
2705
2711 1; 2706 1
2712 }) { 2707 }) {
2713 $self->message ("Something went wrong deep within the crossfire server. " 2708 $self->message ("Something went wrong deep within the deliantra server. "
2714 . "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. "
2715 . "Please report this to the dungeon master!", 2710 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 2711 cf::NDI_UNIQUE | cf::NDI_RED);
2717 2712
2718 warn "ERROR in enter_exit: $@"; 2713 warn "ERROR in enter_exit: $@";
2784 id => "infobox", 2779 id => "infobox",
2785 title => "Body Parts", 2780 title => "Body Parts",
2786 reply => undef, 2781 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available", 2782 tooltip => "Shows which body parts you posess and are available",
2788 }, 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 },
2789 "c/uptime" => { 2820 "c/uptime" => {
2790 id => "infobox", 2821 id => "infobox",
2791 title => "Uptime", 2822 title => "Uptime",
2792 reply => undef, 2823 reply => undef,
2793 tooltip => "How long the server has been running since last restart", 2824 tooltip => "How long the server has been running since last restart",
2796 id => "infobox", 2827 id => "infobox",
2797 title => "Map Info", 2828 title => "Map Info",
2798 reply => undef, 2829 reply => undef,
2799 tooltip => "Information related to the maps", 2830 tooltip => "Information related to the maps",
2800 }, 2831 },
2832 "c/party" => {
2833 id => "party",
2834 title => "Party",
2835 reply => "gsay ",
2836 tooltip => "Messages and chat related to your party",
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,
2801); 2846);
2802 2847
2803sub cf::client::send_msg { 2848sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 2849 my ($self, $channel, $msg, $color, @extra) = @_;
2805 2850
2806 $msg = $self->pl->expand_cfpod ($msg); 2851 $msg = $self->pl->expand_cfpod ($msg)
2852 unless $color & cf::NDI_VERBATIM;
2807 2853
2808 $color &= cf::NDI_CLIENT_MASK; # just in case... 2854 $color &= cf::NDI_CLIENT_MASK; # just in case...
2809 2855
2810 # check predefined channels, for the benefit of C 2856 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 2857 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel}; 2858 $channel = $CHANNEL{$channel};
2813 2859
2814 $self->ext_msg (channel_info => $channel) 2860 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id}; 2861 $channel = $channel->{id};
2818 2862
2819 } elsif (ref $channel) { 2863 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent 2864 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) { 2865 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel; 2866 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel) 2867 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825 } 2868 }
2826 2869
2827 $channel = $channel->{id}; 2870 $channel = $channel->{id};
2828 } 2871 }
2829 2872
2830 return unless @extra || length $msg; 2873 return unless @extra || length $msg;
2831 2874
2832 if ($self->can_msg) {
2833 # default colour, mask it out 2875 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2876 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 2877 if $color & cf::NDI_DEF;
2836 2878
2837 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2879 my $pkt = "msg "
2880 . $self->{json_coder}->encode (
2838 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2881 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2839 } else { 2882 );
2840 if ($color >= 0) {
2841 # replace some tags by gcfclient-compatible ones
2842 for ($msg) {
2843 1 while
2844 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2845 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2846 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2847 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2848 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2849 }
2850 2883
2851 $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};
2852 2887
2853 utf8::encode $msg; 2888 # split very large packets
2854 2889 if (8192 < length $pkt and $self->{can_lzf}) {
2855 if (0 && $msg =~ /\[/) { 2890 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2856 # COMMAND/INFO 2891 $pkt = "frag";
2857 $self->send_packet ("drawextinfo $color 10 8 $msg")
2858 } else {
2859 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2860 $self->send_packet ("drawinfo $color $msg")
2861 }
2862 }
2863 } 2892 }
2893
2894 $self->send_packet ($pkt);
2864} 2895}
2865 2896
2866=item $client->ext_msg ($type, @msg) 2897=item $client->ext_msg ($type, @msg)
2867 2898
2868Sends an ext event to the client. 2899Sends an ext event to the client.
3042 3073
3043The following functions and methods are available within a safe environment: 3074The following functions and methods are available within a safe environment:
3044 3075
3045 cf::object 3076 cf::object
3046 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
3047 insert remove name archname title slaying race decrease_ob_nr 3078 insert remove name archname title slaying race decrease split
3079 value
3048 3080
3049 cf::object::player 3081 cf::object::player
3050 player 3082 player
3051 3083
3052 cf::player 3084 cf::player
3057 3089
3058=cut 3090=cut
3059 3091
3060for ( 3092for (
3061 ["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
3062 insert remove inv name archname title slaying race 3094 insert remove inv nrof name archname title slaying race
3063 decrease_ob_nr destroy)], 3095 decrease split destroy change_exp value msg lore send_msg)],
3064 ["cf::object::player" => qw(player)], 3096 ["cf::object::player" => qw(player)],
3065 ["cf::player" => qw(peaceful)], 3097 ["cf::player" => qw(peaceful send_msg)],
3066 ["cf::map" => qw(trigger)], 3098 ["cf::map" => qw(trigger)],
3067) { 3099) {
3068 no strict 'refs'; 3100 no strict 'refs';
3069 my ($pkg, @funs) = @$_; 3101 my ($pkg, @funs) = @$_;
3070 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3102 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3087 my ($code, %vars) = @_; 3119 my ($code, %vars) = @_;
3088 3120
3089 my $qcode = $code; 3121 my $qcode = $code;
3090 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3122 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3091 $qcode =~ s/\n/\\n/g; 3123 $qcode =~ s/\n/\\n/g;
3124
3125 %vars = (_dummy => 0) unless %vars;
3092 3126
3093 local $_; 3127 local $_;
3094 local @safe::cf::_safe_eval_args = values %vars; 3128 local @safe::cf::_safe_eval_args = values %vars;
3095 3129
3096 my $eval = 3130 my $eval =
3276 while (my ($k, $v) = each %$want) { 3310 while (my ($k, $v) = each %$want) {
3277 $ns->fx_want ($k, $v); 3311 $ns->fx_want ($k, $v);
3278 } 3312 }
3279}; 3313};
3280 3314
3315sub load_resource_file($) {
3316 my $guard = lock_acquire "load_resource_file";
3317
3318 my $status = load_resource_file_ $_[0];
3319 get_slot 0.1, 100;
3320 cf::arch::commit_load;
3321
3322 $status
3323}
3324
3281sub reload_regions { 3325sub reload_regions {
3282 # HACK to clear player env face cache, we need some signal framework 3326 # HACK to clear player env face cache, we need some signal framework
3283 # for this (global event?) 3327 # for this (global event?)
3284 %ext::player_env::MUSIC_FACE_CACHE = (); 3328 %ext::player_env::MUSIC_FACE_CACHE = ();
3285 3329
3298} 3342}
3299 3343
3300sub reload_archetypes { 3344sub reload_archetypes {
3301 load_resource_file "$DATADIR/archetypes" 3345 load_resource_file "$DATADIR/archetypes"
3302 or die "unable to load archetypes\n"; 3346 or die "unable to load archetypes\n";
3303 #d# NEED to laod twice to resolve forward references
3304 # this really needs to be done in an extra post-pass
3305 # (which needs to be synchronous, so solve it differently)
3306 load_resource_file "$DATADIR/archetypes"
3307 or die "unable to load archetypes\n";
3308} 3347}
3309 3348
3310sub reload_treasures { 3349sub reload_treasures {
3311 load_resource_file "$DATADIR/treasures" 3350 load_resource_file "$DATADIR/treasures"
3312 or die "unable to load treasurelists\n"; 3351 or die "unable to load treasurelists\n";
3313} 3352}
3314 3353
3315sub reload_resources { 3354sub reload_resources {
3316 warn "reloading resource files...\n"; 3355 warn "reloading resource files...\n";
3317 3356
3357 reload_facedata;
3358 reload_archetypes;
3318 reload_regions; 3359 reload_regions;
3319 reload_facedata;
3320 #reload_archetypes;#d#
3321 reload_archetypes;
3322 reload_treasures; 3360 reload_treasures;
3323 3361
3324 warn "finished reloading resource files\n"; 3362 warn "finished reloading resource files\n";
3325}
3326
3327sub init {
3328 reload_resources;
3329} 3363}
3330 3364
3331sub reload_config { 3365sub reload_config {
3332 open my $fh, "<:utf8", "$CONFDIR/config" 3366 open my $fh, "<:utf8", "$CONFDIR/config"
3333 or return; 3367 or return;
3347 }; 3381 };
3348 warn $@ if $@; 3382 warn $@ if $@;
3349 } 3383 }
3350} 3384}
3351 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
3352sub 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
3353 # we must not ever block the main coroutine 3420 # we must not ever block the main coroutine
3354 local $Coro::idle = sub { 3421 local $Coro::idle = sub {
3355 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#
3356 (async { 3423 (async {
3357 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3424 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT; 3425 EV::loop EV::LOOP_ONESHOT;
3359 })->prio (Coro::PRIO_MAX); 3426 })->prio (Coro::PRIO_MAX);
3360 }; 3427 };
3361 3428
3362 reload_config;
3363 db_init;
3364 load_extensions;
3365
3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3367 evthread_start IO::AIO::poll_fileno; 3429 evthread_start IO::AIO::poll_fileno;
3430
3431 cf::sync_job {
3432 reload_resources;
3433 reload_config;
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
3447 load_extensions;
3448
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;
3455 };
3456
3368 EV::loop; 3457 EV::loop;
3369} 3458}
3370 3459
3371############################################################################# 3460#############################################################################
3372# initialisation and cleanup 3461# initialisation and cleanup
3379 cf::cleanup "SIG$signal"; 3468 cf::cleanup "SIG$signal";
3380 }; 3469 };
3381 } 3470 }
3382} 3471}
3383 3472
3384sub write_runtime { 3473sub write_runtime_sync {
3385 my $runtime = "$LOCALDIR/runtime";
3386
3387 # first touch the runtime file to show we are still running: 3474 # first touch the runtime file to show we are still running:
3388 # the fsync below can take a very very long time. 3475 # the fsync below can take a very very long time.
3389 3476
3390 IO::AIO::aio_utime $runtime, undef, undef; 3477 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3391 3478
3392 my $guard = cf::lock_acquire "write_runtime"; 3479 my $guard = cf::lock_acquire "write_runtime";
3393 3480
3394 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3481 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3395 or return; 3482 or return;
3396 3483
3397 my $value = $cf::RUNTIME + 90 + 10; 3484 my $value = $cf::RUNTIME + 90 + 10;
3398 # 10 is the runtime save interval, for a monotonic clock 3485 # 10 is the runtime save interval, for a monotonic clock
3399 # 60 allows for the watchdog to kill the server. 3486 # 60 allows for the watchdog to kill the server.
3409 aio_utime $fh, undef, undef; 3496 aio_utime $fh, undef, undef;
3410 3497
3411 close $fh 3498 close $fh
3412 or return; 3499 or return;
3413 3500
3414 aio_rename "$runtime~", $runtime 3501 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3415 and return; 3502 and return;
3416 3503
3417 warn "runtime file written.\n"; 3504 warn "runtime file written.\n";
3418 3505
3419 1 3506 1
3507}
3508
3509our $uuid_lock;
3510our $uuid_skip;
3511
3512sub write_uuid_sync($) {
3513 $uuid_skip ||= $_[0];
3514
3515 return if $uuid_lock;
3516 local $uuid_lock = 1;
3517
3518 my $uuid = "$LOCALDIR/uuid";
3519
3520 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3521 or return;
3522
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;
3531 $uuid_skip = 0;
3532
3533 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3534 and return;
3535
3536 # always fsync - this file is important
3537 aio_fsync $fh
3538 and return;
3539
3540 close $fh
3541 or return;
3542
3543 aio_rename "$uuid~", $uuid
3544 and return;
3545
3546 warn "uuid file written ($value).\n";
3547
3548 1
3549
3550}
3551
3552sub write_uuid($$) {
3553 my ($skip, $sync) = @_;
3554
3555 $sync ? write_uuid_sync $skip
3556 : async { write_uuid_sync $skip };
3420} 3557}
3421 3558
3422sub emergency_save() { 3559sub emergency_save() {
3423 my $freeze_guard = cf::freeze_mainloop; 3560 my $freeze_guard = cf::freeze_mainloop;
3424 3561
3425 warn "enter emergency perl save\n"; 3562 warn "emergency_perl_save: enter\n";
3426 3563
3427 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
3428 # use a peculiar iteration method to avoid tripping on perl 3570 # use a peculiar iteration method to avoid tripping on perl
3429 # refcount bugs in for. also avoids problems with players 3571 # refcount bugs in for. also avoids problems with players
3430 # and maps saved/destroyed asynchronously. 3572 # and maps saved/destroyed asynchronously.
3431 warn "begin emergency player save\n"; 3573 warn "emergency_perl_save: begin player save\n";
3432 for my $login (keys %cf::PLAYER) { 3574 for my $login (keys %cf::PLAYER) {
3433 my $pl = $cf::PLAYER{$login} or next; 3575 my $pl = $cf::PLAYER{$login} or next;
3434 $pl->valid or next; 3576 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3577 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3436 $pl->save; 3578 $pl->save;
3437 } 3579 }
3438 warn "end emergency player save\n"; 3580 warn "emergency_perl_save: end player save\n";
3439 3581
3440 warn "begin emergency map save\n"; 3582 warn "emergency_perl_save: begin map save\n";
3441 for my $path (keys %cf::MAP) { 3583 for my $path (keys %cf::MAP) {
3442 my $map = $cf::MAP{$path} or next; 3584 my $map = $cf::MAP{$path} or next;
3443 $map->valid or next; 3585 $map->valid or next;
3444 $map->save; 3586 $map->save;
3445 } 3587 }
3446 warn "end emergency map save\n"; 3588 warn "emergency_perl_save: end map save\n";
3447 3589
3448 warn "begin emergency database checkpoint\n"; 3590 warn "emergency_perl_save: begin database checkpoint\n";
3449 BDB::db_env_txn_checkpoint $DB_ENV; 3591 BDB::db_env_txn_checkpoint $DB_ENV;
3450 warn "end emergency database checkpoint\n"; 3592 warn "emergency_perl_save: end database checkpoint\n";
3593
3594 warn "emergency_perl_save: begin write uuid\n";
3595 write_uuid_sync 1;
3596 warn "emergency_perl_save: end write uuid\n";
3451 }; 3597 };
3452 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
3453 warn "leave emergency perl save\n"; 3604 warn "emergency_perl_save: leave\n";
3454} 3605}
3455 3606
3456sub post_cleanup { 3607sub post_cleanup {
3457 my ($make_core) = @_; 3608 my ($make_core) = @_;
3458 3609
3459 warn Carp::longmess "post_cleanup backtrace" 3610 warn Carp::longmess "post_cleanup backtrace"
3460 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#
3461} 3641}
3462 3642
3463sub do_reload_perl() { 3643sub do_reload_perl() {
3464 # can/must only be called in main 3644 # can/must only be called in main
3465 if ($Coro::current != $Coro::main) { 3645 if ($Coro::current != $Coro::main) {
3466 warn "can only reload from main coroutine"; 3646 warn "can only reload from main coroutine";
3467 return; 3647 return;
3468 } 3648 }
3469 3649
3650 return if $RELOAD++;
3651
3652 my $t1 = EV::time;
3653
3654 while ($RELOAD) {
3470 warn "reloading..."; 3655 warn "reloading...";
3471 3656
3472 warn "entering sync_job"; 3657 warn "entering sync_job";
3473 3658
3474 cf::sync_job { 3659 cf::sync_job {
3475 cf::write_runtime; # external watchdog should not bark 3660 cf::write_runtime_sync; # external watchdog should not bark
3476 cf::emergency_save; 3661 cf::emergency_save;
3477 cf::write_runtime; # external watchdog should not bark 3662 cf::write_runtime_sync; # external watchdog should not bark
3478 3663
3479 warn "syncing database to disk"; 3664 warn "syncing database to disk";
3480 BDB::db_env_txn_checkpoint $DB_ENV; 3665 BDB::db_env_txn_checkpoint $DB_ENV;
3481 3666
3482 # 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
3483 3668
3484 warn "flushing outstanding aio requests"; 3669 warn "flushing outstanding aio requests";
3485 for (;;) {
3486 BDB::flush;
3487 IO::AIO::flush;
3488 Coro::cede_notself;
3489 last unless IO::AIO::nreqs || BDB::nreqs; 3670 while (IO::AIO::nreqs || BDB::nreqs) {
3490 warn "iterate..."; 3671 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3491 }
3492
3493 ++$RELOAD;
3494
3495 warn "cancelling all extension coros";
3496 $_->cancel for values %EXT_CORO;
3497 %EXT_CORO = ();
3498
3499 warn "removing commands";
3500 %COMMAND = ();
3501
3502 warn "removing ext/exti commands";
3503 %EXTCMD = ();
3504 %EXTICMD = ();
3505
3506 warn "unloading/nuking all extensions";
3507 for my $pkg (@EXTS) {
3508 warn "... unloading $pkg";
3509
3510 if (my $cb = $pkg->can ("unload")) {
3511 eval {
3512 $cb->($pkg);
3513 1
3514 } or warn "$pkg unloaded, but with errors: $@";
3515 } 3672 }
3516 3673
3517 warn "... nuking $pkg"; 3674 warn "cancelling all extension coros";
3518 Symbol::delete_package $pkg; 3675 $_->cancel for values %EXT_CORO;
3519 } 3676 %EXT_CORO = ();
3520 3677
3521 warn "unloading all perl modules loaded from $LIBDIR"; 3678 warn "removing commands";
3522 while (my ($k, $v) = each %INC) { 3679 %COMMAND = ();
3523 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3524 3680
3681 warn "removing ext/exti commands";
3682 %EXTCMD = ();
3683 %EXTICMD = ();
3684
3685 warn "unloading/nuking all extensions";
3686 for my $pkg (@EXTS) {
3525 warn "... unloading $k"; 3687 warn "... unloading $pkg";
3526 delete $INC{$k};
3527 3688
3528 $k =~ s/\.pm$//;
3529 $k =~ s/\//::/g;
3530
3531 if (my $cb = $k->can ("unload_module")) { 3689 if (my $cb = $pkg->can ("unload")) {
3690 eval {
3532 $cb->(); 3691 $cb->($pkg);
3692 1
3693 } or warn "$pkg unloaded, but with errors: $@";
3694 }
3695
3696 warn "... clearing $pkg";
3697 clear_package $pkg;
3533 } 3698 }
3534 3699
3535 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;
3536 } 3715 }
3537 3716
3538 warn "getting rid of safe::, as good as possible"; 3717 warn "getting rid of safe::, as good as possible";
3539 Symbol::delete_package "safe::$_" 3718 clear_package "safe::$_"
3540 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);
3541 3720
3542 warn "unloading cf.pm \"a bit\""; 3721 warn "unloading cf.pm \"a bit\"";
3543 delete $INC{"cf.pm"}; 3722 delete $INC{"cf.pm"};
3544 delete $INC{"cf/pod.pm"}; 3723 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3545 3724
3546 # don't, removes xs symbols, too, 3725 # don't, removes xs symbols, too,
3547 # and global variables created in xs 3726 # and global variables created in xs
3548 #Symbol::delete_package __PACKAGE__; 3727 #clear_package __PACKAGE__;
3549 3728
3550 warn "unload completed, starting to reload now"; 3729 warn "unload completed, starting to reload now";
3551 3730
3552 warn "reloading cf.pm"; 3731 warn "reloading cf.pm";
3553 require cf; 3732 require cf;
3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3733 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3555 3734
3556 warn "loading config and database again"; 3735 warn "loading config and database again";
3557 cf::reload_config; 3736 cf::reload_config;
3558 3737
3559 warn "loading extensions"; 3738 warn "loading extensions";
3560 cf::load_extensions; 3739 cf::load_extensions;
3561 3740
3741 if ($REATTACH_ON_RELOAD) {
3562 warn "reattaching attachments to objects/players"; 3742 warn "reattaching attachments to objects/players";
3563 _global_reattach; # objects, sockets 3743 _global_reattach; # objects, sockets
3564 warn "reattaching attachments to maps"; 3744 warn "reattaching attachments to maps";
3565 reattach $_ for values %MAP; 3745 reattach $_ for values %MAP;
3566 warn "reattaching attachments to players"; 3746 warn "reattaching attachments to players";
3567 reattach $_ for values %PLAYER; 3747 reattach $_ for values %PLAYER;
3748 }
3568 3749
3750 warn "running post_init jobs";
3751 (pop @POST_INIT)->(1) while @POST_INIT;
3752
3569 warn "leaving sync_job"; 3753 warn "leaving sync_job";
3570 3754
3571 1 3755 1
3572 } or do { 3756 } or do {
3573 warn $@; 3757 warn $@;
3574 cf::cleanup "error while reloading, exiting."; 3758 cf::cleanup "error while reloading, exiting.";
3575 }; 3759 };
3576 3760
3577 warn "reloaded"; 3761 warn "reloaded";
3762 --$RELOAD;
3763 }
3764
3765 $t1 = EV::time - $t1;
3766 warn "reload completed in ${t1}s\n";
3578}; 3767};
3579 3768
3580our $RELOAD_WATCHER; # used only during reload 3769our $RELOAD_WATCHER; # used only during reload
3581 3770
3582sub reload_perl() { 3771sub reload_perl() {
3583 # doing reload synchronously and two reloads happen back-to-back, 3772 # doing reload synchronously and two reloads happen back-to-back,
3584 # coro crashes during coro_state_free->destroy here. 3773 # coro crashes during coro_state_free->destroy here.
3585 3774
3775 $RELOAD_WATCHER ||= cf::async {
3776 Coro::AIO::aio_wait cache_extensions;
3777
3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3778 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3587 do_reload_perl; 3779 do_reload_perl;
3588 undef $RELOAD_WATCHER; 3780 undef $RELOAD_WATCHER;
3781 };
3589 }; 3782 };
3590} 3783}
3591 3784
3592register_command "reload" => sub { 3785register_command "reload" => sub {
3593 my ($who, $arg) = @_; 3786 my ($who, $arg) = @_;
3607 3800
3608our @WAIT_FOR_TICK; 3801our @WAIT_FOR_TICK;
3609our @WAIT_FOR_TICK_BEGIN; 3802our @WAIT_FOR_TICK_BEGIN;
3610 3803
3611sub wait_for_tick { 3804sub wait_for_tick {
3612 return if tick_inhibit;
3613 return if $Coro::current == $Coro::main; 3805 return if tick_inhibit || $Coro::current == $Coro::main;
3614 3806
3615 my $signal = new Coro::Signal; 3807 my $signal = new Coro::Signal;
3616 push @WAIT_FOR_TICK, $signal; 3808 push @WAIT_FOR_TICK, $signal;
3617 $signal->wait; 3809 $signal->wait;
3618} 3810}
3619 3811
3620sub wait_for_tick_begin { 3812sub wait_for_tick_begin {
3621 return if tick_inhibit;
3622 return if $Coro::current == $Coro::main; 3813 return if tick_inhibit || $Coro::current == $Coro::main;
3623 3814
3624 my $signal = new Coro::Signal; 3815 my $signal = new Coro::Signal;
3625 push @WAIT_FOR_TICK_BEGIN, $signal; 3816 push @WAIT_FOR_TICK_BEGIN, $signal;
3626 $signal->wait; 3817 $signal->wait;
3627} 3818}
3637 3828
3638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3829 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3830 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3640 Coro::async_pool { 3831 Coro::async_pool {
3641 $Coro::current->{desc} = "runtime saver"; 3832 $Coro::current->{desc} = "runtime saver";
3642 write_runtime 3833 write_runtime_sync
3643 or warn "ERROR: unable to write runtime file: $!"; 3834 or warn "ERROR: unable to write runtime file: $!";
3644 }; 3835 };
3645 } 3836 }
3646 3837
3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3838 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3666{ 3857{
3667 # configure BDB 3858 # configure BDB
3668 3859
3669 BDB::min_parallel 8; 3860 BDB::min_parallel 8;
3670 BDB::max_poll_reqs $TICK * 0.1; 3861 BDB::max_poll_reqs $TICK * 0.1;
3671 $Coro::BDB::WATCHER->priority (1); 3862 $AnyEvent::BDB::WATCHER->priority (1);
3672 3863
3673 unless ($DB_ENV) { 3864 unless ($DB_ENV) {
3674 $DB_ENV = BDB::db_env_create; 3865 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3866 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3676 | BDB::LOG_AUTOREMOVE, 1); 3867 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3868 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3677 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3869 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3678 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3870 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3679 3871
3680 cf::sync_job { 3872 cf::sync_job {
3681 eval { 3873 eval {
3707{ 3899{
3708 # configure IO::AIO 3900 # configure IO::AIO
3709 3901
3710 IO::AIO::min_parallel 8; 3902 IO::AIO::min_parallel 8;
3711 IO::AIO::max_poll_time $TICK * 0.1; 3903 IO::AIO::max_poll_time $TICK * 0.1;
3712 $Coro::AIO::WATCHER->priority (1); 3904 undef $AnyEvent::AIO::WATCHER;
3713} 3905}
3714 3906
3715my $_log_backtrace; 3907my $_log_backtrace;
3716 3908
3717sub _log_backtrace { 3909sub _log_backtrace {
3720 $msg =~ s/\n//; 3912 $msg =~ s/\n//;
3721 3913
3722 # limit the # of concurrent backtraces 3914 # limit the # of concurrent backtraces
3723 if ($_log_backtrace < 2) { 3915 if ($_log_backtrace < 2) {
3724 ++$_log_backtrace; 3916 ++$_log_backtrace;
3917 my $perl_bt = Carp::longmess $msg;
3725 async { 3918 async {
3726 $Coro::current->{desc} = "abt $msg"; 3919 $Coro::current->{desc} = "abt $msg";
3727 3920
3728 my @bt = fork_call { 3921 my @bt = fork_call {
3729 @addr = map { sprintf "%x", $_ } @addr; 3922 @addr = map { sprintf "%x", $_ } @addr;
3740 } 3933 }
3741 3934
3742 @funcs 3935 @funcs
3743 }; 3936 };
3744 3937
3745 LOG llevInfo, "[ABT] $msg\n"; 3938 LOG llevInfo, "[ABT] $perl_bt\n";
3939 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3746 LOG llevInfo, "[ABT] $_\n" for @bt; 3940 LOG llevInfo, "[ABT] $_\n" for @bt;
3747 --$_log_backtrace; 3941 --$_log_backtrace;
3748 }; 3942 };
3749 } else { 3943 } else {
3750 LOG llevInfo, "[ABT] $msg\n"; 3944 LOG llevInfo, "[ABT] $msg\n";
3751 LOG llevInfo, "[ABT] [suppressed]\n"; 3945 LOG llevInfo, "[ABT] [suppressed]\n";
3752 } 3946 }
3753} 3947}
3754 3948
3755# load additional modules 3949# load additional modules
3756use cf::pod; 3950require "cf/$_.pm" for @EXTRA_MODULES;
3757 3951
3758END { cf::emergency_save } 3952END { cf::emergency_save }
3759 3953
37601 39541
3761 3955

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines