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.470 by root, Sun Apr 26 19:42:45 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 aio_fsync $fh if $cf::USE_FSYNC;
1120 close $fh; 1157 aio_close $fh;
1121 1158
1122 if (@$objs) { 1159 if (@$objs) {
1123 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1160 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1124 chmod SAVE_MODE, $fh; 1161 aio_chmod $fh, SAVE_MODE;
1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1162 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1126 aio_write $fh, 0, (length $data), $data, 0; 1163 aio_write $fh, 0, (length $data), $data, 0;
1127 aio_fsync $fh if $cf::USE_FSYNC; 1164 aio_fsync $fh if $cf::USE_FSYNC;
1128 close $fh; 1165 aio_close $fh;
1129 aio_rename "$filename.pst~", "$filename.pst"; 1166 aio_rename "$filename.pst~", "$filename.pst";
1130 } 1167 }
1131 } else { 1168 } else {
1132 aio_unlink "$filename.pst"; 1169 aio_unlink "$filename.pst";
1133 } 1170 }
1134 1171
1135 aio_rename "$filename~", $filename; 1172 aio_rename "$filename~", $filename;
1173
1174 $filename =~ s%/[^/]+$%%;
1175 aio_pathsync $filename if $cf::USE_FSYNC;
1136 } else { 1176 } else {
1137 warn "FATAL: $filename~: $!\n"; 1177 warn "unable to save objects: $filename~: $!\n";
1138 } 1178 }
1139 } else { 1179 } else {
1140 aio_unlink $filename; 1180 aio_unlink $filename;
1141 aio_unlink "$filename.pst"; 1181 aio_unlink "$filename.pst";
1142 } 1182 }
1233 my ($name, $cb) = @_; 1273 my ($name, $cb) = @_;
1234 1274
1235 $EXTICMD{$name} = $cb; 1275 $EXTICMD{$name} = $cb;
1236} 1276}
1237 1277
1278use File::Glob ();
1279
1238cf::player->attach ( 1280cf::player->attach (
1239 on_command => sub { 1281 on_command => sub {
1240 my ($pl, $name, $params) = @_; 1282 my ($pl, $name, $params) = @_;
1241 1283
1242 my $cb = $COMMAND{$name} 1284 my $cb = $COMMAND{$name}
1274 1316
1275 cf::override; 1317 cf::override;
1276 }, 1318 },
1277); 1319);
1278 1320
1321# "readahead" all extensions
1322sub cache_extensions {
1323 my $grp = IO::AIO::aio_group;
1324
1325 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1326 for (grep /\.ext$/, @{$_[0]}) {
1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328 }
1329 };
1330
1331 $grp
1332}
1333
1279sub load_extensions { 1334sub load_extensions {
1280 cf::sync_job { 1335 cf::sync_job {
1281 my %todo; 1336 my %todo;
1282 1337
1283 for my $path (<$LIBDIR/*.ext>) { 1338 for my $path (<$LIBDIR/*.ext>) {
1302 1357
1303 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1358 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1304 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1359 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1305 1360
1306 $ext{source} = 1361 $ext{source} =
1307 "package $pkg; use strict; use utf8;\n" 1362 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1308 . "#line 1 \"$path\"\n{\n" 1363 . "#line 1 \"$path\"\n{\n"
1309 . $source 1364 . $source
1310 . "\n};\n1"; 1365 . "\n};\n1";
1311 1366
1312 $todo{$base} = \%ext; 1367 $todo{$base} = \%ext;
1352 1407
1353=back 1408=back
1354 1409
1355=head2 CORE EXTENSIONS 1410=head2 CORE EXTENSIONS
1356 1411
1357Functions and methods that extend core crossfire objects. 1412Functions and methods that extend core deliantra objects.
1358 1413
1359=cut 1414=cut
1360 1415
1361package cf::player; 1416package cf::player;
1362 1417
1405 1460
1406sub exists($) { 1461sub exists($) {
1407 my ($login) = @_; 1462 my ($login) = @_;
1408 1463
1409 $cf::PLAYER{$login} 1464 $cf::PLAYER{$login}
1410 or cf::sync_job { !aio_stat path $login } 1465 or !aio_stat path $login
1411} 1466}
1412 1467
1413sub find($) { 1468sub find($) {
1414 return $cf::PLAYER{$_[0]} || do { 1469 return $cf::PLAYER{$_[0]} || do {
1415 my $login = $_[0]; 1470 my $login = $_[0];
1427 my $f = new_from_file cf::object::thawer path $login 1482 my $f = new_from_file cf::object::thawer path $login
1428 or return; 1483 or return;
1429 1484
1430 my $pl = cf::player::load_pl $f 1485 my $pl = cf::player::load_pl $f
1431 or return; 1486 or return;
1487
1432 local $cf::PLAYER_LOADING{$login} = $pl; 1488 local $cf::PLAYER_LOADING{$login} = $pl;
1433 $f->resolve_delayed_derefs; 1489 $f->resolve_delayed_derefs;
1434 $cf::PLAYER{$login} = $pl 1490 $cf::PLAYER{$login} = $pl
1435 } 1491 }
1436 } 1492 }
1446 1502
1447 return if $pl->{deny_save}; 1503 return if $pl->{deny_save};
1448 1504
1449 aio_mkdir playerdir $pl, 0770; 1505 aio_mkdir playerdir $pl, 0770;
1450 $pl->{last_save} = $cf::RUNTIME; 1506 $pl->{last_save} = $cf::RUNTIME;
1507
1508 cf::get_slot 0.01;
1451 1509
1452 $pl->save_pl ($path); 1510 $pl->save_pl ($path);
1453 cf::cede_to_tick; 1511 cf::cede_to_tick;
1454} 1512}
1455 1513
1487 my ($pl) = @_; 1545 my ($pl) = @_;
1488 1546
1489 my $name = $pl->ob->name; 1547 my $name = $pl->ob->name;
1490 1548
1491 $pl->{deny_save} = 1; 1549 $pl->{deny_save} = 1;
1492 $pl->password ("*"); # this should lock out the player until we nuked the dir 1550 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1493 1551
1494 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1552 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1495 $pl->deactivate; 1553 $pl->deactivate;
1554 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1555 $pl->ob->check_score;
1496 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1556 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1497 $pl->ns->destroy if $pl->ns; 1557 $pl->ns->destroy if $pl->ns;
1498 1558
1499 my $path = playerdir $pl; 1559 my $path = playerdir $pl;
1500 my $temp = "$path~$cf::RUNTIME~deleting~"; 1560 my $temp = "$path~$cf::RUNTIME~deleting~";
1539 1599
1540 for my $login (@$dirs) { 1600 for my $login (@$dirs) {
1541 my $path = path $login; 1601 my $path = path $login;
1542 1602
1543 # a .pst is a dead give-away for a valid player 1603 # a .pst is a dead give-away for a valid player
1544 unless (-e "$path.pst") { 1604 # if no pst file found, open and chekc for blocked users
1605 if (aio_stat "$path.pst") {
1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1606 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1546 aio_read $fh, 0, 512, my $buf, 0 or next; 1607 aio_read $fh, 0, 512, my $buf, 0 or next;
1547 $buf !~ /^password -------------$/m or next; # official not-valid tag 1608 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 } 1609 }
1549 1610
1580 } 1641 }
1581 1642
1582 \@paths 1643 \@paths
1583} 1644}
1584 1645
1585=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1646=item $protocol_xml = $player->expand_cfpod ($cfpod)
1586 1647
1587Expand crossfire pod fragments into protocol xml. 1648Expand 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 1649
1678=item $player->ext_reply ($msgid, @msg) 1650=item $player->ext_reply ($msgid, @msg)
1679 1651
1680Sends an ext reply to the player. 1652Sends an ext reply to the player.
1681 1653
1748our $MAX_RESET = 3600; 1720our $MAX_RESET = 3600;
1749our $DEFAULT_RESET = 3000; 1721our $DEFAULT_RESET = 3000;
1750 1722
1751sub generate_random_map { 1723sub generate_random_map {
1752 my ($self, $rmp) = @_; 1724 my ($self, $rmp) = @_;
1725
1726 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1727
1753 # mit "rum" bekleckern, nicht 1728 # mit "rum" bekleckern, nicht
1754 $self->_create_random_map ( 1729 $self->_create_random_map (
1755 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1756 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1757 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1879 1854
1880# the temporary/swap location 1855# the temporary/swap location
1881sub save_path { 1856sub save_path {
1882 my ($self) = @_; 1857 my ($self) = @_;
1883 1858
1884 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1859 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1885 "$TMPDIR/$path.map" 1860 "$TMPDIR/$path.map"
1886} 1861}
1887 1862
1888# the unique path, undef == no special unique path 1863# the unique path, undef == no special unique path
1889sub uniq_path { 1864sub uniq_path {
1890 my ($self) = @_; 1865 my ($self) = @_;
1891 1866
1892 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1893 "$UNIQUEDIR/$path" 1868 "$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} 1869}
1904 1870
1905sub decay_objects { 1871sub decay_objects {
1906 my ($self) = @_; 1872 my ($self) = @_;
1907 1873
1991sub find { 1957sub find {
1992 my ($path, $origin) = @_; 1958 my ($path, $origin) = @_;
1993 1959
1994 $path = normalise $path, $origin && $origin->path; 1960 $path = normalise $path, $origin && $origin->path;
1995 1961
1996 cf::lock_wait "map_data:$path";#d#remove 1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1997 cf::lock_wait "map_find:$path"; 1963 my $guard2 = cf::lock_acquire "map_find:$path";
1998 1964
1999 $cf::MAP{$path} || do { 1965 $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 1966 my $map = new_from_path cf::map $path
2004 or return; 1967 or return;
2005 1968
2006 $map->{last_save} = $cf::RUNTIME; 1969 $map->{last_save} = $cf::RUNTIME;
2007 1970
2009 or return; 1972 or return;
2010 1973
2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1974 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2012 # doing this can freeze the server in a sync job, obviously 1975 # doing this can freeze the server in a sync job, obviously
2013 #$cf::WAIT_FOR_TICK->wait; 1976 #$cf::WAIT_FOR_TICK->wait;
1977 undef $guard2;
2014 undef $guard1; 1978 undef $guard1;
2015 undef $guard2;
2016 $map->reset; 1979 $map->reset;
2017 return find $path; 1980 return find $path;
2018 } 1981 }
2019 1982
2020 $cf::MAP{$path} = $map 1983 $cf::MAP{$path} = $map
2047 my $f = new_from_file cf::object::thawer $self->{load_path}; 2010 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block; 2011 $f->skip_block;
2049 $self->_load_objects ($f) 2012 $self->_load_objects ($f)
2050 or return; 2013 or return;
2051 2014
2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2015 $self->post_load_original
2053 if delete $self->{load_original}; 2016 if delete $self->{load_original};
2054 2017
2055 if (my $uniq = $self->uniq_path) { 2018 if (my $uniq = $self->uniq_path) {
2056 utf8::encode $uniq; 2019 utf8::encode $uniq;
2057 unless (aio_stat $uniq) { 2020 unless (aio_stat $uniq) {
2075 unless ($self->{deny_activate}) { 2038 unless ($self->{deny_activate}) {
2076 $self->decay_objects; 2039 $self->decay_objects;
2077 $self->fix_auto_apply; 2040 $self->fix_auto_apply;
2078 $self->update_buttons; 2041 $self->update_buttons;
2079 cf::cede_to_tick; 2042 cf::cede_to_tick;
2080 $self->set_darkness_map;
2081 cf::cede_to_tick;
2082 $self->activate; 2043 $self->activate;
2083 } 2044 }
2084 2045
2085 $self->{last_save} = $cf::RUNTIME; 2046 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME); 2047 $self->last_access ($cf::RUNTIME);
2087 2048
2088 $self->in_memory (cf::MAP_IN_MEMORY); 2049 $self->in_memory (cf::MAP_ACTIVE);
2089 } 2050 }
2090 2051
2091 $self->post_load; 2052 $self->post_load;
2092} 2053}
2093 2054
2151 my ($path, $origin, $load) = @_; 2112 my ($path, $origin, $load) = @_;
2152 2113
2153 $path = normalise $path, $origin && $origin->{path}; 2114 $path = normalise $path, $origin && $origin->{path};
2154 2115
2155 if (my $map = $cf::MAP{$path}) { 2116 if (my $map = $cf::MAP{$path}) {
2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2117 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2157 } 2118 }
2158 2119
2159 $MAP_PREFETCH{$path} |= $load; 2120 $MAP_PREFETCH{$path} |= $load;
2160 2121
2161 $MAP_PREFETCHER ||= cf::async { 2122 $MAP_PREFETCHER ||= cf::async {
2198 cf::async { 2159 cf::async {
2199 $Coro::current->{desc} = "map player save"; 2160 $Coro::current->{desc} = "map player save";
2200 $_->contr->save for $self->players; 2161 $_->contr->save for $self->players;
2201 }; 2162 };
2202 2163
2164 cf::get_slot 0.02;
2165
2203 if ($uniq) { 2166 if ($uniq) {
2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2167 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2205 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2168 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2206 } else { 2169 } else {
2207 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2170 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2215 $self->save; 2178 $self->save;
2216 2179
2217 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2180 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2181
2219 return if $self->players; 2182 return if $self->players;
2220 return if $self->in_memory != cf::MAP_IN_MEMORY; 2183 return if $self->in_memory != cf::MAP_ACTIVE;
2221 return if $self->{deny_save}; 2184 return if $self->{deny_save};
2222 2185
2223 $self->in_memory (cf::MAP_SWAPPED); 2186 $self->in_memory (cf::MAP_SWAPPED);
2224 2187
2225 $self->deactivate; 2188 $self->deactivate;
2343 2306
2344sub unique_maps() { 2307sub unique_maps() {
2345 [ 2308 [
2346 map { 2309 map {
2347 utf8::decode $_; 2310 utf8::decode $_;
2348 /\.map$/ 2311 s/\.map$//; # TODO future compatibility hack
2312 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2313 ? ()
2349 ? normalise $_ 2314 : normalise $_
2350 : ()
2351 } @{ aio_readdir $UNIQUEDIR or [] } 2315 } @{ aio_readdir $UNIQUEDIR or [] }
2352 ] 2316 ]
2353} 2317}
2354 2318
2355package cf;
2356
2357=back 2319=back
2358 2320
2359=head3 cf::object 2321=head3 cf::object
2360 2322
2361=cut 2323=cut
2364 2326
2365=over 4 2327=over 4
2366 2328
2367=item $ob->inv_recursive 2329=item $ob->inv_recursive
2368 2330
2369Returns the inventory of the object _and_ their inventories, recursively. 2331Returns the inventory of the object I<and> their inventories, recursively,
2332but I<not> the object itself.
2370 2333
2371=cut 2334=cut
2372 2335
2373sub inv_recursive_; 2336sub inv_recursive_;
2374sub inv_recursive_ { 2337sub inv_recursive_ {
2379 inv_recursive_ inv $_[0] 2342 inv_recursive_ inv $_[0]
2380} 2343}
2381 2344
2382=item $ref = $ob->ref 2345=item $ref = $ob->ref
2383 2346
2384creates and returns a persistent reference to an objetc that can be stored as a string. 2347Creates and returns a persistent reference to an object that can be stored as a string.
2385 2348
2386=item $ob = cf::object::deref ($refstring) 2349=item $ob = cf::object::deref ($refstring)
2387 2350
2388returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2351returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2389even if the object actually exists. May block. 2352even if the object actually exists. May block.
2421can be C<undef>. Does the right thing when the player is currently in a 2384can be C<undef>. Does the right thing when the player is currently in a
2422dialogue with the given NPC character. 2385dialogue with the given NPC character.
2423 2386
2424=cut 2387=cut
2425 2388
2389our $SAY_CHANNEL = {
2390 id => "say",
2391 title => "Map",
2392 reply => "say ",
2393 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2394};
2395
2396our $CHAT_CHANNEL = {
2397 id => "chat",
2398 title => "Chat",
2399 reply => "chat ",
2400 tooltip => "Player chat and shouts, global to the server.",
2401};
2402
2426# rough implementation of a future "reply" method that works 2403# rough implementation of a future "reply" method that works
2427# with dialog boxes. 2404# with dialog boxes.
2428#TODO: the first argument must go, split into a $npc->reply_to ( method 2405#TODO: the first argument must go, split into a $npc->reply_to ( method
2429sub cf::object::player::reply($$$;$) { 2406sub cf::object::player::reply($$$;$) {
2430 my ($self, $npc, $msg, $flags) = @_; 2407 my ($self, $npc, $msg, $flags) = @_;
2441 my $dialog = $pl->{npc_dialog}; 2418 my $dialog = $pl->{npc_dialog};
2442 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2419 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2443 2420
2444 } else { 2421 } else {
2445 $msg = $npc->name . " says: $msg" if $npc; 2422 $msg = $npc->name . " says: $msg" if $npc;
2446 $self->message ($msg, $flags); 2423 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2447 } 2424 }
2448 } 2425 }
2449} 2426}
2450 2427
2451=item $object->send_msg ($channel, $msg, $color, [extra...]) 2428=item $object->send_msg ($channel, $msg, $color, [extra...])
2476 2453
2477=item $player_object->enter_link 2454=item $player_object->enter_link
2478 2455
2479Freezes the player and moves him/her to a special map (C<{link}>). 2456Freezes the player and moves him/her to a special map (C<{link}>).
2480 2457
2481The player should be reasonably safe there for short amounts of time. You 2458The player should be reasonably safe there for short amounts of time (e.g.
2482I<MUST> call C<leave_link> as soon as possible, though. 2459for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2460though, as the palyer cannot control the character while it is on the link
2461map.
2483 2462
2484Will never block. 2463Will never block.
2485 2464
2486=item $player_object->leave_link ($map, $x, $y) 2465=item $player_object->leave_link ($map, $x, $y)
2487 2466
2545 2524
2546 $map->load; 2525 $map->load;
2547 $map->load_neighbours; 2526 $map->load_neighbours;
2548 2527
2549 return unless $self->contr->active; 2528 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2550 $self->activate_recursive; 2530 $self->activate_recursive;
2551 2531
2552 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2553 $self->enter_map ($map, $x, $y); 2533 $self->enter_map ($map, $x, $y);
2554} 2534}
2558Moves the player to the given map-path and coordinates by first freezing 2538Moves the player to the given map-path and coordinates by first freezing
2559her, loading and preparing them map, calling the provided $check callback 2539her, loading and preparing them map, calling the provided $check callback
2560that has to return the map if sucecssful, and then unfreezes the player on 2540that 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 2541the new (success) or old (failed) map position. In either case, $done will
2562be called at the end of this process. 2542be called at the end of this process.
2543
2544Note that $check will be called with a potentially non-loaded map, so if
2545it needs a loaded map it has to call C<< ->load >>.
2563 2546
2564=cut 2547=cut
2565 2548
2566our $GOTOGEN; 2549our $GOTOGEN;
2567 2550
2646} 2629}
2647 2630
2648sub prepare_random_map { 2631sub prepare_random_map {
2649 my ($exit) = @_; 2632 my ($exit) = @_;
2650 2633
2651 my $guard = cf::lock_acquire "exit_prepare:$exit";
2652
2653 # all this does is basically replace the /! path by 2634 # all this does is basically replace the /! path by
2654 # a new random map path (?random/...) with a seed 2635 # a new random map path (?random/...) with a seed
2655 # that depends on the exit object 2636 # that depends on the exit object
2656 2637
2657 my $rmp = parse_random_map_params $exit->msg; 2638 my $rmp = parse_random_map_params $exit->msg;
2659 if ($exit->map) { 2640 if ($exit->map) {
2660 $rmp->{region} = $exit->region->name; 2641 $rmp->{region} = $exit->region->name;
2661 $rmp->{origin_map} = $exit->map->path; 2642 $rmp->{origin_map} = $exit->map->path;
2662 $rmp->{origin_x} = $exit->x; 2643 $rmp->{origin_x} = $exit->x;
2663 $rmp->{origin_y} = $exit->y; 2644 $rmp->{origin_y} = $exit->y;
2645
2646 $exit->map->touch;
2664 } 2647 }
2665 2648
2666 $rmp->{random_seed} ||= $exit->random_seed; 2649 $rmp->{random_seed} ||= $exit->random_seed;
2667 2650
2668 my $data = cf::encode_json $rmp; 2651 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2669 my $md5 = Digest::MD5::md5_hex $data; 2652 my $md5 = Digest::MD5::md5_hex $data;
2670 my $meta = "$RANDOMDIR/$md5.meta"; 2653 my $meta = "$RANDOMDIR/$md5.meta";
2671 2654
2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2655 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2673 aio_write $fh, 0, (length $data), $data, 0; 2656 aio_write $fh, 0, (length $data), $data, 0;
2674 undef $fh; 2657 undef $fh;
2675 aio_rename "$meta~", $meta; 2658 aio_rename "$meta~", $meta;
2676 2659
2660 my $slaying = "?random/$md5";
2661
2662 if ($exit->valid) {
2677 $exit->slaying ("?random/$md5"); 2663 $exit->slaying ("?random/$md5");
2678 $exit->msg (undef); 2664 $exit->msg (undef);
2665 }
2679 } 2666 }
2680} 2667}
2681 2668
2682sub cf::object::player::enter_exit { 2669sub cf::object::player::enter_exit {
2683 my ($self, $exit) = @_; 2670 my ($self, $exit) = @_;
2684 2671
2685 return unless $self->type == cf::PLAYER; 2672 return unless $self->type == cf::PLAYER;
2686 2673
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; 2674 $self->enter_link;
2699 2675
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 { 2676 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2677 $Coro::current->{desc} = "enter_exit";
2706 2678
2707 $self->deactivate_recursive; # just to be sure
2708 unless (eval { 2679 unless (eval {
2680 $self->deactivate_recursive; # just to be sure
2681
2682 # random map handling
2683 {
2684 my $guard = cf::lock_acquire "exit_prepare:$exit";
2685
2686 prepare_random_map $exit
2687 if $exit->slaying eq "/!";
2688 }
2689
2690 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2691 my $x = $exit->stats->hp;
2692 my $y = $exit->stats->sp;
2693
2709 $self->goto ($slaying, $hp, $sp); 2694 $self->goto ($map, $x, $y);
2710 2695
2696 # if exit is damned, update players death & WoR home-position
2697 $self->contr->savebed ($map, $x, $y)
2698 if $exit->flag (cf::FLAG_DAMNED);
2699
2711 1; 2700 1
2712 }) { 2701 }) {
2713 $self->message ("Something went wrong deep within the crossfire server. " 2702 $self->message ("Something went wrong deep within the deliantra server. "
2714 . "I'll try to bring you back to the map you were before. " 2703 . "I'll try to bring you back to the map you were before. "
2715 . "Please report this to the dungeon master!", 2704 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 2705 cf::NDI_UNIQUE | cf::NDI_RED);
2717 2706
2718 warn "ERROR in enter_exit: $@"; 2707 warn "ERROR in enter_exit: $@";
2784 id => "infobox", 2773 id => "infobox",
2785 title => "Body Parts", 2774 title => "Body Parts",
2786 reply => undef, 2775 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available", 2776 tooltip => "Shows which body parts you posess and are available",
2788 }, 2777 },
2778 "c/statistics" => {
2779 id => "infobox",
2780 title => "Statistics",
2781 reply => undef,
2782 tooltip => "Shows your primary statistics",
2783 },
2784 "c/skills" => {
2785 id => "infobox",
2786 title => "Skills",
2787 reply => undef,
2788 tooltip => "Shows your experience per skill and item power",
2789 },
2790 "c/shopitems" => {
2791 id => "infobox",
2792 title => "Shop Items",
2793 reply => undef,
2794 tooltip => "Shows the items currently for sale in this shop",
2795 },
2796 "c/resistances" => {
2797 id => "infobox",
2798 title => "Resistances",
2799 reply => undef,
2800 tooltip => "Shows your resistances",
2801 },
2802 "c/pets" => {
2803 id => "infobox",
2804 title => "Pets",
2805 reply => undef,
2806 tooltip => "Shows information abotu your pets/a specific pet",
2807 },
2789 "c/uptime" => { 2808 "c/uptime" => {
2790 id => "infobox", 2809 id => "infobox",
2791 title => "Uptime", 2810 title => "Uptime",
2792 reply => undef, 2811 reply => undef,
2793 tooltip => "How long the server has been running since last restart", 2812 tooltip => "How long the server has been running since last restart",
2796 id => "infobox", 2815 id => "infobox",
2797 title => "Map Info", 2816 title => "Map Info",
2798 reply => undef, 2817 reply => undef,
2799 tooltip => "Information related to the maps", 2818 tooltip => "Information related to the maps",
2800 }, 2819 },
2820 "c/party" => {
2821 id => "party",
2822 title => "Party",
2823 reply => "gsay ",
2824 tooltip => "Messages and chat related to your party",
2825 },
2826 "c/death" => {
2827 id => "death",
2828 title => "Death",
2829 reply => undef,
2830 tooltip => "Reason for and more info about your most recent death",
2831 },
2832 "c/say" => $SAY_CHANNEL,
2833 "c/chat" => $CHAT_CHANNEL,
2801); 2834);
2802 2835
2803sub cf::client::send_msg { 2836sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 2837 my ($self, $channel, $msg, $color, @extra) = @_;
2805 2838
2806 $msg = $self->pl->expand_cfpod ($msg); 2839 $msg = $self->pl->expand_cfpod ($msg)
2840 unless $color & cf::NDI_VERBATIM;
2807 2841
2808 $color &= cf::NDI_CLIENT_MASK; # just in case... 2842 $color &= cf::NDI_CLIENT_MASK; # just in case...
2809 2843
2810 # check predefined channels, for the benefit of C 2844 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 2845 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel}; 2846 $channel = $CHANNEL{$channel};
2813 2847
2814 $self->ext_msg (channel_info => $channel) 2848 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id}; 2849 $channel = $channel->{id};
2818 2850
2819 } elsif (ref $channel) { 2851 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent 2852 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) { 2853 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel; 2854 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel) 2855 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825 } 2856 }
2826 2857
2827 $channel = $channel->{id}; 2858 $channel = $channel->{id};
2828 } 2859 }
2829 2860
2830 return unless @extra || length $msg; 2861 return unless @extra || length $msg;
2831 2862
2832 if ($self->can_msg) {
2833 # default colour, mask it out 2863 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2864 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 2865 if $color & cf::NDI_DEF;
2836 2866
2837 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2867 my $pkt = "msg "
2868 . $self->{json_coder}->encode (
2838 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2869 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2839 } else { 2870 );
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 2871
2851 $color &= cf::NDI_COLOR_MASK; 2872 # try lzf for large packets
2873 $pkt = "lzf " . Compress::LZF::compress $pkt
2874 if 1024 <= length $pkt and $self->{can_lzf};
2852 2875
2853 utf8::encode $msg; 2876 # split very large packets
2854 2877 if (8192 < length $pkt and $self->{can_lzf}) {
2855 if (0 && $msg =~ /\[/) { 2878 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2856 # COMMAND/INFO 2879 $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 } 2880 }
2881
2882 $self->send_packet ($pkt);
2864} 2883}
2865 2884
2866=item $client->ext_msg ($type, @msg) 2885=item $client->ext_msg ($type, @msg)
2867 2886
2868Sends an ext event to the client. 2887Sends an ext event to the client.
3042 3061
3043The following functions and methods are available within a safe environment: 3062The following functions and methods are available within a safe environment:
3044 3063
3045 cf::object 3064 cf::object
3046 contr pay_amount pay_player map x y force_find force_add destroy 3065 contr pay_amount pay_player map x y force_find force_add destroy
3047 insert remove name archname title slaying race decrease_ob_nr 3066 insert remove name archname title slaying race decrease split
3067 value
3048 3068
3049 cf::object::player 3069 cf::object::player
3050 player 3070 player
3051 3071
3052 cf::player 3072 cf::player
3057 3077
3058=cut 3078=cut
3059 3079
3060for ( 3080for (
3061 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3081 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3062 insert remove inv name archname title slaying race 3082 insert remove inv nrof name archname title slaying race
3063 decrease_ob_nr destroy)], 3083 decrease split destroy change_exp value msg lore send_msg)],
3064 ["cf::object::player" => qw(player)], 3084 ["cf::object::player" => qw(player)],
3065 ["cf::player" => qw(peaceful)], 3085 ["cf::player" => qw(peaceful send_msg)],
3066 ["cf::map" => qw(trigger)], 3086 ["cf::map" => qw(trigger)],
3067) { 3087) {
3068 no strict 'refs'; 3088 no strict 'refs';
3069 my ($pkg, @funs) = @$_; 3089 my ($pkg, @funs) = @$_;
3070 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3090 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3087 my ($code, %vars) = @_; 3107 my ($code, %vars) = @_;
3088 3108
3089 my $qcode = $code; 3109 my $qcode = $code;
3090 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3110 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3091 $qcode =~ s/\n/\\n/g; 3111 $qcode =~ s/\n/\\n/g;
3112
3113 %vars = (_dummy => 0) unless %vars;
3092 3114
3093 local $_; 3115 local $_;
3094 local @safe::cf::_safe_eval_args = values %vars; 3116 local @safe::cf::_safe_eval_args = values %vars;
3095 3117
3096 my $eval = 3118 my $eval =
3276 while (my ($k, $v) = each %$want) { 3298 while (my ($k, $v) = each %$want) {
3277 $ns->fx_want ($k, $v); 3299 $ns->fx_want ($k, $v);
3278 } 3300 }
3279}; 3301};
3280 3302
3303sub load_resource_file($) {
3304 my $guard = lock_acquire "load_resource_file";
3305
3306 my $status = load_resource_file_ $_[0];
3307 get_slot 0.1, 100;
3308 cf::arch::commit_load;
3309
3310 $status
3311}
3312
3281sub reload_regions { 3313sub reload_regions {
3282 # HACK to clear player env face cache, we need some signal framework 3314 # HACK to clear player env face cache, we need some signal framework
3283 # for this (global event?) 3315 # for this (global event?)
3284 %ext::player_env::MUSIC_FACE_CACHE = (); 3316 %ext::player_env::MUSIC_FACE_CACHE = ();
3285 3317
3298} 3330}
3299 3331
3300sub reload_archetypes { 3332sub reload_archetypes {
3301 load_resource_file "$DATADIR/archetypes" 3333 load_resource_file "$DATADIR/archetypes"
3302 or die "unable to load archetypes\n"; 3334 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} 3335}
3309 3336
3310sub reload_treasures { 3337sub reload_treasures {
3311 load_resource_file "$DATADIR/treasures" 3338 load_resource_file "$DATADIR/treasures"
3312 or die "unable to load treasurelists\n"; 3339 or die "unable to load treasurelists\n";
3313} 3340}
3314 3341
3315sub reload_resources { 3342sub reload_resources {
3316 warn "reloading resource files...\n"; 3343 warn "reloading resource files...\n";
3317 3344
3345 reload_facedata;
3346 reload_archetypes;
3318 reload_regions; 3347 reload_regions;
3319 reload_facedata;
3320 #reload_archetypes;#d#
3321 reload_archetypes;
3322 reload_treasures; 3348 reload_treasures;
3323 3349
3324 warn "finished reloading resource files\n"; 3350 warn "finished reloading resource files\n";
3325}
3326
3327sub init {
3328 reload_resources;
3329} 3351}
3330 3352
3331sub reload_config { 3353sub reload_config {
3332 open my $fh, "<:utf8", "$CONFDIR/config" 3354 open my $fh, "<:utf8", "$CONFDIR/config"
3333 or return; 3355 or return;
3347 }; 3369 };
3348 warn $@ if $@; 3370 warn $@ if $@;
3349 } 3371 }
3350} 3372}
3351 3373
3374sub pidfile() {
3375 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3376 or die "$PIDFILE: $!";
3377 flock $fh, &Fcntl::LOCK_EX
3378 or die "$PIDFILE: flock: $!";
3379 $fh
3380}
3381
3382# make sure only one server instance is running at any one time
3383sub atomic {
3384 my $fh = pidfile;
3385
3386 my $pid = <$fh>;
3387 kill 9, $pid if $pid > 0;
3388
3389 seek $fh, 0, 0;
3390 print $fh $$;
3391}
3392
3352sub main { 3393sub main {
3394 cf::init_globals; # initialise logging
3395
3396 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3397 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3398 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3399 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3400
3401 cf::init_experience;
3402 cf::init_anim;
3403 cf::init_attackmess;
3404 cf::init_dynamic;
3405
3406 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3407
3353 # we must not ever block the main coroutine 3408 # we must not ever block the main coroutine
3354 local $Coro::idle = sub { 3409 local $Coro::idle = sub {
3355 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3410 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3356 (async { 3411 (async {
3357 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3412 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT; 3413 EV::loop EV::LOOP_ONESHOT;
3359 })->prio (Coro::PRIO_MAX); 3414 })->prio (Coro::PRIO_MAX);
3360 }; 3415 };
3361 3416
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; 3417 evthread_start IO::AIO::poll_fileno;
3418
3419 cf::sync_job {
3420 reload_resources;
3421 reload_config;
3422 db_init;
3423
3424 cf::load_settings;
3425 cf::load_materials;
3426 cf::init_uuid;
3427 cf::init_signals;
3428 cf::init_commands;
3429 cf::init_skills;
3430
3431 cf::init_beforeplay;
3432
3433 atomic;
3434
3435 load_extensions;
3436
3437 utime time, time, $RUNTIMEFILE;
3438
3439 # no (long-running) fork's whatsoever before this point(!)
3440 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3441
3442 (pop @POST_INIT)->(0) while @POST_INIT;
3443 };
3444
3368 EV::loop; 3445 EV::loop;
3369} 3446}
3370 3447
3371############################################################################# 3448#############################################################################
3372# initialisation and cleanup 3449# initialisation and cleanup
3379 cf::cleanup "SIG$signal"; 3456 cf::cleanup "SIG$signal";
3380 }; 3457 };
3381 } 3458 }
3382} 3459}
3383 3460
3384sub write_runtime { 3461sub write_runtime_sync {
3385 my $runtime = "$LOCALDIR/runtime";
3386
3387 # first touch the runtime file to show we are still running: 3462 # first touch the runtime file to show we are still running:
3388 # the fsync below can take a very very long time. 3463 # the fsync below can take a very very long time.
3389 3464
3390 IO::AIO::aio_utime $runtime, undef, undef; 3465 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3391 3466
3392 my $guard = cf::lock_acquire "write_runtime"; 3467 my $guard = cf::lock_acquire "write_runtime";
3393 3468
3394 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3469 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3395 or return; 3470 or return;
3396 3471
3397 my $value = $cf::RUNTIME + 90 + 10; 3472 my $value = $cf::RUNTIME + 90 + 10;
3398 # 10 is the runtime save interval, for a monotonic clock 3473 # 10 is the runtime save interval, for a monotonic clock
3399 # 60 allows for the watchdog to kill the server. 3474 # 60 allows for the watchdog to kill the server.
3409 aio_utime $fh, undef, undef; 3484 aio_utime $fh, undef, undef;
3410 3485
3411 close $fh 3486 close $fh
3412 or return; 3487 or return;
3413 3488
3414 aio_rename "$runtime~", $runtime 3489 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3415 and return; 3490 and return;
3416 3491
3417 warn "runtime file written.\n"; 3492 warn "runtime file written.\n";
3418 3493
3419 1 3494 1
3495}
3496
3497our $uuid_lock;
3498our $uuid_skip;
3499
3500sub write_uuid_sync($) {
3501 $uuid_skip ||= $_[0];
3502
3503 return if $uuid_lock;
3504 local $uuid_lock = 1;
3505
3506 my $uuid = "$LOCALDIR/uuid";
3507
3508 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3509 or return;
3510
3511 my $value = uuid_seq uuid_cur;
3512
3513 unless ($value) {
3514 warn "cowardly refusing to write zero uuid value!\n";
3515 return;
3516 }
3517
3518 my $value = uuid_str $value + $uuid_skip;
3519 $uuid_skip = 0;
3520
3521 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3522 and return;
3523
3524 # always fsync - this file is important
3525 aio_fsync $fh
3526 and return;
3527
3528 close $fh
3529 or return;
3530
3531 aio_rename "$uuid~", $uuid
3532 and return;
3533
3534 warn "uuid file written ($value).\n";
3535
3536 1
3537
3538}
3539
3540sub write_uuid($$) {
3541 my ($skip, $sync) = @_;
3542
3543 $sync ? write_uuid_sync $skip
3544 : async { write_uuid_sync $skip };
3420} 3545}
3421 3546
3422sub emergency_save() { 3547sub emergency_save() {
3423 my $freeze_guard = cf::freeze_mainloop; 3548 my $freeze_guard = cf::freeze_mainloop;
3424 3549
3425 warn "enter emergency perl save\n"; 3550 warn "emergency_perl_save: enter\n";
3426 3551
3427 cf::sync_job { 3552 cf::sync_job {
3553 # this is a trade-off: we want to be very quick here, so
3554 # save all maps without fsync, and later call a global sync
3555 # (which in turn might be very very slow)
3556 local $USE_FSYNC = 0;
3557
3428 # use a peculiar iteration method to avoid tripping on perl 3558 # use a peculiar iteration method to avoid tripping on perl
3429 # refcount bugs in for. also avoids problems with players 3559 # refcount bugs in for. also avoids problems with players
3430 # and maps saved/destroyed asynchronously. 3560 # and maps saved/destroyed asynchronously.
3431 warn "begin emergency player save\n"; 3561 warn "emergency_perl_save: begin player save\n";
3432 for my $login (keys %cf::PLAYER) { 3562 for my $login (keys %cf::PLAYER) {
3433 my $pl = $cf::PLAYER{$login} or next; 3563 my $pl = $cf::PLAYER{$login} or next;
3434 $pl->valid or next; 3564 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3565 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3436 $pl->save; 3566 $pl->save;
3437 } 3567 }
3438 warn "end emergency player save\n"; 3568 warn "emergency_perl_save: end player save\n";
3439 3569
3440 warn "begin emergency map save\n"; 3570 warn "emergency_perl_save: begin map save\n";
3441 for my $path (keys %cf::MAP) { 3571 for my $path (keys %cf::MAP) {
3442 my $map = $cf::MAP{$path} or next; 3572 my $map = $cf::MAP{$path} or next;
3443 $map->valid or next; 3573 $map->valid or next;
3444 $map->save; 3574 $map->save;
3445 } 3575 }
3446 warn "end emergency map save\n"; 3576 warn "emergency_perl_save: end map save\n";
3447 3577
3448 warn "begin emergency database checkpoint\n"; 3578 warn "emergency_perl_save: begin database checkpoint\n";
3449 BDB::db_env_txn_checkpoint $DB_ENV; 3579 BDB::db_env_txn_checkpoint $DB_ENV;
3450 warn "end emergency database checkpoint\n"; 3580 warn "emergency_perl_save: end database checkpoint\n";
3581
3582 warn "emergency_perl_save: begin write uuid\n";
3583 write_uuid_sync 1;
3584 warn "emergency_perl_save: end write uuid\n";
3451 }; 3585 };
3452 3586
3587 warn "emergency_perl_save: starting sync()\n";
3588 IO::AIO::aio_sync sub {
3589 warn "emergency_perl_save: finished sync()\n";
3590 };
3591
3453 warn "leave emergency perl save\n"; 3592 warn "emergency_perl_save: leave\n";
3454} 3593}
3455 3594
3456sub post_cleanup { 3595sub post_cleanup {
3457 my ($make_core) = @_; 3596 my ($make_core) = @_;
3458 3597
3459 warn Carp::longmess "post_cleanup backtrace" 3598 warn Carp::longmess "post_cleanup backtrace"
3460 if $make_core; 3599 if $make_core;
3600
3601 my $fh = pidfile;
3602 unlink $PIDFILE if <$fh> == $$;
3603}
3604
3605# a safer delete_package, copied from Symbol
3606sub clear_package($) {
3607 my $pkg = shift;
3608
3609 # expand to full symbol table name if needed
3610 unless ($pkg =~ /^main::.*::$/) {
3611 $pkg = "main$pkg" if $pkg =~ /^::/;
3612 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3613 $pkg .= '::' unless $pkg =~ /::$/;
3614 }
3615
3616 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3617 my $stem_symtab = *{$stem}{HASH};
3618
3619 defined $stem_symtab and exists $stem_symtab->{$leaf}
3620 or return;
3621
3622 # clear all symbols
3623 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3624 for my $name (keys %$leaf_symtab) {
3625 _gv_clear *{"$pkg$name"};
3626# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3627 }
3628 warn "cleared package $pkg\n";#d#
3461} 3629}
3462 3630
3463sub do_reload_perl() { 3631sub do_reload_perl() {
3464 # can/must only be called in main 3632 # can/must only be called in main
3465 if ($Coro::current != $Coro::main) { 3633 if ($Coro::current != $Coro::main) {
3466 warn "can only reload from main coroutine"; 3634 warn "can only reload from main coroutine";
3467 return; 3635 return;
3468 } 3636 }
3469 3637
3638 return if $RELOAD++;
3639
3640 my $t1 = EV::time;
3641
3642 while ($RELOAD) {
3470 warn "reloading..."; 3643 warn "reloading...";
3471 3644
3472 warn "entering sync_job"; 3645 warn "entering sync_job";
3473 3646
3474 cf::sync_job { 3647 cf::sync_job {
3475 cf::write_runtime; # external watchdog should not bark 3648 cf::write_runtime_sync; # external watchdog should not bark
3476 cf::emergency_save; 3649 cf::emergency_save;
3477 cf::write_runtime; # external watchdog should not bark 3650 cf::write_runtime_sync; # external watchdog should not bark
3478 3651
3479 warn "syncing database to disk"; 3652 warn "syncing database to disk";
3480 BDB::db_env_txn_checkpoint $DB_ENV; 3653 BDB::db_env_txn_checkpoint $DB_ENV;
3481 3654
3482 # if anything goes wrong in here, we should simply crash as we already saved 3655 # if anything goes wrong in here, we should simply crash as we already saved
3483 3656
3484 warn "flushing outstanding aio requests"; 3657 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; 3658 while (IO::AIO::nreqs || BDB::nreqs) {
3490 warn "iterate..."; 3659 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 } 3660 }
3516 3661
3517 warn "... nuking $pkg"; 3662 warn "cancelling all extension coros";
3518 Symbol::delete_package $pkg; 3663 $_->cancel for values %EXT_CORO;
3519 } 3664 %EXT_CORO = ();
3520 3665
3521 warn "unloading all perl modules loaded from $LIBDIR"; 3666 warn "removing commands";
3522 while (my ($k, $v) = each %INC) { 3667 %COMMAND = ();
3523 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3524 3668
3669 warn "removing ext/exti commands";
3670 %EXTCMD = ();
3671 %EXTICMD = ();
3672
3673 warn "unloading/nuking all extensions";
3674 for my $pkg (@EXTS) {
3525 warn "... unloading $k"; 3675 warn "... unloading $pkg";
3526 delete $INC{$k};
3527 3676
3528 $k =~ s/\.pm$//;
3529 $k =~ s/\//::/g;
3530
3531 if (my $cb = $k->can ("unload_module")) { 3677 if (my $cb = $pkg->can ("unload")) {
3678 eval {
3532 $cb->(); 3679 $cb->($pkg);
3680 1
3681 } or warn "$pkg unloaded, but with errors: $@";
3682 }
3683
3684 warn "... clearing $pkg";
3685 clear_package $pkg;
3533 } 3686 }
3534 3687
3535 Symbol::delete_package $k; 3688 warn "unloading all perl modules loaded from $LIBDIR";
3689 while (my ($k, $v) = each %INC) {
3690 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3691
3692 warn "... unloading $k";
3693 delete $INC{$k};
3694
3695 $k =~ s/\.pm$//;
3696 $k =~ s/\//::/g;
3697
3698 if (my $cb = $k->can ("unload_module")) {
3699 $cb->();
3700 }
3701
3702 clear_package $k;
3536 } 3703 }
3537 3704
3538 warn "getting rid of safe::, as good as possible"; 3705 warn "getting rid of safe::, as good as possible";
3539 Symbol::delete_package "safe::$_" 3706 clear_package "safe::$_"
3540 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3707 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3541 3708
3542 warn "unloading cf.pm \"a bit\""; 3709 warn "unloading cf.pm \"a bit\"";
3543 delete $INC{"cf.pm"}; 3710 delete $INC{"cf.pm"};
3544 delete $INC{"cf/pod.pm"}; 3711 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3545 3712
3546 # don't, removes xs symbols, too, 3713 # don't, removes xs symbols, too,
3547 # and global variables created in xs 3714 # and global variables created in xs
3548 #Symbol::delete_package __PACKAGE__; 3715 #clear_package __PACKAGE__;
3549 3716
3550 warn "unload completed, starting to reload now"; 3717 warn "unload completed, starting to reload now";
3551 3718
3552 warn "reloading cf.pm"; 3719 warn "reloading cf.pm";
3553 require cf; 3720 require cf;
3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3721 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3555 3722
3556 warn "loading config and database again"; 3723 warn "loading config and database again";
3557 cf::reload_config; 3724 cf::reload_config;
3558 3725
3559 warn "loading extensions"; 3726 warn "loading extensions";
3560 cf::load_extensions; 3727 cf::load_extensions;
3561 3728
3729 if ($REATTACH_ON_RELOAD) {
3562 warn "reattaching attachments to objects/players"; 3730 warn "reattaching attachments to objects/players";
3563 _global_reattach; # objects, sockets 3731 _global_reattach; # objects, sockets
3564 warn "reattaching attachments to maps"; 3732 warn "reattaching attachments to maps";
3565 reattach $_ for values %MAP; 3733 reattach $_ for values %MAP;
3566 warn "reattaching attachments to players"; 3734 warn "reattaching attachments to players";
3567 reattach $_ for values %PLAYER; 3735 reattach $_ for values %PLAYER;
3736 }
3568 3737
3738 warn "running post_init jobs";
3739 (pop @POST_INIT)->(1) while @POST_INIT;
3740
3569 warn "leaving sync_job"; 3741 warn "leaving sync_job";
3570 3742
3571 1 3743 1
3572 } or do { 3744 } or do {
3573 warn $@; 3745 warn $@;
3574 cf::cleanup "error while reloading, exiting."; 3746 cf::cleanup "error while reloading, exiting.";
3575 }; 3747 };
3576 3748
3577 warn "reloaded"; 3749 warn "reloaded";
3750 --$RELOAD;
3751 }
3752
3753 $t1 = EV::time - $t1;
3754 warn "reload completed in ${t1}s\n";
3578}; 3755};
3579 3756
3580our $RELOAD_WATCHER; # used only during reload 3757our $RELOAD_WATCHER; # used only during reload
3581 3758
3582sub reload_perl() { 3759sub reload_perl() {
3583 # doing reload synchronously and two reloads happen back-to-back, 3760 # doing reload synchronously and two reloads happen back-to-back,
3584 # coro crashes during coro_state_free->destroy here. 3761 # coro crashes during coro_state_free->destroy here.
3585 3762
3763 $RELOAD_WATCHER ||= cf::async {
3764 Coro::AIO::aio_wait cache_extensions;
3765
3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3766 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3587 do_reload_perl; 3767 do_reload_perl;
3588 undef $RELOAD_WATCHER; 3768 undef $RELOAD_WATCHER;
3769 };
3589 }; 3770 };
3590} 3771}
3591 3772
3592register_command "reload" => sub { 3773register_command "reload" => sub {
3593 my ($who, $arg) = @_; 3774 my ($who, $arg) = @_;
3607 3788
3608our @WAIT_FOR_TICK; 3789our @WAIT_FOR_TICK;
3609our @WAIT_FOR_TICK_BEGIN; 3790our @WAIT_FOR_TICK_BEGIN;
3610 3791
3611sub wait_for_tick { 3792sub wait_for_tick {
3612 return if tick_inhibit;
3613 return if $Coro::current == $Coro::main; 3793 return if tick_inhibit || $Coro::current == $Coro::main;
3614 3794
3615 my $signal = new Coro::Signal; 3795 my $signal = new Coro::Signal;
3616 push @WAIT_FOR_TICK, $signal; 3796 push @WAIT_FOR_TICK, $signal;
3617 $signal->wait; 3797 $signal->wait;
3618} 3798}
3619 3799
3620sub wait_for_tick_begin { 3800sub wait_for_tick_begin {
3621 return if tick_inhibit;
3622 return if $Coro::current == $Coro::main; 3801 return if tick_inhibit || $Coro::current == $Coro::main;
3623 3802
3624 my $signal = new Coro::Signal; 3803 my $signal = new Coro::Signal;
3625 push @WAIT_FOR_TICK_BEGIN, $signal; 3804 push @WAIT_FOR_TICK_BEGIN, $signal;
3626 $signal->wait; 3805 $signal->wait;
3627} 3806}
3637 3816
3638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3817 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3818 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3640 Coro::async_pool { 3819 Coro::async_pool {
3641 $Coro::current->{desc} = "runtime saver"; 3820 $Coro::current->{desc} = "runtime saver";
3642 write_runtime 3821 write_runtime_sync
3643 or warn "ERROR: unable to write runtime file: $!"; 3822 or warn "ERROR: unable to write runtime file: $!";
3644 }; 3823 };
3645 } 3824 }
3646 3825
3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3826 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3666{ 3845{
3667 # configure BDB 3846 # configure BDB
3668 3847
3669 BDB::min_parallel 8; 3848 BDB::min_parallel 8;
3670 BDB::max_poll_reqs $TICK * 0.1; 3849 BDB::max_poll_reqs $TICK * 0.1;
3671 $Coro::BDB::WATCHER->priority (1); 3850 $AnyEvent::BDB::WATCHER->priority (1);
3672 3851
3673 unless ($DB_ENV) { 3852 unless ($DB_ENV) {
3674 $DB_ENV = BDB::db_env_create; 3853 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3854 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3676 | BDB::LOG_AUTOREMOVE, 1); 3855 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3856 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3677 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3857 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3678 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3858 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3679 3859
3680 cf::sync_job { 3860 cf::sync_job {
3681 eval { 3861 eval {
3707{ 3887{
3708 # configure IO::AIO 3888 # configure IO::AIO
3709 3889
3710 IO::AIO::min_parallel 8; 3890 IO::AIO::min_parallel 8;
3711 IO::AIO::max_poll_time $TICK * 0.1; 3891 IO::AIO::max_poll_time $TICK * 0.1;
3712 $Coro::AIO::WATCHER->priority (1); 3892 undef $AnyEvent::AIO::WATCHER;
3713} 3893}
3714 3894
3715my $_log_backtrace; 3895my $_log_backtrace;
3716 3896
3717sub _log_backtrace { 3897sub _log_backtrace {
3720 $msg =~ s/\n//; 3900 $msg =~ s/\n//;
3721 3901
3722 # limit the # of concurrent backtraces 3902 # limit the # of concurrent backtraces
3723 if ($_log_backtrace < 2) { 3903 if ($_log_backtrace < 2) {
3724 ++$_log_backtrace; 3904 ++$_log_backtrace;
3905 my $perl_bt = Carp::longmess $msg;
3725 async { 3906 async {
3726 $Coro::current->{desc} = "abt $msg"; 3907 $Coro::current->{desc} = "abt $msg";
3727 3908
3728 my @bt = fork_call { 3909 my @bt = fork_call {
3729 @addr = map { sprintf "%x", $_ } @addr; 3910 @addr = map { sprintf "%x", $_ } @addr;
3740 } 3921 }
3741 3922
3742 @funcs 3923 @funcs
3743 }; 3924 };
3744 3925
3745 LOG llevInfo, "[ABT] $msg\n"; 3926 LOG llevInfo, "[ABT] $perl_bt\n";
3927 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3746 LOG llevInfo, "[ABT] $_\n" for @bt; 3928 LOG llevInfo, "[ABT] $_\n" for @bt;
3747 --$_log_backtrace; 3929 --$_log_backtrace;
3748 }; 3930 };
3749 } else { 3931 } else {
3750 LOG llevInfo, "[ABT] $msg\n"; 3932 LOG llevInfo, "[ABT] $msg\n";
3751 LOG llevInfo, "[ABT] [suppressed]\n"; 3933 LOG llevInfo, "[ABT] [suppressed]\n";
3752 } 3934 }
3753} 3935}
3754 3936
3755# load additional modules 3937# load additional modules
3756use cf::pod; 3938require "cf/$_.pm" for @EXTRA_MODULES;
3757 3939
3758END { cf::emergency_save } 3940END { cf::emergency_save }
3759 3941
37601 39421
3761 3943

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines