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.395 by root, Sat Nov 10 22:41:59 2007 UTC vs.
Revision 1.434 by root, Thu May 29 03:27:37 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Event; 30use EV;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
14 35
15use Coro 4.1 (); 36use Coro ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::AnyEvent;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
43use Coro::AnyEvent;
22use Coro::AIO; 44use Coro::AIO;
45use Coro::BDB;
23use Coro::Storable; 46use Coro::Storable;
24use Coro::Util (); 47use Coro::Util ();
25 48
26use JSON::XS (); 49use JSON::XS 2.01 ();
27use BDB (); 50use BDB ();
28use Data::Dumper; 51use Data::Dumper;
29use Digest::MD5; 52use Digest::MD5;
30use Fcntl; 53use Fcntl;
31use YAML::Syck (); 54use YAML ();
32use IO::AIO 2.51 (); 55use IO::AIO ();
33use Time::HiRes; 56use Time::HiRes;
34use Compress::LZF; 57use Compress::LZF;
35use Digest::MD5 (); 58use Digest::MD5 ();
59
60AnyEvent::detect;
61
62IO::AIO::max_poll_reqs 1;#d#
36 63
37# configure various modules to our taste 64# configure various modules to our taste
38# 65#
39$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47 69
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 71
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 73
… …
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our %RESOURCE;
75 98
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 101our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
83 103
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 104our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 105our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 106our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 107our $DB_ENV;
89 108
90our %CFG; 109our %CFG;
91 110
92our $UPTIME; $UPTIME ||= time; 111our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 112our $RUNTIME;
113our $NOW;
94 114
95our (%PLAYER, %PLAYER_LOADING); # all users 115our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 116our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 117our $LINK_MAP; # the special {link} map, which is always available
98 118
99# used to convert map paths into valid unix filenames by replacing / by ∕ 119# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 121
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
105 126
106binmode STDOUT; 127binmode STDOUT;
107binmode STDERR; 128binmode STDERR;
108 129
109# read virtual server time, if available 130# read virtual server time, if available
… …
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 215
195 LOG llevError, $msg; 216 LOG llevError, $msg;
196 }; 217 };
197} 218}
219
220$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "=="
222
223 if ($Coro::current == $Coro::main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d#
226 }#d#
227
228 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate
231};
232
233$SIG{__DIE__} = sub { }; #d#?
198 234
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
215)) { 251)) {
216 no strict 'refs'; 252 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 254}
219 255
220$Event::DIED = sub { 256$EV::DIED = sub {
221 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
222}; 258};
223 259
224############################################################################# 260#############################################################################
225 261
… …
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 284 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 285 $d
250 } || "[unable to dump $_[0]: '$@']"; 286 } || "[unable to dump $_[0]: '$@']";
251} 287}
252 288
253=item $ref = cf::from_json $json 289=item $ref = cf::decode_json $json
254 290
255Converts a JSON string into the corresponding perl data structure. 291Converts a JSON string into the corresponding perl data structure.
256 292
257=item $json = cf::to_json $ref 293=item $json = cf::encode_json $ref
258 294
259Converts a perl data structure into its JSON representation. 295Converts a perl data structure into its JSON representation.
260 296
261=cut 297=cut
262 298
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 300
265sub to_json ($) { $json_coder->encode ($_[0]) } 301sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 302sub decode_json($) { $json_coder->decode ($_[0]) }
267 303
268=item cf::lock_wait $string 304=item cf::lock_wait $string
269 305
270Wait until the given lock is available. See cf::lock_acquire. 306Wait until the given lock is available. See cf::lock_acquire.
271 307
… …
327 363
328 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
329} 365}
330 366
331sub freeze_mainloop { 367sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
333 369
334 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start; 371}
336 }; 372
337 $TICK_WATCHER->stop; 373=item cf::periodic $interval, $cb
338 $guard 374
375Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer.
377
378=cut
379
380sub periodic($$) {
381 my ($interval, $cb) = @_;
382
383 my $start = rand List::Util::min 180, $interval;
384
385 EV::periodic $start, $interval, 0, $cb
339} 386}
340 387
341=item cf::get_slot $time[, $priority[, $name]] 388=item cf::get_slot $time[, $priority[, $name]]
342 389
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 390Allocate $time seconds of blocking CPU time at priority C<$priority>:
… …
383 } 430 }
384 } 431 }
385}; 432};
386 433
387sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
388 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
389 438
390 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
392 441
… …
422 471
423sub sync_job(&) { 472sub sync_job(&) {
424 my ($job) = @_; 473 my ($job) = @_;
425 474
426 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 476 my $time = EV::time;
428 477
429 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
431 480
432 LOG llevError, Carp::longmess "sync job";#d# 481 LOG llevError, Carp::longmess "sync job";#d#
433 482
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
437 484
438 my $busy = 1; 485 my $busy = 1;
439 my @res; 486 my @res;
440 487
… …
447 494
448 while ($busy) { 495 while ($busy) {
449 if (Coro::nready) { 496 if (Coro::nready) {
450 Coro::cede_notself; 497 Coro::cede_notself;
451 } else { 498 } else {
452 Event::one_event; 499 EV::loop EV::LOOP_ONESHOT;
453 } 500 }
454 } 501 }
455 502
456 $time = Event::time - $time; 503 my $time = EV::time - $time;
457 504
458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
459 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
460
461 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
462 506
463 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
464 } else { 508 } else {
465 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
466 510
… …
491=item fork_call { }, $args 535=item fork_call { }, $args
492 536
493Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
497 541
498=cut 542=cut
499 543
500sub fork_call(&@) { 544sub fork_call(&@) {
501 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
… …
508 reset_signals; 552 reset_signals;
509 &$cb 553 &$cb
510 }, @args; 554 }, @args;
511 555
512 wantarray ? @res : $res[-1] 556 wantarray ? @res : $res[-1]
557}
558
559=item $coin = coin_from_name $name
560
561=cut
562
563our %coin_alias = (
564 "silver" => "silvercoin",
565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
579
580sub coin_from_name($) {
581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
513} 584}
514 585
515=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
516 587
517Returns a single value from the environment database. 588Returns a single value from the environment database.
… …
954 } 1025 }
955 1026
956 0 1027 0
957} 1028}
958 1029
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 1031
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 1033
963Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
964 1035
… …
1042cf::attachable->attach ( 1113cf::attachable->attach (
1043 prio => -1000000, 1114 prio => -1000000,
1044 on_instantiate => sub { 1115 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1116 my ($obj, $data) = @_;
1046 1117
1047 $data = from_json $data; 1118 $data = decode_json $data;
1048 1119
1049 for (@$data) { 1120 for (@$data) {
1050 my ($name, $args) = @$_; 1121 my ($name, $args) = @$_;
1051 1122
1052 $obj->attach ($name, %{$args || {} }); 1123 $obj->attach ($name, %{$args || {} });
… …
1073 utf8::decode (my $decname = $filename); 1144 utf8::decode (my $decname = $filename);
1074 warn sprintf "saving %s (%d,%d)\n", 1145 warn sprintf "saving %s (%d,%d)\n",
1075 $decname, length $$rdata, scalar @$objs; 1146 $decname, length $$rdata, scalar @$objs;
1076 1147
1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1148 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1078 chmod SAVE_MODE, $fh; 1149 aio_chmod $fh, SAVE_MODE;
1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1150 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1080 aio_fsync $fh if $cf::USE_FSYNC; 1151 aio_fsync $fh if $cf::USE_FSYNC;
1081 close $fh; 1152 aio_close $fh;
1082 1153
1083 if (@$objs) { 1154 if (@$objs) {
1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1155 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1085 chmod SAVE_MODE, $fh; 1156 aio_chmod $fh, SAVE_MODE;
1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1157 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087 aio_write $fh, 0, (length $data), $data, 0; 1158 aio_write $fh, 0, (length $data), $data, 0;
1088 aio_fsync $fh if $cf::USE_FSYNC; 1159 aio_fsync $fh if $cf::USE_FSYNC;
1089 close $fh; 1160 aio_close $fh;
1090 aio_rename "$filename.pst~", "$filename.pst"; 1161 aio_rename "$filename.pst~", "$filename.pst";
1091 } 1162 }
1092 } else { 1163 } else {
1093 aio_unlink "$filename.pst"; 1164 aio_unlink "$filename.pst";
1094 } 1165 }
… …
1289 my $msg = $@ ? "$v->{path}: $@\n" 1360 my $msg = $@ ? "$v->{path}: $@\n"
1290 : "$v->{base}: extension inactive.\n"; 1361 : "$v->{base}: extension inactive.\n";
1291 1362
1292 if (exists $v->{meta}{mandatory}) { 1363 if (exists $v->{meta}{mandatory}) {
1293 warn $msg; 1364 warn $msg;
1294 warn "mandatory extension failed to load, exiting.\n"; 1365 cf::cleanup "mandatory extension failed to load, exiting.";
1295 exit 1;
1296 } 1366 }
1297 1367
1298 warn $msg; 1368 warn $msg;
1299 } 1369 }
1300 1370
… …
1389 my $f = new_from_file cf::object::thawer path $login 1459 my $f = new_from_file cf::object::thawer path $login
1390 or return; 1460 or return;
1391 1461
1392 my $pl = cf::player::load_pl $f 1462 my $pl = cf::player::load_pl $f
1393 or return; 1463 or return;
1464
1394 local $cf::PLAYER_LOADING{$login} = $pl; 1465 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs; 1466 $f->resolve_delayed_derefs;
1396 $cf::PLAYER{$login} = $pl 1467 $cf::PLAYER{$login} = $pl
1397 } 1468 }
1398 } 1469 }
… …
1408 1479
1409 return if $pl->{deny_save}; 1480 return if $pl->{deny_save};
1410 1481
1411 aio_mkdir playerdir $pl, 0770; 1482 aio_mkdir playerdir $pl, 0770;
1412 $pl->{last_save} = $cf::RUNTIME; 1483 $pl->{last_save} = $cf::RUNTIME;
1484
1485 cf::get_slot 0.01;
1413 1486
1414 $pl->save_pl ($path); 1487 $pl->save_pl ($path);
1415 cf::cede_to_tick; 1488 cf::cede_to_tick;
1416} 1489}
1417 1490
… …
1453 $pl->{deny_save} = 1; 1526 $pl->{deny_save} = 1;
1454 $pl->password ("*"); # this should lock out the player until we nuked the dir 1527 $pl->password ("*"); # this should lock out the player until we nuked the dir
1455 1528
1456 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1529 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1457 $pl->deactivate; 1530 $pl->deactivate;
1531 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1532 $pl->ob->check_score;
1458 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1533 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1459 $pl->ns->destroy if $pl->ns; 1534 $pl->ns->destroy if $pl->ns;
1460 1535
1461 my $path = playerdir $pl; 1536 my $path = playerdir $pl;
1462 my $temp = "$path~$cf::RUNTIME~deleting~"; 1537 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1501 1576
1502 for my $login (@$dirs) { 1577 for my $login (@$dirs) {
1503 my $path = path $login; 1578 my $path = path $login;
1504 1579
1505 # a .pst is a dead give-away for a valid player 1580 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") { 1581 # if no pst file found, open and chekc for blocked users
1582 if (aio_stat "$path.pst") {
1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1583 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1508 aio_read $fh, 0, 512, my $buf, 0 or next; 1584 aio_read $fh, 0, 512, my $buf, 0 or next;
1509 $buf !~ /^password -------------$/m or next; # official not-valid tag 1585 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 } 1586 }
1511 1587
… …
1710our $MAX_RESET = 3600; 1786our $MAX_RESET = 3600;
1711our $DEFAULT_RESET = 3000; 1787our $DEFAULT_RESET = 3000;
1712 1788
1713sub generate_random_map { 1789sub generate_random_map {
1714 my ($self, $rmp) = @_; 1790 my ($self, $rmp) = @_;
1791
1792 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1793
1715 # mit "rum" bekleckern, nicht 1794 # mit "rum" bekleckern, nicht
1716 $self->_create_random_map ( 1795 $self->_create_random_map (
1717 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1796 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1718 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1797 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1719 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1798 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1841 1920
1842# the temporary/swap location 1921# the temporary/swap location
1843sub save_path { 1922sub save_path {
1844 my ($self) = @_; 1923 my ($self) = @_;
1845 1924
1846 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1925 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1847 "$TMPDIR/$path.map" 1926 "$TMPDIR/$path.map"
1848} 1927}
1849 1928
1850# the unique path, undef == no special unique path 1929# the unique path, undef == no special unique path
1851sub uniq_path { 1930sub uniq_path {
1852 my ($self) = @_; 1931 my ($self) = @_;
1853 1932
1854 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1933 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1855 "$UNIQUEDIR/$path" 1934 "$UNIQUEDIR/$path"
1856} 1935}
1857 1936
1858# and all this just because we cannot iterate over 1937# and all this just because we cannot iterate over
1859# all maps in C++... 1938# all maps in C++...
… …
1957 2036
1958 cf::lock_wait "map_data:$path";#d#remove 2037 cf::lock_wait "map_data:$path";#d#remove
1959 cf::lock_wait "map_find:$path"; 2038 cf::lock_wait "map_find:$path";
1960 2039
1961 $cf::MAP{$path} || do { 2040 $cf::MAP{$path} || do {
1962 my $guard1 = cf::lock_acquire "map_find:$path";
1963 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 2041 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2042 my $guard2 = cf::lock_acquire "map_find:$path";
1964 2043
1965 my $map = new_from_path cf::map $path 2044 my $map = new_from_path cf::map $path
1966 or return; 2045 or return;
1967 2046
1968 $map->{last_save} = $cf::RUNTIME; 2047 $map->{last_save} = $cf::RUNTIME;
… …
1971 or return; 2050 or return;
1972 2051
1973 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2052 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1974 # doing this can freeze the server in a sync job, obviously 2053 # doing this can freeze the server in a sync job, obviously
1975 #$cf::WAIT_FOR_TICK->wait; 2054 #$cf::WAIT_FOR_TICK->wait;
2055 undef $guard2;
1976 undef $guard1; 2056 undef $guard1;
1977 undef $guard2;
1978 $map->reset; 2057 $map->reset;
1979 return find $path; 2058 return find $path;
1980 } 2059 }
1981 2060
1982 $cf::MAP{$path} = $map 2061 $cf::MAP{$path} = $map
… …
2045 } 2124 }
2046 2125
2047 $self->{last_save} = $cf::RUNTIME; 2126 $self->{last_save} = $cf::RUNTIME;
2048 $self->last_access ($cf::RUNTIME); 2127 $self->last_access ($cf::RUNTIME);
2049 2128
2050 $self->in_memory (cf::MAP_IN_MEMORY); 2129 $self->in_memory (cf::MAP_ACTIVE);
2051 } 2130 }
2052 2131
2053 $self->post_load; 2132 $self->post_load;
2054} 2133}
2055 2134
… …
2113 my ($path, $origin, $load) = @_; 2192 my ($path, $origin, $load) = @_;
2114 2193
2115 $path = normalise $path, $origin && $origin->{path}; 2194 $path = normalise $path, $origin && $origin->{path};
2116 2195
2117 if (my $map = $cf::MAP{$path}) { 2196 if (my $map = $cf::MAP{$path}) {
2118 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2197 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2119 } 2198 }
2120 2199
2121 $MAP_PREFETCH{$path} |= $load; 2200 $MAP_PREFETCH{$path} |= $load;
2122 2201
2123 $MAP_PREFETCHER ||= cf::async { 2202 $MAP_PREFETCHER ||= cf::async {
… …
2160 cf::async { 2239 cf::async {
2161 $Coro::current->{desc} = "map player save"; 2240 $Coro::current->{desc} = "map player save";
2162 $_->contr->save for $self->players; 2241 $_->contr->save for $self->players;
2163 }; 2242 };
2164 2243
2244 cf::get_slot 0.02;
2245
2165 if ($uniq) { 2246 if ($uniq) {
2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2247 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2167 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2248 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2168 } else { 2249 } else {
2169 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2250 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2177 $self->save; 2258 $self->save;
2178 2259
2179 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2180 2261
2181 return if $self->players; 2262 return if $self->players;
2182 return if $self->in_memory != cf::MAP_IN_MEMORY; 2263 return if $self->in_memory != cf::MAP_ACTIVE;
2183 return if $self->{deny_save}; 2264 return if $self->{deny_save};
2184 2265
2185 $self->in_memory (cf::MAP_SWAPPED); 2266 $self->in_memory (cf::MAP_SWAPPED);
2186 2267
2187 $self->deactivate; 2268 $self->deactivate;
… …
2305 2386
2306sub unique_maps() { 2387sub unique_maps() {
2307 [ 2388 [
2308 map { 2389 map {
2309 utf8::decode $_; 2390 utf8::decode $_;
2310 /\.map$/ 2391 s/\.map$//; # TODO future compatibility hack
2392 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2393 ? ()
2311 ? normalise $_ 2394 : normalise $_
2312 : ()
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2395 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2396 ]
2315} 2397}
2316 2398
2317package cf;
2318
2319=back 2399=back
2320 2400
2321=head3 cf::object 2401=head3 cf::object
2322 2402
2323=cut 2403=cut
… …
2326 2406
2327=over 4 2407=over 4
2328 2408
2329=item $ob->inv_recursive 2409=item $ob->inv_recursive
2330 2410
2331Returns the inventory of the object _and_ their inventories, recursively. 2411Returns the inventory of the object I<and> their inventories, recursively,
2412but I<not> the object itself.
2332 2413
2333=cut 2414=cut
2334 2415
2335sub inv_recursive_; 2416sub inv_recursive_;
2336sub inv_recursive_ { 2417sub inv_recursive_ {
… …
2341 inv_recursive_ inv $_[0] 2422 inv_recursive_ inv $_[0]
2342} 2423}
2343 2424
2344=item $ref = $ob->ref 2425=item $ref = $ob->ref
2345 2426
2346creates and returns a persistent reference to an objetc that can be stored as a string. 2427Creates and returns a persistent reference to an object that can be stored as a string.
2347 2428
2348=item $ob = cf::object::deref ($refstring) 2429=item $ob = cf::object::deref ($refstring)
2349 2430
2350returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2431returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2351even if the object actually exists. May block. 2432even if the object actually exists. May block.
… …
2383can be C<undef>. Does the right thing when the player is currently in a 2464can be C<undef>. Does the right thing when the player is currently in a
2384dialogue with the given NPC character. 2465dialogue with the given NPC character.
2385 2466
2386=cut 2467=cut
2387 2468
2469our $SAY_CHANNEL = {
2470 id => "say",
2471 title => "Map",
2472 reply => "say ",
2473 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2474};
2475
2476our $CHAT_CHANNEL = {
2477 id => "chat",
2478 title => "Chat",
2479 reply => "chat ",
2480 tooltip => "Player chat and shouts, global to the server.",
2481};
2482
2388# rough implementation of a future "reply" method that works 2483# rough implementation of a future "reply" method that works
2389# with dialog boxes. 2484# with dialog boxes.
2390#TODO: the first argument must go, split into a $npc->reply_to ( method 2485#TODO: the first argument must go, split into a $npc->reply_to ( method
2391sub cf::object::player::reply($$$;$) { 2486sub cf::object::player::reply($$$;$) {
2392 my ($self, $npc, $msg, $flags) = @_; 2487 my ($self, $npc, $msg, $flags) = @_;
… …
2403 my $dialog = $pl->{npc_dialog}; 2498 my $dialog = $pl->{npc_dialog};
2404 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2499 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2405 2500
2406 } else { 2501 } else {
2407 $msg = $npc->name . " says: $msg" if $npc; 2502 $msg = $npc->name . " says: $msg" if $npc;
2408 $self->message ($msg, $flags); 2503 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2409 } 2504 }
2410 } 2505 }
2411} 2506}
2412 2507
2413=item $object->send_msg ($channel, $msg, $color, [extra...]) 2508=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2608} 2703}
2609 2704
2610sub prepare_random_map { 2705sub prepare_random_map {
2611 my ($exit) = @_; 2706 my ($exit) = @_;
2612 2707
2613 my $guard = cf::lock_acquire "exit_prepare:$exit";
2614
2615 # all this does is basically replace the /! path by 2708 # all this does is basically replace the /! path by
2616 # a new random map path (?random/...) with a seed 2709 # a new random map path (?random/...) with a seed
2617 # that depends on the exit object 2710 # that depends on the exit object
2618 2711
2619 my $rmp = parse_random_map_params $exit->msg; 2712 my $rmp = parse_random_map_params $exit->msg;
… …
2621 if ($exit->map) { 2714 if ($exit->map) {
2622 $rmp->{region} = $exit->region->name; 2715 $rmp->{region} = $exit->region->name;
2623 $rmp->{origin_map} = $exit->map->path; 2716 $rmp->{origin_map} = $exit->map->path;
2624 $rmp->{origin_x} = $exit->x; 2717 $rmp->{origin_x} = $exit->x;
2625 $rmp->{origin_y} = $exit->y; 2718 $rmp->{origin_y} = $exit->y;
2719
2720 $exit->map->touch;
2626 } 2721 }
2627 2722
2628 $rmp->{random_seed} ||= $exit->random_seed; 2723 $rmp->{random_seed} ||= $exit->random_seed;
2629 2724
2630 my $data = cf::to_json $rmp; 2725 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2631 my $md5 = Digest::MD5::md5_hex $data; 2726 my $md5 = Digest::MD5::md5_hex $data;
2632 my $meta = "$RANDOMDIR/$md5.meta"; 2727 my $meta = "$RANDOMDIR/$md5.meta";
2633 2728
2634 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2729 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2635 aio_write $fh, 0, (length $data), $data, 0; 2730 aio_write $fh, 0, (length $data), $data, 0;
2636 undef $fh; 2731 undef $fh;
2637 aio_rename "$meta~", $meta; 2732 aio_rename "$meta~", $meta;
2638 2733
2734 my $slaying = "?random/$md5";
2735
2736 if ($exit->valid) {
2639 $exit->slaying ("?random/$md5"); 2737 $exit->slaying ("?random/$md5");
2640 $exit->msg (undef); 2738 $exit->msg (undef);
2739 }
2641 } 2740 }
2642} 2741}
2643 2742
2644sub cf::object::player::enter_exit { 2743sub cf::object::player::enter_exit {
2645 my ($self, $exit) = @_; 2744 my ($self, $exit) = @_;
2646 2745
2647 return unless $self->type == cf::PLAYER; 2746 return unless $self->type == cf::PLAYER;
2648 2747
2649 if ($exit->slaying eq "/!") {
2650 #TODO: this should de-fi-ni-te-ly not be a sync-job
2651 # the problem is that $exit might not survive long enough
2652 # so it needs to be done right now, right here
2653 cf::sync_job { prepare_random_map $exit };
2654 }
2655
2656 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2657 my $hp = $exit->stats->hp;
2658 my $sp = $exit->stats->sp;
2659
2660 $self->enter_link; 2748 $self->enter_link;
2661 2749
2662 # if exit is damned, update players death & WoR home-position
2663 $self->contr->savebed ($slaying, $hp, $sp)
2664 if $exit->flag (FLAG_DAMNED);
2665
2666 (async { 2750 (async {
2667 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2751 $Coro::current->{desc} = "enter_exit";
2668 2752
2669 $self->deactivate_recursive; # just to be sure
2670 unless (eval { 2753 unless (eval {
2754 $self->deactivate_recursive; # just to be sure
2755
2756 # random map handling
2757 {
2758 my $guard = cf::lock_acquire "exit_prepare:$exit";
2759
2760 prepare_random_map $exit
2761 if $exit->slaying eq "/!";
2762 }
2763
2764 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2765 my $x = $exit->stats->hp;
2766 my $y = $exit->stats->sp;
2767
2671 $self->goto ($slaying, $hp, $sp); 2768 $self->goto ($map, $x, $y);
2672 2769
2770 # if exit is damned, update players death & WoR home-position
2771 $self->contr->savebed ($map, $x, $y)
2772 if $exit->flag (cf::FLAG_DAMNED);
2773
2673 1; 2774 1
2674 }) { 2775 }) {
2675 $self->message ("Something went wrong deep within the crossfire server. " 2776 $self->message ("Something went wrong deep within the crossfire server. "
2676 . "I'll try to bring you back to the map you were before. " 2777 . "I'll try to bring you back to the map you were before. "
2677 . "Please report this to the dungeon master!", 2778 . "Please report this to the dungeon master!",
2678 cf::NDI_UNIQUE | cf::NDI_RED); 2779 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2758 id => "infobox", 2859 id => "infobox",
2759 title => "Map Info", 2860 title => "Map Info",
2760 reply => undef, 2861 reply => undef,
2761 tooltip => "Information related to the maps", 2862 tooltip => "Information related to the maps",
2762 }, 2863 },
2864 "c/party" => {
2865 id => "party",
2866 title => "Party",
2867 reply => "gsay ",
2868 tooltip => "Messages and chat related to your party",
2869 },
2763); 2870);
2764 2871
2765sub cf::client::send_msg { 2872sub cf::client::send_msg {
2766 my ($self, $channel, $msg, $color, @extra) = @_; 2873 my ($self, $channel, $msg, $color, @extra) = @_;
2767 2874
… …
3004 3111
3005The following functions and methods are available within a safe environment: 3112The following functions and methods are available within a safe environment:
3006 3113
3007 cf::object 3114 cf::object
3008 contr pay_amount pay_player map x y force_find force_add destroy 3115 contr pay_amount pay_player map x y force_find force_add destroy
3009 insert remove name archname title slaying race decrease_ob_nr 3116 insert remove name archname title slaying race decrease split
3010 3117
3011 cf::object::player 3118 cf::object::player
3012 player 3119 player
3013 3120
3014 cf::player 3121 cf::player
… …
3019 3126
3020=cut 3127=cut
3021 3128
3022for ( 3129for (
3023 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3130 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3024 insert remove inv name archname title slaying race 3131 insert remove inv nrof name archname title slaying race
3025 decrease_ob_nr destroy)], 3132 decrease split destroy)],
3026 ["cf::object::player" => qw(player)], 3133 ["cf::object::player" => qw(player)],
3027 ["cf::player" => qw(peaceful)], 3134 ["cf::player" => qw(peaceful)],
3028 ["cf::map" => qw(trigger)], 3135 ["cf::map" => qw(trigger)],
3029) { 3136) {
3030 no strict 'refs'; 3137 no strict 'refs';
… …
3135 { 3242 {
3136 my $faces = $facedata->{faceinfo}; 3243 my $faces = $facedata->{faceinfo};
3137 3244
3138 while (my ($face, $info) = each %$faces) { 3245 while (my ($face, $info) = each %$faces) {
3139 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3246 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3247
3140 cf::face::set_visibility $idx, $info->{visibility}; 3248 cf::face::set_visibility $idx, $info->{visibility};
3141 cf::face::set_magicmap $idx, $info->{magicmap}; 3249 cf::face::set_magicmap $idx, $info->{magicmap};
3142 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3250 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3143 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3251 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3144 3252
3145 cf::cede_to_tick; 3253 cf::cede_to_tick;
3146 } 3254 }
3147 3255
3148 while (my ($face, $info) = each %$faces) { 3256 while (my ($face, $info) = each %$faces) {
3149 next unless $info->{smooth}; 3257 next unless $info->{smooth};
3258
3150 my $idx = cf::face::find $face 3259 my $idx = cf::face::find $face
3151 or next; 3260 or next;
3261
3152 if (my $smooth = cf::face::find $info->{smooth}) { 3262 if (my $smooth = cf::face::find $info->{smooth}) {
3153 cf::face::set_smooth $idx, $smooth; 3263 cf::face::set_smooth $idx, $smooth;
3154 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3264 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3155 } else { 3265 } else {
3156 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3266 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3174 { 3284 {
3175 # TODO: for gcfclient pleasure, we should give resources 3285 # TODO: for gcfclient pleasure, we should give resources
3176 # that gcfclient doesn't grok a >10000 face index. 3286 # that gcfclient doesn't grok a >10000 face index.
3177 my $res = $facedata->{resource}; 3287 my $res = $facedata->{resource};
3178 3288
3179 my $soundconf = delete $res->{"res/sound.conf"};
3180
3181 while (my ($name, $info) = each %$res) { 3289 while (my ($name, $info) = each %$res) {
3290 if (defined $info->{type}) {
3182 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3291 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3183 my $data; 3292 my $data;
3184 3293
3185 if ($info->{type} & 1) { 3294 if ($info->{type} & 1) {
3186 # prepend meta info 3295 # prepend meta info
3187 3296
3188 my $meta = $enc->encode ({ 3297 my $meta = $enc->encode ({
3189 name => $name, 3298 name => $name,
3190 %{ $info->{meta} || {} }, 3299 %{ $info->{meta} || {} },
3191 }); 3300 });
3192 3301
3193 $data = pack "(w/a*)*", $meta, $info->{data}; 3302 $data = pack "(w/a*)*", $meta, $info->{data};
3303 } else {
3304 $data = $info->{data};
3305 }
3306
3307 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3308 cf::face::set_type $idx, $info->{type};
3194 } else { 3309 } else {
3195 $data = $info->{data}; 3310 $RESOURCE{$name} = $info;
3196 } 3311 }
3197 3312
3198 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3199 cf::face::set_type $idx, $info->{type};
3200
3201 cf::cede_to_tick; 3313 cf::cede_to_tick;
3202 } 3314 }
3203
3204 if ($soundconf) {
3205 $soundconf = $enc->decode (delete $soundconf->{data});
3206
3207 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3208 my $sound = $soundconf->{compat}[$_]
3209 or next;
3210
3211 my $face = cf::face::find "sound/$sound->[1]";
3212 cf::sound::set $sound->[0] => $face;
3213 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3214 }
3215
3216 while (my ($k, $v) = each %{$soundconf->{event}}) {
3217 my $face = cf::face::find "sound/$v";
3218 cf::sound::set $k => $face;
3219 }
3220 }
3221 } 3315 }
3316
3317 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3222 3318
3223 1 3319 1
3224} 3320}
3321
3322cf::global->attach (on_resource_update => sub {
3323 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3324 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3325
3326 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3327 my $sound = $soundconf->{compat}[$_]
3328 or next;
3329
3330 my $face = cf::face::find "sound/$sound->[1]";
3331 cf::sound::set $sound->[0] => $face;
3332 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3333 }
3334
3335 while (my ($k, $v) = each %{$soundconf->{event}}) {
3336 my $face = cf::face::find "sound/$v";
3337 cf::sound::set $k => $face;
3338 }
3339 }
3340});
3225 3341
3226register_exticmd fx_want => sub { 3342register_exticmd fx_want => sub {
3227 my ($ns, $want) = @_; 3343 my ($ns, $want) = @_;
3228 3344
3229 while (my ($k, $v) = each %$want) { 3345 while (my ($k, $v) = each %$want) {
3230 $ns->fx_want ($k, $v); 3346 $ns->fx_want ($k, $v);
3231 } 3347 }
3232}; 3348};
3349
3350sub load_resource_file($) {
3351 my $guard = lock_acquire "load_resource_file";
3352
3353 my $status = load_resource_file_ $_[0];
3354 get_slot 0.1, 100;
3355 cf::arch::commit_load;
3356
3357 $status
3358}
3233 3359
3234sub reload_regions { 3360sub reload_regions {
3235 # HACK to clear player env face cache, we need some signal framework 3361 # HACK to clear player env face cache, we need some signal framework
3236 # for this (global event?) 3362 # for this (global event?)
3237 %ext::player_env::MUSIC_FACE_CACHE = (); 3363 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3251} 3377}
3252 3378
3253sub reload_archetypes { 3379sub reload_archetypes {
3254 load_resource_file "$DATADIR/archetypes" 3380 load_resource_file "$DATADIR/archetypes"
3255 or die "unable to load archetypes\n"; 3381 or die "unable to load archetypes\n";
3256 #d# NEED to laod twice to resolve forward references
3257 # this really needs to be done in an extra post-pass
3258 # (which needs to be synchronous, so solve it differently)
3259 load_resource_file "$DATADIR/archetypes"
3260 or die "unable to load archetypes\n";
3261} 3382}
3262 3383
3263sub reload_treasures { 3384sub reload_treasures {
3264 load_resource_file "$DATADIR/treasures" 3385 load_resource_file "$DATADIR/treasures"
3265 or die "unable to load treasurelists\n"; 3386 or die "unable to load treasurelists\n";
3266} 3387}
3267 3388
3268sub reload_resources { 3389sub reload_resources {
3269 warn "reloading resource files...\n"; 3390 warn "reloading resource files...\n";
3270 3391
3392 reload_facedata;
3393 reload_archetypes;
3271 reload_regions; 3394 reload_regions;
3272 reload_facedata;
3273 #reload_archetypes;#d#
3274 reload_archetypes;
3275 reload_treasures; 3395 reload_treasures;
3276 3396
3277 warn "finished reloading resource files\n"; 3397 warn "finished reloading resource files\n";
3278} 3398}
3279 3399
3280sub init { 3400sub init {
3401 my $guard = freeze_mainloop;
3402
3281 reload_resources; 3403 reload_resources;
3282} 3404}
3283 3405
3284sub reload_config { 3406sub reload_config {
3285 open my $fh, "<:utf8", "$CONFDIR/config" 3407 open my $fh, "<:utf8", "$CONFDIR/config"
3286 or return; 3408 or return;
3287 3409
3288 local $/; 3410 local $/;
3289 *CFG = YAML::Syck::Load <$fh>; 3411 *CFG = YAML::Load <$fh>;
3290 3412
3291 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3413 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3292 3414
3293 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3415 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3294 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3416 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3306 # we must not ever block the main coroutine 3428 # we must not ever block the main coroutine
3307 local $Coro::idle = sub { 3429 local $Coro::idle = sub {
3308 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3430 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3309 (async { 3431 (async {
3310 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3432 $Coro::current->{desc} = "IDLE BUG HANDLER";
3311 Event::one_event; 3433 EV::loop EV::LOOP_ONESHOT;
3312 })->prio (Coro::PRIO_MAX); 3434 })->prio (Coro::PRIO_MAX);
3313 }; 3435 };
3314 3436
3437 {
3438 my $guard = freeze_mainloop;
3315 reload_config; 3439 reload_config;
3316 db_init; 3440 db_init;
3317 load_extensions; 3441 load_extensions;
3318 3442
3319 $TICK_WATCHER->start; 3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3444 }
3445
3320 Event::loop; 3446 EV::loop;
3321} 3447}
3322 3448
3323############################################################################# 3449#############################################################################
3324# initialisation and cleanup 3450# initialisation and cleanup
3325 3451
3326# install some emergency cleanup handlers 3452# install some emergency cleanup handlers
3327BEGIN { 3453BEGIN {
3454 our %SIGWATCHER = ();
3328 for my $signal (qw(INT HUP TERM)) { 3455 for my $signal (qw(INT HUP TERM)) {
3329 Event->signal ( 3456 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3330 reentrant => 0,
3331 data => WF_AUTOCANCEL,
3332 signal => $signal,
3333 prio => 0,
3334 cb => sub {
3335 cf::cleanup "SIG$signal"; 3457 cf::cleanup "SIG$signal";
3336 },
3337 ); 3458 };
3338 } 3459 }
3339} 3460}
3340 3461
3341sub write_runtime { 3462sub write_runtime_sync {
3342 my $runtime = "$LOCALDIR/runtime"; 3463 my $runtime = "$LOCALDIR/runtime";
3343 3464
3344 # first touch the runtime file to show we are still running: 3465 # first touch the runtime file to show we are still running:
3345 # the fsync below can take a very very long time. 3466 # the fsync below can take a very very long time.
3346 3467
… …
3372 and return; 3493 and return;
3373 3494
3374 warn "runtime file written.\n"; 3495 warn "runtime file written.\n";
3375 3496
3376 1 3497 1
3498}
3499
3500our $uuid_lock;
3501our $uuid_skip;
3502
3503sub write_uuid_sync($) {
3504 $uuid_skip ||= $_[0];
3505
3506 return if $uuid_lock;
3507 local $uuid_lock = 1;
3508
3509 my $uuid = "$LOCALDIR/uuid";
3510
3511 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3512 or return;
3513
3514 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3515 $uuid_skip = 0;
3516
3517 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3518 and return;
3519
3520 # always fsync - this file is important
3521 aio_fsync $fh
3522 and return;
3523
3524 close $fh
3525 or return;
3526
3527 aio_rename "$uuid~", $uuid
3528 and return;
3529
3530 warn "uuid file written ($value).\n";
3531
3532 1
3533
3534}
3535
3536sub write_uuid($$) {
3537 my ($skip, $sync) = @_;
3538
3539 $sync ? write_uuid_sync $skip
3540 : async { write_uuid_sync $skip };
3377} 3541}
3378 3542
3379sub emergency_save() { 3543sub emergency_save() {
3380 my $freeze_guard = cf::freeze_mainloop; 3544 my $freeze_guard = cf::freeze_mainloop;
3381 3545
… …
3403 warn "end emergency map save\n"; 3567 warn "end emergency map save\n";
3404 3568
3405 warn "begin emergency database checkpoint\n"; 3569 warn "begin emergency database checkpoint\n";
3406 BDB::db_env_txn_checkpoint $DB_ENV; 3570 BDB::db_env_txn_checkpoint $DB_ENV;
3407 warn "end emergency database checkpoint\n"; 3571 warn "end emergency database checkpoint\n";
3572
3573 warn "begin write uuid\n";
3574 write_uuid_sync 1;
3575 warn "end write uuid\n";
3408 }; 3576 };
3409 3577
3410 warn "leave emergency perl save\n"; 3578 warn "leave emergency perl save\n";
3411} 3579}
3412 3580
… …
3427 warn "reloading..."; 3595 warn "reloading...";
3428 3596
3429 warn "entering sync_job"; 3597 warn "entering sync_job";
3430 3598
3431 cf::sync_job { 3599 cf::sync_job {
3432 cf::write_runtime; # external watchdog should not bark 3600 cf::write_runtime_sync; # external watchdog should not bark
3433 cf::emergency_save; 3601 cf::emergency_save;
3434 cf::write_runtime; # external watchdog should not bark 3602 cf::write_runtime_sync; # external watchdog should not bark
3435 3603
3436 warn "syncing database to disk"; 3604 warn "syncing database to disk";
3437 BDB::db_env_txn_checkpoint $DB_ENV; 3605 BDB::db_env_txn_checkpoint $DB_ENV;
3438 3606
3439 # if anything goes wrong in here, we should simply crash as we already saved 3607 # if anything goes wrong in here, we should simply crash as we already saved
3440
3441 warn "cancelling all WF_AUTOCANCEL watchers";
3442 for (Event::all_watchers) {
3443 $_->cancel if $_->data & WF_AUTOCANCEL;
3444 }
3445 3608
3446 warn "flushing outstanding aio requests"; 3609 warn "flushing outstanding aio requests";
3447 for (;;) { 3610 for (;;) {
3448 BDB::flush; 3611 BDB::flush;
3449 IO::AIO::flush; 3612 IO::AIO::flush;
… …
3531 warn "leaving sync_job"; 3694 warn "leaving sync_job";
3532 3695
3533 1 3696 1
3534 } or do { 3697 } or do {
3535 warn $@; 3698 warn $@;
3536 warn "error while reloading, exiting."; 3699 cf::cleanup "error while reloading, exiting.";
3537 exit 1;
3538 }; 3700 };
3539 3701
3540 warn "reloaded"; 3702 warn "reloaded";
3541}; 3703};
3542 3704
… …
3544 3706
3545sub reload_perl() { 3707sub reload_perl() {
3546 # doing reload synchronously and two reloads happen back-to-back, 3708 # doing reload synchronously and two reloads happen back-to-back,
3547 # coro crashes during coro_state_free->destroy here. 3709 # coro crashes during coro_state_free->destroy here.
3548 3710
3549 $RELOAD_WATCHER ||= Event->timer ( 3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3550 reentrant => 0,
3551 after => 0,
3552 data => WF_AUTOCANCEL,
3553 cb => sub {
3554 do_reload_perl; 3712 do_reload_perl;
3555 undef $RELOAD_WATCHER; 3713 undef $RELOAD_WATCHER;
3556 },
3557 ); 3714 };
3558} 3715}
3559 3716
3560register_command "reload" => sub { 3717register_command "reload" => sub {
3561 my ($who, $arg) = @_; 3718 my ($who, $arg) = @_;
3562 3719
… …
3575 3732
3576our @WAIT_FOR_TICK; 3733our @WAIT_FOR_TICK;
3577our @WAIT_FOR_TICK_BEGIN; 3734our @WAIT_FOR_TICK_BEGIN;
3578 3735
3579sub wait_for_tick { 3736sub wait_for_tick {
3580 return unless $TICK_WATCHER->is_active;
3581 return if $Coro::current == $Coro::main; 3737 return if tick_inhibit || $Coro::current == $Coro::main;
3582 3738
3583 my $signal = new Coro::Signal; 3739 my $signal = new Coro::Signal;
3584 push @WAIT_FOR_TICK, $signal; 3740 push @WAIT_FOR_TICK, $signal;
3585 $signal->wait; 3741 $signal->wait;
3586} 3742}
3587 3743
3588sub wait_for_tick_begin { 3744sub wait_for_tick_begin {
3589 return unless $TICK_WATCHER->is_active;
3590 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
3591 3746
3592 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
3593 push @WAIT_FOR_TICK_BEGIN, $signal; 3748 push @WAIT_FOR_TICK_BEGIN, $signal;
3594 $signal->wait; 3749 $signal->wait;
3595} 3750}
3596 3751
3597$TICK_WATCHER = Event->timer ( 3752sub tick {
3598 reentrant => 0,
3599 parked => 1,
3600 prio => 0,
3601 at => $NEXT_TICK || $TICK,
3602 data => WF_AUTOCANCEL,
3603 cb => sub {
3604 if ($Coro::current != $Coro::main) { 3753 if ($Coro::current != $Coro::main) {
3605 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3754 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3606 unless ++$bug_warning > 10; 3755 unless ++$bug_warning > 10;
3607 return; 3756 return;
3608 } 3757 }
3609 3758
3610 $NOW = $tick_start = Event::time;
3611
3612 cf::server_tick; # one server iteration 3759 cf::server_tick; # one server iteration
3613 3760
3614 $RUNTIME += $TICK;
3615 $NEXT_TICK += $TICK;
3616
3617 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3761 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3618 $NEXT_RUNTIME_WRITE = $NOW + 10; 3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3619 Coro::async_pool { 3763 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver"; 3764 $Coro::current->{desc} = "runtime saver";
3621 write_runtime 3765 write_runtime_sync
3622 or warn "ERROR: unable to write runtime file: $!"; 3766 or warn "ERROR: unable to write runtime file: $!";
3623 };
3624 } 3767 };
3768 }
3625 3769
3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3770 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3627 $sig->send; 3771 $sig->send;
3628 } 3772 }
3629 while (my $sig = shift @WAIT_FOR_TICK) { 3773 while (my $sig = shift @WAIT_FOR_TICK) {
3630 $sig->send; 3774 $sig->send;
3631 } 3775 }
3632 3776
3633 $NOW = Event::time; 3777 $LOAD = ($NOW - $TICK_START) / $TICK;
3634
3635 # if we are delayed by four ticks or more, skip them all
3636 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3637
3638 $TICK_WATCHER->at ($NEXT_TICK);
3639 $TICK_WATCHER->start;
3640
3641 $LOAD = ($NOW - $tick_start) / $TICK;
3642 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3778 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3643 3779
3644 _post_tick; 3780 if (0) {
3781 if ($NEXT_TICK) {
3782 my $jitter = $TICK_START - $NEXT_TICK;
3783 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3784 warn "jitter $JITTER\n";#d#
3785 }
3645 }, 3786 }
3646); 3787}
3647 3788
3648{ 3789{
3790 # configure BDB
3791
3649 BDB::min_parallel 8; 3792 BDB::min_parallel 8;
3650 BDB::max_poll_time $TICK * 0.1; 3793 BDB::max_poll_reqs $TICK * 0.1;
3651 $BDB_POLL_WATCHER = Event->io ( 3794 $AnyEvent::BDB::WATCHER->priority (1);
3652 reentrant => 0,
3653 fd => BDB::poll_fileno,
3654 poll => 'r',
3655 prio => 0,
3656 data => WF_AUTOCANCEL,
3657 cb => \&BDB::poll_cb,
3658 );
3659
3660 BDB::set_sync_prepare {
3661 my $status;
3662 my $current = $Coro::current;
3663 (
3664 sub {
3665 $status = $!;
3666 $current->ready; undef $current;
3667 },
3668 sub {
3669 Coro::schedule while defined $current;
3670 $! = $status;
3671 },
3672 )
3673 };
3674 3795
3675 unless ($DB_ENV) { 3796 unless ($DB_ENV) {
3676 $DB_ENV = BDB::db_env_create; 3797 $DB_ENV = BDB::db_env_create;
3677 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3678 | BDB::LOG_AUTOREMOVE, 1); 3799 | BDB::LOG_AUTOREMOVE, 1);
… …
3693 3814
3694 cf::cleanup "db_env_open(db): $@" if $@; 3815 cf::cleanup "db_env_open(db): $@" if $@;
3695 }; 3816 };
3696 } 3817 }
3697 3818
3698 $BDB_DEADLOCK_WATCHER = Event->timer ( 3819 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3699 after => 3,
3700 interval => 1,
3701 hard => 1,
3702 prio => 0,
3703 data => WF_AUTOCANCEL,
3704 cb => sub {
3705 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3820 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3706 },
3707 ); 3821 };
3708 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3822 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3709 after => 11,
3710 interval => 60,
3711 hard => 1,
3712 prio => 0,
3713 data => WF_AUTOCANCEL,
3714 cb => sub {
3715 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3823 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3716 },
3717 ); 3824 };
3718 $BDB_TRICKLE_WATCHER = Event->timer ( 3825 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3719 after => 5,
3720 interval => 10,
3721 hard => 1,
3722 prio => 0,
3723 data => WF_AUTOCANCEL,
3724 cb => sub {
3725 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3826 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3726 },
3727 ); 3827 };
3728} 3828}
3729 3829
3730{ 3830{
3831 # configure IO::AIO
3832
3731 IO::AIO::min_parallel 8; 3833 IO::AIO::min_parallel 8;
3732
3733 undef $Coro::AIO::WATCHER;
3734 IO::AIO::max_poll_time $TICK * 0.1; 3834 IO::AIO::max_poll_time $TICK * 0.1;
3735 $AIO_POLL_WATCHER = Event->io ( 3835 #undef $AnyEvent::AIO::WATCHER;
3736 reentrant => 0,
3737 data => WF_AUTOCANCEL,
3738 fd => IO::AIO::poll_fileno,
3739 poll => 'r',
3740 prio => 0,
3741 cb => \&IO::AIO::poll_cb,
3742 );
3743} 3836}
3744 3837
3745my $_log_backtrace; 3838my $_log_backtrace;
3746 3839
3747sub _log_backtrace { 3840sub _log_backtrace {
… …
3785# load additional modules 3878# load additional modules
3786use cf::pod; 3879use cf::pod;
3787 3880
3788END { cf::emergency_save } 3881END { cf::emergency_save }
3789 3882
3883evthread_start IO::AIO::poll_fileno;
3884
37901 38851
3791 3886

Diff Legend

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