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.394 by root, Thu Nov 8 19:43:25 2007 UTC vs.
Revision 1.435 by root, Thu May 29 03:33:20 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;
36 61
37# configure various modules to our taste 62# configure various modules to our taste
38# 63#
39$Storable::canonical = 1; # reduce rsync transfers 64$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 65Coro::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 66Compress::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 67
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 68$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 69
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 71
… …
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 90our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 92our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 93our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 94our $BDBDIR = "$LOCALDIR/db";
95our %RESOURCE;
75 96
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 97our $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 98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 99our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 100our $USE_FSYNC = 1; # use fsync to write maps - default off
83 101
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 102our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 103our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 104our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 105our $DB_ENV;
89 106
90our %CFG; 107our %CFG;
91 108
92our $UPTIME; $UPTIME ||= time; 109our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 110our $RUNTIME;
111our $NOW;
94 112
95our (%PLAYER, %PLAYER_LOADING); # all users 113our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 114our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 115our $LINK_MAP; # the special {link} map, which is always available
98 116
99# used to convert map paths into valid unix filenames by replacing / by ∕ 117# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 118our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 119
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 120our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 121our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 123our $TICK_START; # for load detecting purposes
105 124
106binmode STDOUT; 125binmode STDOUT;
107binmode STDERR; 126binmode STDERR;
108 127
109# read virtual server time, if available 128# read virtual server time, if available
… …
162 181
163The raw value load value from the last tick. 182The raw value load value from the last tick.
164 183
165=item %cf::CFG 184=item %cf::CFG
166 185
167Configuration for the server, loaded from C</etc/crossfire/config>, or 186Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 187from wherever your confdir points to.
169 188
170=item cf::wait_for_tick, cf::wait_for_tick_begin 189=item cf::wait_for_tick, cf::wait_for_tick_begin
171 190
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 191These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
… …
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 212 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 213
195 LOG llevError, $msg; 214 LOG llevError, $msg;
196 }; 215 };
197} 216}
217
218$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "=="
220
221 if ($Coro::current == $Coro::main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d#
224 }#d#
225
226 # kill coroutine otherwise
227 warn Carp::longmess $_[0];
228 Coro::terminate
229};
230
231$SIG{__DIE__} = sub { }; #d#?
198 232
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
215)) { 249)) {
216 no strict 'refs'; 250 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 251 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 252}
219 253
220$Event::DIED = sub { 254$EV::DIED = sub {
221 warn "error in event callback: @_"; 255 warn "error in event callback: @_";
222}; 256};
223 257
224############################################################################# 258#############################################################################
225 259
… …
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 282 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 283 $d
250 } || "[unable to dump $_[0]: '$@']"; 284 } || "[unable to dump $_[0]: '$@']";
251} 285}
252 286
253=item $ref = cf::from_json $json 287=item $ref = cf::decode_json $json
254 288
255Converts a JSON string into the corresponding perl data structure. 289Converts a JSON string into the corresponding perl data structure.
256 290
257=item $json = cf::to_json $ref 291=item $json = cf::encode_json $ref
258 292
259Converts a perl data structure into its JSON representation. 293Converts a perl data structure into its JSON representation.
260 294
261=cut 295=cut
262 296
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 297our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 298
265sub to_json ($) { $json_coder->encode ($_[0]) } 299sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 300sub decode_json($) { $json_coder->decode ($_[0]) }
267 301
268=item cf::lock_wait $string 302=item cf::lock_wait $string
269 303
270Wait until the given lock is available. See cf::lock_acquire. 304Wait until the given lock is available. See cf::lock_acquire.
271 305
… …
327 361
328 ! ! $LOCK{$key} 362 ! ! $LOCK{$key}
329} 363}
330 364
331sub freeze_mainloop { 365sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 366 tick_inhibit_inc;
333 367
334 my $guard = Coro::guard { 368 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start; 369}
336 }; 370
337 $TICK_WATCHER->stop; 371=item cf::periodic $interval, $cb
338 $guard 372
373Like EV::periodic, but randomly selects a starting point so that the actions
374get spread over timer.
375
376=cut
377
378sub periodic($$) {
379 my ($interval, $cb) = @_;
380
381 my $start = rand List::Util::min 180, $interval;
382
383 EV::periodic $start, $interval, 0, $cb
339} 384}
340 385
341=item cf::get_slot $time[, $priority[, $name]] 386=item cf::get_slot $time[, $priority[, $name]]
342 387
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 388Allocate $time seconds of blocking CPU time at priority C<$priority>:
… …
383 } 428 }
384 } 429 }
385}; 430};
386 431
387sub get_slot($;$$) { 432sub get_slot($;$$) {
433 return if tick_inhibit || $Coro::current == $Coro::main;
434
388 my ($time, $pri, $name) = @_; 435 my ($time, $pri, $name) = @_;
389 436
390 $time = $TICK * .6 if $time > $TICK * .6; 437 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal; 438 my $sig = new Coro::Signal;
392 439
… …
422 469
423sub sync_job(&) { 470sub sync_job(&) {
424 my ($job) = @_; 471 my ($job) = @_;
425 472
426 if ($Coro::current == $Coro::main) { 473 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 474 my $time = EV::time;
428 475
429 # this is the main coro, too bad, we have to block 476 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 477 # till the operation succeeds, freezing the server :/
431 478
432 LOG llevError, Carp::longmess "sync job";#d# 479 LOG llevError, Carp::longmess "sync job";#d#
433 480
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 481 my $freeze_guard = freeze_mainloop;
437 482
438 my $busy = 1; 483 my $busy = 1;
439 my @res; 484 my @res;
440 485
… …
447 492
448 while ($busy) { 493 while ($busy) {
449 if (Coro::nready) { 494 if (Coro::nready) {
450 Coro::cede_notself; 495 Coro::cede_notself;
451 } else { 496 } else {
452 Event::one_event; 497 EV::loop EV::LOOP_ONESHOT;
453 } 498 }
454 } 499 }
455 500
456 $time = Event::time - $time; 501 my $time = EV::time - $time;
457 502
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 503 $TICK_START += $time; # do not account sync jobs to server load
462 504
463 wantarray ? @res : $res[0] 505 wantarray ? @res : $res[0]
464 } else { 506 } else {
465 # we are in another coroutine, how wonderful, everything just works 507 # we are in another coroutine, how wonderful, everything just works
466 508
… …
491=item fork_call { }, $args 533=item fork_call { }, $args
492 534
493Executes the given code block with the given arguments in a seperate 535Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 536process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 537Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 538never block itself or use any form of event handling.
497 539
498=cut 540=cut
499 541
500sub fork_call(&@) { 542sub fork_call(&@) {
501 my ($cb, @args) = @_; 543 my ($cb, @args) = @_;
… …
508 reset_signals; 550 reset_signals;
509 &$cb 551 &$cb
510 }, @args; 552 }, @args;
511 553
512 wantarray ? @res : $res[-1] 554 wantarray ? @res : $res[-1]
555}
556
557=item $coin = coin_from_name $name
558
559=cut
560
561our %coin_alias = (
562 "silver" => "silvercoin",
563 "silvercoin" => "silvercoin",
564 "silvercoins" => "silvercoin",
565 "gold" => "goldcoin",
566 "goldcoin" => "goldcoin",
567 "goldcoins" => "goldcoin",
568 "platinum" => "platinacoin",
569 "platinumcoin" => "platinacoin",
570 "platinumcoins" => "platinacoin",
571 "platina" => "platinacoin",
572 "platinacoin" => "platinacoin",
573 "platinacoins" => "platinacoin",
574 "royalty" => "royalty",
575 "royalties" => "royalty",
576);
577
578sub coin_from_name($) {
579 $coin_alias{$_[0]}
580 ? cf::arch::find $coin_alias{$_[0]}
581 : undef
513} 582}
514 583
515=item $value = cf::db_get $family => $key 584=item $value = cf::db_get $family => $key
516 585
517Returns a single value from the environment database. 586Returns a single value from the environment database.
… …
954 } 1023 }
955 1024
956 0 1025 0
957} 1026}
958 1027
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1028=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 1029
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 1031
963Generate an object-specific event with the given arguments. 1032Generate an object-specific event with the given arguments.
964 1033
… …
1042cf::attachable->attach ( 1111cf::attachable->attach (
1043 prio => -1000000, 1112 prio => -1000000,
1044 on_instantiate => sub { 1113 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1114 my ($obj, $data) = @_;
1046 1115
1047 $data = from_json $data; 1116 $data = decode_json $data;
1048 1117
1049 for (@$data) { 1118 for (@$data) {
1050 my ($name, $args) = @$_; 1119 my ($name, $args) = @$_;
1051 1120
1052 $obj->attach ($name, %{$args || {} }); 1121 $obj->attach ($name, %{$args || {} });
… …
1073 utf8::decode (my $decname = $filename); 1142 utf8::decode (my $decname = $filename);
1074 warn sprintf "saving %s (%d,%d)\n", 1143 warn sprintf "saving %s (%d,%d)\n",
1075 $decname, length $$rdata, scalar @$objs; 1144 $decname, length $$rdata, scalar @$objs;
1076 1145
1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1078 chmod SAVE_MODE, $fh; 1147 aio_chmod $fh, SAVE_MODE;
1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1080 aio_fsync $fh if $cf::USE_FSYNC; 1149 aio_fsync $fh if $cf::USE_FSYNC;
1081 close $fh; 1150 aio_close $fh;
1082 1151
1083 if (@$objs) { 1152 if (@$objs) {
1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1153 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1085 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087 aio_write $fh, 0, (length $data), $data, 0; 1156 aio_write $fh, 0, (length $data), $data, 0;
1088 aio_fsync $fh if $cf::USE_FSYNC; 1157 aio_fsync $fh if $cf::USE_FSYNC;
1089 close $fh; 1158 aio_close $fh;
1090 aio_rename "$filename.pst~", "$filename.pst"; 1159 aio_rename "$filename.pst~", "$filename.pst";
1091 } 1160 }
1092 } else { 1161 } else {
1093 aio_unlink "$filename.pst"; 1162 aio_unlink "$filename.pst";
1094 } 1163 }
… …
1289 my $msg = $@ ? "$v->{path}: $@\n" 1358 my $msg = $@ ? "$v->{path}: $@\n"
1290 : "$v->{base}: extension inactive.\n"; 1359 : "$v->{base}: extension inactive.\n";
1291 1360
1292 if (exists $v->{meta}{mandatory}) { 1361 if (exists $v->{meta}{mandatory}) {
1293 warn $msg; 1362 warn $msg;
1294 warn "mandatory extension failed to load, exiting.\n"; 1363 cf::cleanup "mandatory extension failed to load, exiting.";
1295 exit 1;
1296 } 1364 }
1297 1365
1298 warn $msg; 1366 warn $msg;
1299 } 1367 }
1300 1368
… …
1389 my $f = new_from_file cf::object::thawer path $login 1457 my $f = new_from_file cf::object::thawer path $login
1390 or return; 1458 or return;
1391 1459
1392 my $pl = cf::player::load_pl $f 1460 my $pl = cf::player::load_pl $f
1393 or return; 1461 or return;
1462
1394 local $cf::PLAYER_LOADING{$login} = $pl; 1463 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs; 1464 $f->resolve_delayed_derefs;
1396 $cf::PLAYER{$login} = $pl 1465 $cf::PLAYER{$login} = $pl
1397 } 1466 }
1398 } 1467 }
… …
1408 1477
1409 return if $pl->{deny_save}; 1478 return if $pl->{deny_save};
1410 1479
1411 aio_mkdir playerdir $pl, 0770; 1480 aio_mkdir playerdir $pl, 0770;
1412 $pl->{last_save} = $cf::RUNTIME; 1481 $pl->{last_save} = $cf::RUNTIME;
1482
1483 cf::get_slot 0.01;
1413 1484
1414 $pl->save_pl ($path); 1485 $pl->save_pl ($path);
1415 cf::cede_to_tick; 1486 cf::cede_to_tick;
1416} 1487}
1417 1488
… …
1453 $pl->{deny_save} = 1; 1524 $pl->{deny_save} = 1;
1454 $pl->password ("*"); # this should lock out the player until we nuked the dir 1525 $pl->password ("*"); # this should lock out the player until we nuked the dir
1455 1526
1456 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1457 $pl->deactivate; 1528 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score;
1458 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1531 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1459 $pl->ns->destroy if $pl->ns; 1532 $pl->ns->destroy if $pl->ns;
1460 1533
1461 my $path = playerdir $pl; 1534 my $path = playerdir $pl;
1462 my $temp = "$path~$cf::RUNTIME~deleting~"; 1535 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1501 1574
1502 for my $login (@$dirs) { 1575 for my $login (@$dirs) {
1503 my $path = path $login; 1576 my $path = path $login;
1504 1577
1505 # a .pst is a dead give-away for a valid player 1578 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") { 1579 # if no pst file found, open and chekc for blocked users
1580 if (aio_stat "$path.pst") {
1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1581 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1508 aio_read $fh, 0, 512, my $buf, 0 or next; 1582 aio_read $fh, 0, 512, my $buf, 0 or next;
1509 $buf !~ /^password -------------$/m or next; # official not-valid tag 1583 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 } 1584 }
1511 1585
… …
1710our $MAX_RESET = 3600; 1784our $MAX_RESET = 3600;
1711our $DEFAULT_RESET = 3000; 1785our $DEFAULT_RESET = 3000;
1712 1786
1713sub generate_random_map { 1787sub generate_random_map {
1714 my ($self, $rmp) = @_; 1788 my ($self, $rmp) = @_;
1789
1790 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1791
1715 # mit "rum" bekleckern, nicht 1792 # mit "rum" bekleckern, nicht
1716 $self->_create_random_map ( 1793 $self->_create_random_map (
1717 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1718 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1719 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1841 1918
1842# the temporary/swap location 1919# the temporary/swap location
1843sub save_path { 1920sub save_path {
1844 my ($self) = @_; 1921 my ($self) = @_;
1845 1922
1846 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1923 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1847 "$TMPDIR/$path.map" 1924 "$TMPDIR/$path.map"
1848} 1925}
1849 1926
1850# the unique path, undef == no special unique path 1927# the unique path, undef == no special unique path
1851sub uniq_path { 1928sub uniq_path {
1852 my ($self) = @_; 1929 my ($self) = @_;
1853 1930
1854 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1855 "$UNIQUEDIR/$path" 1932 "$UNIQUEDIR/$path"
1856} 1933}
1857 1934
1858# and all this just because we cannot iterate over 1935# and all this just because we cannot iterate over
1859# all maps in C++... 1936# all maps in C++...
… …
1957 2034
1958 cf::lock_wait "map_data:$path";#d#remove 2035 cf::lock_wait "map_data:$path";#d#remove
1959 cf::lock_wait "map_find:$path"; 2036 cf::lock_wait "map_find:$path";
1960 2037
1961 $cf::MAP{$path} || do { 2038 $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 2039 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2040 my $guard2 = cf::lock_acquire "map_find:$path";
1964 2041
1965 my $map = new_from_path cf::map $path 2042 my $map = new_from_path cf::map $path
1966 or return; 2043 or return;
1967 2044
1968 $map->{last_save} = $cf::RUNTIME; 2045 $map->{last_save} = $cf::RUNTIME;
… …
1971 or return; 2048 or return;
1972 2049
1973 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2050 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1974 # doing this can freeze the server in a sync job, obviously 2051 # doing this can freeze the server in a sync job, obviously
1975 #$cf::WAIT_FOR_TICK->wait; 2052 #$cf::WAIT_FOR_TICK->wait;
2053 undef $guard2;
1976 undef $guard1; 2054 undef $guard1;
1977 undef $guard2;
1978 $map->reset; 2055 $map->reset;
1979 return find $path; 2056 return find $path;
1980 } 2057 }
1981 2058
1982 $cf::MAP{$path} = $map 2059 $cf::MAP{$path} = $map
… …
2045 } 2122 }
2046 2123
2047 $self->{last_save} = $cf::RUNTIME; 2124 $self->{last_save} = $cf::RUNTIME;
2048 $self->last_access ($cf::RUNTIME); 2125 $self->last_access ($cf::RUNTIME);
2049 2126
2050 $self->in_memory (cf::MAP_IN_MEMORY); 2127 $self->in_memory (cf::MAP_ACTIVE);
2051 } 2128 }
2052 2129
2053 $self->post_load; 2130 $self->post_load;
2054} 2131}
2055 2132
… …
2113 my ($path, $origin, $load) = @_; 2190 my ($path, $origin, $load) = @_;
2114 2191
2115 $path = normalise $path, $origin && $origin->{path}; 2192 $path = normalise $path, $origin && $origin->{path};
2116 2193
2117 if (my $map = $cf::MAP{$path}) { 2194 if (my $map = $cf::MAP{$path}) {
2118 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2195 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2119 } 2196 }
2120 2197
2121 $MAP_PREFETCH{$path} |= $load; 2198 $MAP_PREFETCH{$path} |= $load;
2122 2199
2123 $MAP_PREFETCHER ||= cf::async { 2200 $MAP_PREFETCHER ||= cf::async {
… …
2160 cf::async { 2237 cf::async {
2161 $Coro::current->{desc} = "map player save"; 2238 $Coro::current->{desc} = "map player save";
2162 $_->contr->save for $self->players; 2239 $_->contr->save for $self->players;
2163 }; 2240 };
2164 2241
2242 cf::get_slot 0.02;
2243
2165 if ($uniq) { 2244 if ($uniq) {
2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2167 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2246 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2168 } else { 2247 } else {
2169 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2177 $self->save; 2256 $self->save;
2178 2257
2179 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2258 my $lock = cf::lock_acquire "map_data:$self->{path}";
2180 2259
2181 return if $self->players; 2260 return if $self->players;
2182 return if $self->in_memory != cf::MAP_IN_MEMORY; 2261 return if $self->in_memory != cf::MAP_ACTIVE;
2183 return if $self->{deny_save}; 2262 return if $self->{deny_save};
2184 2263
2185 $self->in_memory (cf::MAP_SWAPPED); 2264 $self->in_memory (cf::MAP_SWAPPED);
2186 2265
2187 $self->deactivate; 2266 $self->deactivate;
… …
2305 2384
2306sub unique_maps() { 2385sub unique_maps() {
2307 [ 2386 [
2308 map { 2387 map {
2309 utf8::decode $_; 2388 utf8::decode $_;
2310 /\.map$/ 2389 s/\.map$//; # TODO future compatibility hack
2390 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2391 ? ()
2311 ? normalise $_ 2392 : normalise $_
2312 : ()
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2393 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2394 ]
2315} 2395}
2316 2396
2317package cf;
2318
2319=back 2397=back
2320 2398
2321=head3 cf::object 2399=head3 cf::object
2322 2400
2323=cut 2401=cut
… …
2326 2404
2327=over 4 2405=over 4
2328 2406
2329=item $ob->inv_recursive 2407=item $ob->inv_recursive
2330 2408
2331Returns the inventory of the object _and_ their inventories, recursively. 2409Returns the inventory of the object I<and> their inventories, recursively,
2410but I<not> the object itself.
2332 2411
2333=cut 2412=cut
2334 2413
2335sub inv_recursive_; 2414sub inv_recursive_;
2336sub inv_recursive_ { 2415sub inv_recursive_ {
… …
2341 inv_recursive_ inv $_[0] 2420 inv_recursive_ inv $_[0]
2342} 2421}
2343 2422
2344=item $ref = $ob->ref 2423=item $ref = $ob->ref
2345 2424
2346creates and returns a persistent reference to an objetc that can be stored as a string. 2425Creates and returns a persistent reference to an object that can be stored as a string.
2347 2426
2348=item $ob = cf::object::deref ($refstring) 2427=item $ob = cf::object::deref ($refstring)
2349 2428
2350returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2429returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2351even if the object actually exists. May block. 2430even if the object actually exists. May block.
… …
2383can be C<undef>. Does the right thing when the player is currently in a 2462can be C<undef>. Does the right thing when the player is currently in a
2384dialogue with the given NPC character. 2463dialogue with the given NPC character.
2385 2464
2386=cut 2465=cut
2387 2466
2467our $SAY_CHANNEL = {
2468 id => "say",
2469 title => "Map",
2470 reply => "say ",
2471 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2472};
2473
2474our $CHAT_CHANNEL = {
2475 id => "chat",
2476 title => "Chat",
2477 reply => "chat ",
2478 tooltip => "Player chat and shouts, global to the server.",
2479};
2480
2388# rough implementation of a future "reply" method that works 2481# rough implementation of a future "reply" method that works
2389# with dialog boxes. 2482# with dialog boxes.
2390#TODO: the first argument must go, split into a $npc->reply_to ( method 2483#TODO: the first argument must go, split into a $npc->reply_to ( method
2391sub cf::object::player::reply($$$;$) { 2484sub cf::object::player::reply($$$;$) {
2392 my ($self, $npc, $msg, $flags) = @_; 2485 my ($self, $npc, $msg, $flags) = @_;
… …
2403 my $dialog = $pl->{npc_dialog}; 2496 my $dialog = $pl->{npc_dialog};
2404 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2497 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2405 2498
2406 } else { 2499 } else {
2407 $msg = $npc->name . " says: $msg" if $npc; 2500 $msg = $npc->name . " says: $msg" if $npc;
2408 $self->message ($msg, $flags); 2501 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2409 } 2502 }
2410 } 2503 }
2411} 2504}
2412 2505
2413=item $object->send_msg ($channel, $msg, $color, [extra...]) 2506=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2608} 2701}
2609 2702
2610sub prepare_random_map { 2703sub prepare_random_map {
2611 my ($exit) = @_; 2704 my ($exit) = @_;
2612 2705
2613 my $guard = cf::lock_acquire "exit_prepare:$exit";
2614
2615 # all this does is basically replace the /! path by 2706 # all this does is basically replace the /! path by
2616 # a new random map path (?random/...) with a seed 2707 # a new random map path (?random/...) with a seed
2617 # that depends on the exit object 2708 # that depends on the exit object
2618 2709
2619 my $rmp = parse_random_map_params $exit->msg; 2710 my $rmp = parse_random_map_params $exit->msg;
… …
2621 if ($exit->map) { 2712 if ($exit->map) {
2622 $rmp->{region} = $exit->region->name; 2713 $rmp->{region} = $exit->region->name;
2623 $rmp->{origin_map} = $exit->map->path; 2714 $rmp->{origin_map} = $exit->map->path;
2624 $rmp->{origin_x} = $exit->x; 2715 $rmp->{origin_x} = $exit->x;
2625 $rmp->{origin_y} = $exit->y; 2716 $rmp->{origin_y} = $exit->y;
2717
2718 $exit->map->touch;
2626 } 2719 }
2627 2720
2628 $rmp->{random_seed} ||= $exit->random_seed; 2721 $rmp->{random_seed} ||= $exit->random_seed;
2629 2722
2630 my $data = cf::to_json $rmp; 2723 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2631 my $md5 = Digest::MD5::md5_hex $data; 2724 my $md5 = Digest::MD5::md5_hex $data;
2632 my $meta = "$RANDOMDIR/$md5.meta"; 2725 my $meta = "$RANDOMDIR/$md5.meta";
2633 2726
2634 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2727 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2635 aio_write $fh, 0, (length $data), $data, 0; 2728 aio_write $fh, 0, (length $data), $data, 0;
2636 undef $fh; 2729 undef $fh;
2637 aio_rename "$meta~", $meta; 2730 aio_rename "$meta~", $meta;
2638 2731
2732 my $slaying = "?random/$md5";
2733
2734 if ($exit->valid) {
2639 $exit->slaying ("?random/$md5"); 2735 $exit->slaying ("?random/$md5");
2640 $exit->msg (undef); 2736 $exit->msg (undef);
2737 }
2641 } 2738 }
2642} 2739}
2643 2740
2644sub cf::object::player::enter_exit { 2741sub cf::object::player::enter_exit {
2645 my ($self, $exit) = @_; 2742 my ($self, $exit) = @_;
2646 2743
2647 return unless $self->type == cf::PLAYER; 2744 return unless $self->type == cf::PLAYER;
2648 2745
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; 2746 $self->enter_link;
2661 2747
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 { 2748 (async {
2667 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2749 $Coro::current->{desc} = "enter_exit";
2668 2750
2669 $self->deactivate_recursive; # just to be sure
2670 unless (eval { 2751 unless (eval {
2752 $self->deactivate_recursive; # just to be sure
2753
2754 # random map handling
2755 {
2756 my $guard = cf::lock_acquire "exit_prepare:$exit";
2757
2758 prepare_random_map $exit
2759 if $exit->slaying eq "/!";
2760 }
2761
2762 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2763 my $x = $exit->stats->hp;
2764 my $y = $exit->stats->sp;
2765
2671 $self->goto ($slaying, $hp, $sp); 2766 $self->goto ($map, $x, $y);
2672 2767
2768 # if exit is damned, update players death & WoR home-position
2769 $self->contr->savebed ($map, $x, $y)
2770 if $exit->flag (cf::FLAG_DAMNED);
2771
2673 1; 2772 1
2674 }) { 2773 }) {
2675 $self->message ("Something went wrong deep within the crossfire server. " 2774 $self->message ("Something went wrong deep within the crossfire server. "
2676 . "I'll try to bring you back to the map you were before. " 2775 . "I'll try to bring you back to the map you were before. "
2677 . "Please report this to the dungeon master!", 2776 . "Please report this to the dungeon master!",
2678 cf::NDI_UNIQUE | cf::NDI_RED); 2777 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2758 id => "infobox", 2857 id => "infobox",
2759 title => "Map Info", 2858 title => "Map Info",
2760 reply => undef, 2859 reply => undef,
2761 tooltip => "Information related to the maps", 2860 tooltip => "Information related to the maps",
2762 }, 2861 },
2862 "c/party" => {
2863 id => "party",
2864 title => "Party",
2865 reply => "gsay ",
2866 tooltip => "Messages and chat related to your party",
2867 },
2763); 2868);
2764 2869
2765sub cf::client::send_msg { 2870sub cf::client::send_msg {
2766 my ($self, $channel, $msg, $color, @extra) = @_; 2871 my ($self, $channel, $msg, $color, @extra) = @_;
2767 2872
… …
3004 3109
3005The following functions and methods are available within a safe environment: 3110The following functions and methods are available within a safe environment:
3006 3111
3007 cf::object 3112 cf::object
3008 contr pay_amount pay_player map x y force_find force_add destroy 3113 contr pay_amount pay_player map x y force_find force_add destroy
3009 insert remove name archname title slaying race decrease_ob_nr 3114 insert remove name archname title slaying race decrease split
3010 3115
3011 cf::object::player 3116 cf::object::player
3012 player 3117 player
3013 3118
3014 cf::player 3119 cf::player
… …
3019 3124
3020=cut 3125=cut
3021 3126
3022for ( 3127for (
3023 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3128 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3024 insert remove inv name archname title slaying race 3129 insert remove inv nrof name archname title slaying race
3025 decrease_ob_nr destroy)], 3130 decrease split destroy)],
3026 ["cf::object::player" => qw(player)], 3131 ["cf::object::player" => qw(player)],
3027 ["cf::player" => qw(peaceful)], 3132 ["cf::player" => qw(peaceful)],
3028 ["cf::map" => qw(trigger)], 3133 ["cf::map" => qw(trigger)],
3029) { 3134) {
3030 no strict 'refs'; 3135 no strict 'refs';
… …
3135 { 3240 {
3136 my $faces = $facedata->{faceinfo}; 3241 my $faces = $facedata->{faceinfo};
3137 3242
3138 while (my ($face, $info) = each %$faces) { 3243 while (my ($face, $info) = each %$faces) {
3139 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3244 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3245
3140 cf::face::set_visibility $idx, $info->{visibility}; 3246 cf::face::set_visibility $idx, $info->{visibility};
3141 cf::face::set_magicmap $idx, $info->{magicmap}; 3247 cf::face::set_magicmap $idx, $info->{magicmap};
3142 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3248 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}; 3249 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3144 3250
3145 cf::cede_to_tick; 3251 cf::cede_to_tick;
3146 } 3252 }
3147 3253
3148 while (my ($face, $info) = each %$faces) { 3254 while (my ($face, $info) = each %$faces) {
3149 next unless $info->{smooth}; 3255 next unless $info->{smooth};
3256
3150 my $idx = cf::face::find $face 3257 my $idx = cf::face::find $face
3151 or next; 3258 or next;
3259
3152 if (my $smooth = cf::face::find $info->{smooth}) { 3260 if (my $smooth = cf::face::find $info->{smooth}) {
3153 cf::face::set_smooth $idx, $smooth; 3261 cf::face::set_smooth $idx, $smooth;
3154 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3262 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3155 } else { 3263 } else {
3156 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3264 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3174 { 3282 {
3175 # TODO: for gcfclient pleasure, we should give resources 3283 # TODO: for gcfclient pleasure, we should give resources
3176 # that gcfclient doesn't grok a >10000 face index. 3284 # that gcfclient doesn't grok a >10000 face index.
3177 my $res = $facedata->{resource}; 3285 my $res = $facedata->{resource};
3178 3286
3179 my $soundconf = delete $res->{"res/sound.conf"};
3180
3181 while (my ($name, $info) = each %$res) { 3287 while (my ($name, $info) = each %$res) {
3288 if (defined $info->{type}) {
3182 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3289 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3183 my $data; 3290 my $data;
3184 3291
3185 if ($info->{type} & 1) { 3292 if ($info->{type} & 1) {
3186 # prepend meta info 3293 # prepend meta info
3187 3294
3188 my $meta = $enc->encode ({ 3295 my $meta = $enc->encode ({
3189 name => $name, 3296 name => $name,
3190 %{ $info->{meta} || {} }, 3297 %{ $info->{meta} || {} },
3191 }); 3298 });
3192 3299
3193 $data = pack "(w/a*)*", $meta, $info->{data}; 3300 $data = pack "(w/a*)*", $meta, $info->{data};
3301 } else {
3302 $data = $info->{data};
3303 }
3304
3305 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3306 cf::face::set_type $idx, $info->{type};
3194 } else { 3307 } else {
3195 $data = $info->{data}; 3308 $RESOURCE{$name} = $info;
3196 } 3309 }
3197 3310
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; 3311 cf::cede_to_tick;
3202 } 3312 }
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 } 3313 }
3314
3315 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3222 3316
3223 1 3317 1
3224} 3318}
3319
3320cf::global->attach (on_resource_update => sub {
3321 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3322 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3323
3324 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3325 my $sound = $soundconf->{compat}[$_]
3326 or next;
3327
3328 my $face = cf::face::find "sound/$sound->[1]";
3329 cf::sound::set $sound->[0] => $face;
3330 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3331 }
3332
3333 while (my ($k, $v) = each %{$soundconf->{event}}) {
3334 my $face = cf::face::find "sound/$v";
3335 cf::sound::set $k => $face;
3336 }
3337 }
3338});
3225 3339
3226register_exticmd fx_want => sub { 3340register_exticmd fx_want => sub {
3227 my ($ns, $want) = @_; 3341 my ($ns, $want) = @_;
3228 3342
3229 while (my ($k, $v) = each %$want) { 3343 while (my ($k, $v) = each %$want) {
3230 $ns->fx_want ($k, $v); 3344 $ns->fx_want ($k, $v);
3231 } 3345 }
3232}; 3346};
3347
3348sub load_resource_file($) {
3349 my $guard = lock_acquire "load_resource_file";
3350
3351 my $status = load_resource_file_ $_[0];
3352 get_slot 0.1, 100;
3353 cf::arch::commit_load;
3354
3355 $status
3356}
3233 3357
3234sub reload_regions { 3358sub reload_regions {
3235 # HACK to clear player env face cache, we need some signal framework 3359 # HACK to clear player env face cache, we need some signal framework
3236 # for this (global event?) 3360 # for this (global event?)
3237 %ext::player_env::MUSIC_FACE_CACHE = (); 3361 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3251} 3375}
3252 3376
3253sub reload_archetypes { 3377sub reload_archetypes {
3254 load_resource_file "$DATADIR/archetypes" 3378 load_resource_file "$DATADIR/archetypes"
3255 or die "unable to load archetypes\n"; 3379 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} 3380}
3262 3381
3263sub reload_treasures { 3382sub reload_treasures {
3264 load_resource_file "$DATADIR/treasures" 3383 load_resource_file "$DATADIR/treasures"
3265 or die "unable to load treasurelists\n"; 3384 or die "unable to load treasurelists\n";
3266} 3385}
3267 3386
3268sub reload_resources { 3387sub reload_resources {
3269 warn "reloading resource files...\n"; 3388 warn "reloading resource files...\n";
3270 3389
3390 reload_facedata;
3391 reload_archetypes;
3271 reload_regions; 3392 reload_regions;
3272 reload_facedata;
3273 #reload_archetypes;#d#
3274 reload_archetypes;
3275 reload_treasures; 3393 reload_treasures;
3276 3394
3277 warn "finished reloading resource files\n"; 3395 warn "finished reloading resource files\n";
3278} 3396}
3279 3397
3280sub init { 3398sub init {
3399 my $guard = freeze_mainloop;
3400
3401 evthread_start IO::AIO::poll_fileno;
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 {

Diff Legend

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