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.392 by root, Fri Oct 26 04:44:54 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
… …
406 453
407BEGIN { *async = \&Coro::async_pool } 454BEGIN { *async = \&Coro::async_pool }
408 455
409=item cf::sync_job { BLOCK } 456=item cf::sync_job { BLOCK }
410 457
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 458The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 459is always able to handle events or runnable, as Deliantra is only
413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 460partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 461acceptable.
415 462
416If it must be done, put the blocking parts into C<sync_job>. This will run 463If it must be done, put the blocking parts into C<sync_job>. This will run
417the given BLOCK in another coroutine while waiting for the result. The 464the given BLOCK in another coroutine while waiting for the result. The
… …
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.
… …
662attach callbacks/event handlers (a collection of which is called an "attachment") 731attach callbacks/event handlers (a collection of which is called an "attachment")
663to it. All such attachable objects support the following methods. 732to it. All such attachable objects support the following methods.
664 733
665In the following description, CLASS can be any of C<global>, C<object> 734In the following description, CLASS can be any of C<global>, C<object>
666C<player>, C<client> or C<map> (i.e. the attachable objects in 735C<player>, C<client> or C<map> (i.e. the attachable objects in
667Crossfire TRT). 736Deliantra).
668 737
669=over 4 738=over 4
670 739
671=item $attachable->attach ($attachment, key => $value...) 740=item $attachable->attach ($attachment, key => $value...)
672 741
… …
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
… …
1548 1622
1549Expand crossfire pod fragments into protocol xml. 1623Expand crossfire pod fragments into protocol xml.
1550 1624
1551=cut 1625=cut
1552 1626
1553 use re 'eval'; 1627use re 'eval';
1554 1628
1555my $group; 1629my $group;
1556my $interior; $interior = qr{ 1630my $interior; $interior = qr{
1631 # match a pod interior sequence sans C<< >>
1557 (?: 1632 (?:
1558 \ (.*?)\ (?{ $group = $^N }) 1633 \ (.*?)\ (?{ $group = $^N })
1559 | < (??{$interior}) > 1634 | < (??{$interior}) >
1560 ) 1635 )
1561}x; 1636}x;
… …
1627 } 1702 }
1628 1703
1629 $xml 1704 $xml
1630} 1705}
1631 1706
1707no re 'eval';
1708
1632sub hintmode { 1709sub hintmode {
1633 $_[0]{hintmode} = $_[1] if @_ > 1; 1710 $_[0]{hintmode} = $_[1] if @_ > 1;
1634 $_[0]{hintmode} 1711 $_[0]{hintmode}
1635} 1712}
1636 1713
… …
1707our $MAX_RESET = 3600; 1784our $MAX_RESET = 3600;
1708our $DEFAULT_RESET = 3000; 1785our $DEFAULT_RESET = 3000;
1709 1786
1710sub generate_random_map { 1787sub generate_random_map {
1711 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
1712 # mit "rum" bekleckern, nicht 1792 # mit "rum" bekleckern, nicht
1713 $self->_create_random_map ( 1793 $self->_create_random_map (
1714 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1715 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1716 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1838 1918
1839# the temporary/swap location 1919# the temporary/swap location
1840sub save_path { 1920sub save_path {
1841 my ($self) = @_; 1921 my ($self) = @_;
1842 1922
1843 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1923 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1844 "$TMPDIR/$path.map" 1924 "$TMPDIR/$path.map"
1845} 1925}
1846 1926
1847# the unique path, undef == no special unique path 1927# the unique path, undef == no special unique path
1848sub uniq_path { 1928sub uniq_path {
1849 my ($self) = @_; 1929 my ($self) = @_;
1850 1930
1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1852 "$UNIQUEDIR/$path" 1932 "$UNIQUEDIR/$path"
1853} 1933}
1854 1934
1855# and all this just because we cannot iterate over 1935# and all this just because we cannot iterate over
1856# all maps in C++... 1936# all maps in C++...
… …
1954 2034
1955 cf::lock_wait "map_data:$path";#d#remove 2035 cf::lock_wait "map_data:$path";#d#remove
1956 cf::lock_wait "map_find:$path"; 2036 cf::lock_wait "map_find:$path";
1957 2037
1958 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
1959 my $guard1 = cf::lock_acquire "map_find:$path";
1960 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";
1961 2041
1962 my $map = new_from_path cf::map $path 2042 my $map = new_from_path cf::map $path
1963 or return; 2043 or return;
1964 2044
1965 $map->{last_save} = $cf::RUNTIME; 2045 $map->{last_save} = $cf::RUNTIME;
… …
1968 or return; 2048 or return;
1969 2049
1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2050 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1971 # doing this can freeze the server in a sync job, obviously 2051 # doing this can freeze the server in a sync job, obviously
1972 #$cf::WAIT_FOR_TICK->wait; 2052 #$cf::WAIT_FOR_TICK->wait;
2053 undef $guard2;
1973 undef $guard1; 2054 undef $guard1;
1974 undef $guard2;
1975 $map->reset; 2055 $map->reset;
1976 return find $path; 2056 return find $path;
1977 } 2057 }
1978 2058
1979 $cf::MAP{$path} = $map 2059 $cf::MAP{$path} = $map
… …
2042 } 2122 }
2043 2123
2044 $self->{last_save} = $cf::RUNTIME; 2124 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME); 2125 $self->last_access ($cf::RUNTIME);
2046 2126
2047 $self->in_memory (cf::MAP_IN_MEMORY); 2127 $self->in_memory (cf::MAP_ACTIVE);
2048 } 2128 }
2049 2129
2050 $self->post_load; 2130 $self->post_load;
2051} 2131}
2052 2132
… …
2110 my ($path, $origin, $load) = @_; 2190 my ($path, $origin, $load) = @_;
2111 2191
2112 $path = normalise $path, $origin && $origin->{path}; 2192 $path = normalise $path, $origin && $origin->{path};
2113 2193
2114 if (my $map = $cf::MAP{$path}) { 2194 if (my $map = $cf::MAP{$path}) {
2115 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2195 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2116 } 2196 }
2117 2197
2118 $MAP_PREFETCH{$path} |= $load; 2198 $MAP_PREFETCH{$path} |= $load;
2119 2199
2120 $MAP_PREFETCHER ||= cf::async { 2200 $MAP_PREFETCHER ||= cf::async {
… …
2157 cf::async { 2237 cf::async {
2158 $Coro::current->{desc} = "map player save"; 2238 $Coro::current->{desc} = "map player save";
2159 $_->contr->save for $self->players; 2239 $_->contr->save for $self->players;
2160 }; 2240 };
2161 2241
2242 cf::get_slot 0.02;
2243
2162 if ($uniq) { 2244 if ($uniq) {
2163 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2164 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2246 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2165 } else { 2247 } else {
2166 $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);
… …
2174 $self->save; 2256 $self->save;
2175 2257
2176 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2258 my $lock = cf::lock_acquire "map_data:$self->{path}";
2177 2259
2178 return if $self->players; 2260 return if $self->players;
2179 return if $self->in_memory != cf::MAP_IN_MEMORY; 2261 return if $self->in_memory != cf::MAP_ACTIVE;
2180 return if $self->{deny_save}; 2262 return if $self->{deny_save};
2181 2263
2182 $self->in_memory (cf::MAP_SWAPPED); 2264 $self->in_memory (cf::MAP_SWAPPED);
2183 2265
2184 $self->deactivate; 2266 $self->deactivate;
… …
2302 2384
2303sub unique_maps() { 2385sub unique_maps() {
2304 [ 2386 [
2305 map { 2387 map {
2306 utf8::decode $_; 2388 utf8::decode $_;
2307 /\.map$/ 2389 s/\.map$//; # TODO future compatibility hack
2390 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2391 ? ()
2308 ? normalise $_ 2392 : normalise $_
2309 : ()
2310 } @{ aio_readdir $UNIQUEDIR or [] } 2393 } @{ aio_readdir $UNIQUEDIR or [] }
2311 ] 2394 ]
2312} 2395}
2313 2396
2314package cf;
2315
2316=back 2397=back
2317 2398
2318=head3 cf::object 2399=head3 cf::object
2319 2400
2320=cut 2401=cut
… …
2323 2404
2324=over 4 2405=over 4
2325 2406
2326=item $ob->inv_recursive 2407=item $ob->inv_recursive
2327 2408
2328Returns 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.
2329 2411
2330=cut 2412=cut
2331 2413
2332sub inv_recursive_; 2414sub inv_recursive_;
2333sub inv_recursive_ { 2415sub inv_recursive_ {
… …
2338 inv_recursive_ inv $_[0] 2420 inv_recursive_ inv $_[0]
2339} 2421}
2340 2422
2341=item $ref = $ob->ref 2423=item $ref = $ob->ref
2342 2424
2343creates 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.
2344 2426
2345=item $ob = cf::object::deref ($refstring) 2427=item $ob = cf::object::deref ($refstring)
2346 2428
2347returns 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,
2348even if the object actually exists. May block. 2430even if the object actually exists. May block.
… …
2380can 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
2381dialogue with the given NPC character. 2463dialogue with the given NPC character.
2382 2464
2383=cut 2465=cut
2384 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
2385# rough implementation of a future "reply" method that works 2481# rough implementation of a future "reply" method that works
2386# with dialog boxes. 2482# with dialog boxes.
2387#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
2388sub cf::object::player::reply($$$;$) { 2484sub cf::object::player::reply($$$;$) {
2389 my ($self, $npc, $msg, $flags) = @_; 2485 my ($self, $npc, $msg, $flags) = @_;
… …
2400 my $dialog = $pl->{npc_dialog}; 2496 my $dialog = $pl->{npc_dialog};
2401 $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));
2402 2498
2403 } else { 2499 } else {
2404 $msg = $npc->name . " says: $msg" if $npc; 2500 $msg = $npc->name . " says: $msg" if $npc;
2405 $self->message ($msg, $flags); 2501 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2406 } 2502 }
2407 } 2503 }
2408} 2504}
2409 2505
2410=item $object->send_msg ($channel, $msg, $color, [extra...]) 2506=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2605} 2701}
2606 2702
2607sub prepare_random_map { 2703sub prepare_random_map {
2608 my ($exit) = @_; 2704 my ($exit) = @_;
2609 2705
2610 my $guard = cf::lock_acquire "exit_prepare:$exit";
2611
2612 # all this does is basically replace the /! path by 2706 # all this does is basically replace the /! path by
2613 # a new random map path (?random/...) with a seed 2707 # a new random map path (?random/...) with a seed
2614 # that depends on the exit object 2708 # that depends on the exit object
2615 2709
2616 my $rmp = parse_random_map_params $exit->msg; 2710 my $rmp = parse_random_map_params $exit->msg;
… …
2618 if ($exit->map) { 2712 if ($exit->map) {
2619 $rmp->{region} = $exit->region->name; 2713 $rmp->{region} = $exit->region->name;
2620 $rmp->{origin_map} = $exit->map->path; 2714 $rmp->{origin_map} = $exit->map->path;
2621 $rmp->{origin_x} = $exit->x; 2715 $rmp->{origin_x} = $exit->x;
2622 $rmp->{origin_y} = $exit->y; 2716 $rmp->{origin_y} = $exit->y;
2717
2718 $exit->map->touch;
2623 } 2719 }
2624 2720
2625 $rmp->{random_seed} ||= $exit->random_seed; 2721 $rmp->{random_seed} ||= $exit->random_seed;
2626 2722
2627 my $data = cf::to_json $rmp; 2723 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2628 my $md5 = Digest::MD5::md5_hex $data; 2724 my $md5 = Digest::MD5::md5_hex $data;
2629 my $meta = "$RANDOMDIR/$md5.meta"; 2725 my $meta = "$RANDOMDIR/$md5.meta";
2630 2726
2631 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2727 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2632 aio_write $fh, 0, (length $data), $data, 0; 2728 aio_write $fh, 0, (length $data), $data, 0;
2633 undef $fh; 2729 undef $fh;
2634 aio_rename "$meta~", $meta; 2730 aio_rename "$meta~", $meta;
2635 2731
2732 my $slaying = "?random/$md5";
2733
2734 if ($exit->valid) {
2636 $exit->slaying ("?random/$md5"); 2735 $exit->slaying ("?random/$md5");
2637 $exit->msg (undef); 2736 $exit->msg (undef);
2737 }
2638 } 2738 }
2639} 2739}
2640 2740
2641sub cf::object::player::enter_exit { 2741sub cf::object::player::enter_exit {
2642 my ($self, $exit) = @_; 2742 my ($self, $exit) = @_;
2643 2743
2644 return unless $self->type == cf::PLAYER; 2744 return unless $self->type == cf::PLAYER;
2645 2745
2646 if ($exit->slaying eq "/!") {
2647 #TODO: this should de-fi-ni-te-ly not be a sync-job
2648 # the problem is that $exit might not survive long enough
2649 # so it needs to be done right now, right here
2650 cf::sync_job { prepare_random_map $exit };
2651 }
2652
2653 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2654 my $hp = $exit->stats->hp;
2655 my $sp = $exit->stats->sp;
2656
2657 $self->enter_link; 2746 $self->enter_link;
2658 2747
2659 # if exit is damned, update players death & WoR home-position
2660 $self->contr->savebed ($slaying, $hp, $sp)
2661 if $exit->flag (FLAG_DAMNED);
2662
2663 (async { 2748 (async {
2664 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2749 $Coro::current->{desc} = "enter_exit";
2665 2750
2666 $self->deactivate_recursive; # just to be sure
2667 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
2668 $self->goto ($slaying, $hp, $sp); 2766 $self->goto ($map, $x, $y);
2669 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
2670 1; 2772 1
2671 }) { 2773 }) {
2672 $self->message ("Something went wrong deep within the crossfire server. " 2774 $self->message ("Something went wrong deep within the crossfire server. "
2673 . "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. "
2674 . "Please report this to the dungeon master!", 2776 . "Please report this to the dungeon master!",
2675 cf::NDI_UNIQUE | cf::NDI_RED); 2777 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2755 id => "infobox", 2857 id => "infobox",
2756 title => "Map Info", 2858 title => "Map Info",
2757 reply => undef, 2859 reply => undef,
2758 tooltip => "Information related to the maps", 2860 tooltip => "Information related to the maps",
2759 }, 2861 },
2862 "c/party" => {
2863 id => "party",
2864 title => "Party",
2865 reply => "gsay ",
2866 tooltip => "Messages and chat related to your party",
2867 },
2760); 2868);
2761 2869
2762sub cf::client::send_msg { 2870sub cf::client::send_msg {
2763 my ($self, $channel, $msg, $color, @extra) = @_; 2871 my ($self, $channel, $msg, $color, @extra) = @_;
2764 2872
… …
3001 3109
3002The following functions and methods are available within a safe environment: 3110The following functions and methods are available within a safe environment:
3003 3111
3004 cf::object 3112 cf::object
3005 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
3006 insert remove name archname title slaying race decrease_ob_nr 3114 insert remove name archname title slaying race decrease split
3007 3115
3008 cf::object::player 3116 cf::object::player
3009 player 3117 player
3010 3118
3011 cf::player 3119 cf::player
… …
3016 3124
3017=cut 3125=cut
3018 3126
3019for ( 3127for (
3020 ["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
3021 insert remove inv name archname title slaying race 3129 insert remove inv nrof name archname title slaying race
3022 decrease_ob_nr destroy)], 3130 decrease split destroy)],
3023 ["cf::object::player" => qw(player)], 3131 ["cf::object::player" => qw(player)],
3024 ["cf::player" => qw(peaceful)], 3132 ["cf::player" => qw(peaceful)],
3025 ["cf::map" => qw(trigger)], 3133 ["cf::map" => qw(trigger)],
3026) { 3134) {
3027 no strict 'refs'; 3135 no strict 'refs';
… …
3132 { 3240 {
3133 my $faces = $facedata->{faceinfo}; 3241 my $faces = $facedata->{faceinfo};
3134 3242
3135 while (my ($face, $info) = each %$faces) { 3243 while (my ($face, $info) = each %$faces) {
3136 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3244 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3245
3137 cf::face::set_visibility $idx, $info->{visibility}; 3246 cf::face::set_visibility $idx, $info->{visibility};
3138 cf::face::set_magicmap $idx, $info->{magicmap}; 3247 cf::face::set_magicmap $idx, $info->{magicmap};
3139 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};
3140 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};
3141 3250
3142 cf::cede_to_tick; 3251 cf::cede_to_tick;
3143 } 3252 }
3144 3253
3145 while (my ($face, $info) = each %$faces) { 3254 while (my ($face, $info) = each %$faces) {
3146 next unless $info->{smooth}; 3255 next unless $info->{smooth};
3256
3147 my $idx = cf::face::find $face 3257 my $idx = cf::face::find $face
3148 or next; 3258 or next;
3259
3149 if (my $smooth = cf::face::find $info->{smooth}) { 3260 if (my $smooth = cf::face::find $info->{smooth}) {
3150 cf::face::set_smooth $idx, $smooth; 3261 cf::face::set_smooth $idx, $smooth;
3151 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3262 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3152 } else { 3263 } else {
3153 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3264 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3171 { 3282 {
3172 # TODO: for gcfclient pleasure, we should give resources 3283 # TODO: for gcfclient pleasure, we should give resources
3173 # that gcfclient doesn't grok a >10000 face index. 3284 # that gcfclient doesn't grok a >10000 face index.
3174 my $res = $facedata->{resource}; 3285 my $res = $facedata->{resource};
3175 3286
3176 my $soundconf = delete $res->{"res/sound.conf"};
3177
3178 while (my ($name, $info) = each %$res) { 3287 while (my ($name, $info) = each %$res) {
3288 if (defined $info->{type}) {
3179 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3289 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3180 my $data; 3290 my $data;
3181 3291
3182 if ($info->{type} & 1) { 3292 if ($info->{type} & 1) {
3183 # prepend meta info 3293 # prepend meta info
3184 3294
3185 my $meta = $enc->encode ({ 3295 my $meta = $enc->encode ({
3186 name => $name, 3296 name => $name,
3187 %{ $info->{meta} || {} }, 3297 %{ $info->{meta} || {} },
3188 }); 3298 });
3189 3299
3190 $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};
3191 } else { 3307 } else {
3192 $data = $info->{data}; 3308 $RESOURCE{$name} = $info;
3193 } 3309 }
3194 3310
3195 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3196 cf::face::set_type $idx, $info->{type};
3197
3198 cf::cede_to_tick; 3311 cf::cede_to_tick;
3199 } 3312 }
3200
3201 if ($soundconf) {
3202 $soundconf = $enc->decode (delete $soundconf->{data});
3203
3204 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3205 my $sound = $soundconf->{compat}[$_]
3206 or next;
3207
3208 my $face = cf::face::find "sound/$sound->[1]";
3209 cf::sound::set $sound->[0] => $face;
3210 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3211 }
3212
3213 while (my ($k, $v) = each %{$soundconf->{event}}) {
3214 my $face = cf::face::find "sound/$v";
3215 cf::sound::set $k => $face;
3216 }
3217 }
3218 } 3313 }
3314
3315 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3219 3316
3220 1 3317 1
3221} 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});
3222 3339
3223register_exticmd fx_want => sub { 3340register_exticmd fx_want => sub {
3224 my ($ns, $want) = @_; 3341 my ($ns, $want) = @_;
3225 3342
3226 while (my ($k, $v) = each %$want) { 3343 while (my ($k, $v) = each %$want) {
3227 $ns->fx_want ($k, $v); 3344 $ns->fx_want ($k, $v);
3228 } 3345 }
3229}; 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}
3230 3357
3231sub reload_regions { 3358sub reload_regions {
3232 # 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
3233 # for this (global event?) 3360 # for this (global event?)
3234 %ext::player_env::MUSIC_FACE_CACHE = (); 3361 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3248} 3375}
3249 3376
3250sub reload_archetypes { 3377sub reload_archetypes {
3251 load_resource_file "$DATADIR/archetypes" 3378 load_resource_file "$DATADIR/archetypes"
3252 or die "unable to load archetypes\n"; 3379 or die "unable to load archetypes\n";
3253 #d# NEED to laod twice to resolve forward references
3254 # this really needs to be done in an extra post-pass
3255 # (which needs to be synchronous, so solve it differently)
3256 load_resource_file "$DATADIR/archetypes"
3257 or die "unable to load archetypes\n";
3258} 3380}
3259 3381
3260sub reload_treasures { 3382sub reload_treasures {
3261 load_resource_file "$DATADIR/treasures" 3383 load_resource_file "$DATADIR/treasures"
3262 or die "unable to load treasurelists\n"; 3384 or die "unable to load treasurelists\n";
3263} 3385}
3264 3386
3265sub reload_resources { 3387sub reload_resources {
3266 warn "reloading resource files...\n"; 3388 warn "reloading resource files...\n";
3267 3389
3390 reload_facedata;
3391 reload_archetypes;
3268 reload_regions; 3392 reload_regions;
3269 reload_facedata;
3270 #reload_archetypes;#d#
3271 reload_archetypes;
3272 reload_treasures; 3393 reload_treasures;
3273 3394
3274 warn "finished reloading resource files\n"; 3395 warn "finished reloading resource files\n";
3275} 3396}
3276 3397
3277sub init { 3398sub init {
3399 my $guard = freeze_mainloop;
3400
3401 evthread_start IO::AIO::poll_fileno;
3402
3278 reload_resources; 3403 reload_resources;
3279} 3404}
3280 3405
3281sub reload_config { 3406sub reload_config {
3282 open my $fh, "<:utf8", "$CONFDIR/config" 3407 open my $fh, "<:utf8", "$CONFDIR/config"
3283 or return; 3408 or return;
3284 3409
3285 local $/; 3410 local $/;
3286 *CFG = YAML::Syck::Load <$fh>; 3411 *CFG = YAML::Load <$fh>;
3287 3412
3288 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3413 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3289 3414
3290 $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};
3291 $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};
… …
3303 # we must not ever block the main coroutine 3428 # we must not ever block the main coroutine
3304 local $Coro::idle = sub { 3429 local $Coro::idle = sub {
3305 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#
3306 (async { 3431 (async {
3307 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3432 $Coro::current->{desc} = "IDLE BUG HANDLER";
3308 Event::one_event; 3433 EV::loop EV::LOOP_ONESHOT;
3309 })->prio (Coro::PRIO_MAX); 3434 })->prio (Coro::PRIO_MAX);
3310 }; 3435 };
3311 3436
3437 {
3438 my $guard = freeze_mainloop;
3312 reload_config; 3439 reload_config;
3313 db_init; 3440 db_init;
3314 load_extensions; 3441 load_extensions;
3315 3442
3316 $TICK_WATCHER->start; 3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3444 }
3445
3317 Event::loop; 3446 EV::loop;
3318} 3447}
3319 3448
3320############################################################################# 3449#############################################################################
3321# initialisation and cleanup 3450# initialisation and cleanup
3322 3451
3323# install some emergency cleanup handlers 3452# install some emergency cleanup handlers
3324BEGIN { 3453BEGIN {
3454 our %SIGWATCHER = ();
3325 for my $signal (qw(INT HUP TERM)) { 3455 for my $signal (qw(INT HUP TERM)) {
3326 Event->signal ( 3456 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3327 reentrant => 0,
3328 data => WF_AUTOCANCEL,
3329 signal => $signal,
3330 prio => 0,
3331 cb => sub {
3332 cf::cleanup "SIG$signal"; 3457 cf::cleanup "SIG$signal";
3333 },
3334 ); 3458 };
3335 } 3459 }
3336} 3460}
3337 3461
3338sub write_runtime { 3462sub write_runtime_sync {
3339 my $runtime = "$LOCALDIR/runtime"; 3463 my $runtime = "$LOCALDIR/runtime";
3340 3464
3341 # first touch the runtime file to show we are still running: 3465 # first touch the runtime file to show we are still running:
3342 # the fsync below can take a very very long time. 3466 # the fsync below can take a very very long time.
3343 3467
… …
3369 and return; 3493 and return;
3370 3494
3371 warn "runtime file written.\n"; 3495 warn "runtime file written.\n";
3372 3496
3373 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 };
3374} 3541}
3375 3542
3376sub emergency_save() { 3543sub emergency_save() {
3377 my $freeze_guard = cf::freeze_mainloop; 3544 my $freeze_guard = cf::freeze_mainloop;
3378 3545
… …
3400 warn "end emergency map save\n"; 3567 warn "end emergency map save\n";
3401 3568
3402 warn "begin emergency database checkpoint\n"; 3569 warn "begin emergency database checkpoint\n";
3403 BDB::db_env_txn_checkpoint $DB_ENV; 3570 BDB::db_env_txn_checkpoint $DB_ENV;
3404 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";
3405 }; 3576 };
3406 3577
3407 warn "leave emergency perl save\n"; 3578 warn "leave emergency perl save\n";
3408} 3579}
3409 3580
… …
3424 warn "reloading..."; 3595 warn "reloading...";
3425 3596
3426 warn "entering sync_job"; 3597 warn "entering sync_job";
3427 3598
3428 cf::sync_job { 3599 cf::sync_job {
3429 cf::write_runtime; # external watchdog should not bark 3600 cf::write_runtime_sync; # external watchdog should not bark
3430 cf::emergency_save; 3601 cf::emergency_save;
3431 cf::write_runtime; # external watchdog should not bark 3602 cf::write_runtime_sync; # external watchdog should not bark
3432 3603
3433 warn "syncing database to disk"; 3604 warn "syncing database to disk";
3434 BDB::db_env_txn_checkpoint $DB_ENV; 3605 BDB::db_env_txn_checkpoint $DB_ENV;
3435 3606
3436 # 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
3437
3438 warn "cancelling all WF_AUTOCANCEL watchers";
3439 for (Event::all_watchers) {
3440 $_->cancel if $_->data & WF_AUTOCANCEL;
3441 }
3442 3608
3443 warn "flushing outstanding aio requests"; 3609 warn "flushing outstanding aio requests";
3444 for (;;) { 3610 for (;;) {
3445 BDB::flush; 3611 BDB::flush;
3446 IO::AIO::flush; 3612 IO::AIO::flush;
… …
3528 warn "leaving sync_job"; 3694 warn "leaving sync_job";
3529 3695
3530 1 3696 1
3531 } or do { 3697 } or do {
3532 warn $@; 3698 warn $@;
3533 warn "error while reloading, exiting."; 3699 cf::cleanup "error while reloading, exiting.";
3534 exit 1;
3535 }; 3700 };
3536 3701
3537 warn "reloaded"; 3702 warn "reloaded";
3538}; 3703};
3539 3704
… …
3541 3706
3542sub reload_perl() { 3707sub reload_perl() {
3543 # doing reload synchronously and two reloads happen back-to-back, 3708 # doing reload synchronously and two reloads happen back-to-back,
3544 # coro crashes during coro_state_free->destroy here. 3709 # coro crashes during coro_state_free->destroy here.
3545 3710
3546 $RELOAD_WATCHER ||= Event->timer ( 3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3547 reentrant => 0,
3548 after => 0,
3549 data => WF_AUTOCANCEL,
3550 cb => sub {
3551 do_reload_perl; 3712 do_reload_perl;
3552 undef $RELOAD_WATCHER; 3713 undef $RELOAD_WATCHER;
3553 },
3554 ); 3714 };
3555} 3715}
3556 3716
3557register_command "reload" => sub { 3717register_command "reload" => sub {
3558 my ($who, $arg) = @_; 3718 my ($who, $arg) = @_;
3559 3719
… …
3572 3732
3573our @WAIT_FOR_TICK; 3733our @WAIT_FOR_TICK;
3574our @WAIT_FOR_TICK_BEGIN; 3734our @WAIT_FOR_TICK_BEGIN;
3575 3735
3576sub wait_for_tick { 3736sub wait_for_tick {
3577 return unless $TICK_WATCHER->is_active;
3578 return if $Coro::current == $Coro::main; 3737 return if tick_inhibit || $Coro::current == $Coro::main;
3579 3738
3580 my $signal = new Coro::Signal; 3739 my $signal = new Coro::Signal;
3581 push @WAIT_FOR_TICK, $signal; 3740 push @WAIT_FOR_TICK, $signal;
3582 $signal->wait; 3741 $signal->wait;
3583} 3742}
3584 3743
3585sub wait_for_tick_begin { 3744sub wait_for_tick_begin {
3586 return unless $TICK_WATCHER->is_active;
3587 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
3588 3746
3589 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
3590 push @WAIT_FOR_TICK_BEGIN, $signal; 3748 push @WAIT_FOR_TICK_BEGIN, $signal;
3591 $signal->wait; 3749 $signal->wait;
3592} 3750}
3593 3751
3594$TICK_WATCHER = Event->timer ( 3752sub tick {
3595 reentrant => 0,
3596 parked => 1,
3597 prio => 0,
3598 at => $NEXT_TICK || $TICK,
3599 data => WF_AUTOCANCEL,
3600 cb => sub {
3601 if ($Coro::current != $Coro::main) { 3753 if ($Coro::current != $Coro::main) {
3602 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"
3603 unless ++$bug_warning > 10; 3755 unless ++$bug_warning > 10;
3604 return; 3756 return;
3605 } 3757 }
3606 3758
3607 $NOW = $tick_start = Event::time;
3608
3609 cf::server_tick; # one server iteration 3759 cf::server_tick; # one server iteration
3610 3760
3611 $RUNTIME += $TICK;
3612 $NEXT_TICK += $TICK;
3613
3614 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3761 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3615 $NEXT_RUNTIME_WRITE = $NOW + 10; 3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3616 Coro::async_pool { 3763 Coro::async_pool {
3617 $Coro::current->{desc} = "runtime saver"; 3764 $Coro::current->{desc} = "runtime saver";
3618 write_runtime 3765 write_runtime_sync
3619 or warn "ERROR: unable to write runtime file: $!"; 3766 or warn "ERROR: unable to write runtime file: $!";
3620 };
3621 } 3767 };
3768 }
3622 3769
3623 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3770 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3624 $sig->send; 3771 $sig->send;
3625 } 3772 }
3626 while (my $sig = shift @WAIT_FOR_TICK) { 3773 while (my $sig = shift @WAIT_FOR_TICK) {
3627 $sig->send; 3774 $sig->send;
3628 } 3775 }
3629 3776
3630 $NOW = Event::time; 3777 $LOAD = ($NOW - $TICK_START) / $TICK;
3631
3632 # if we are delayed by four ticks or more, skip them all
3633 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3634
3635 $TICK_WATCHER->at ($NEXT_TICK);
3636 $TICK_WATCHER->start;
3637
3638 $LOAD = ($NOW - $tick_start) / $TICK;
3639 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3778 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3640 3779
3641 _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 }
3642 }, 3786 }
3643); 3787}
3644 3788
3645{ 3789{
3790 # configure BDB
3791
3646 BDB::min_parallel 8; 3792 BDB::min_parallel 8;
3647 BDB::max_poll_time $TICK * 0.1; 3793 BDB::max_poll_reqs $TICK * 0.1;
3648 $BDB_POLL_WATCHER = Event->io ( 3794 $AnyEvent::BDB::WATCHER->priority (1);
3649 reentrant => 0,
3650 fd => BDB::poll_fileno,
3651 poll => 'r',
3652 prio => 0,
3653 data => WF_AUTOCANCEL,
3654 cb => \&BDB::poll_cb,
3655 );
3656
3657 BDB::set_sync_prepare {
3658 my $status;
3659 my $current = $Coro::current;
3660 (
3661 sub {
3662 $status = $!;
3663 $current->ready; undef $current;
3664 },
3665 sub {
3666 Coro::schedule while defined $current;
3667 $! = $status;
3668 },
3669 )
3670 };
3671 3795
3672 unless ($DB_ENV) { 3796 unless ($DB_ENV) {
3673 $DB_ENV = BDB::db_env_create; 3797 $DB_ENV = BDB::db_env_create;
3674 $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
3675 | BDB::LOG_AUTOREMOVE, 1); 3799 | BDB::LOG_AUTOREMOVE, 1);
… …
3690 3814
3691 cf::cleanup "db_env_open(db): $@" if $@; 3815 cf::cleanup "db_env_open(db): $@" if $@;
3692 }; 3816 };
3693 } 3817 }
3694 3818
3695 $BDB_DEADLOCK_WATCHER = Event->timer ( 3819 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3696 after => 3,
3697 interval => 1,
3698 hard => 1,
3699 prio => 0,
3700 data => WF_AUTOCANCEL,
3701 cb => sub {
3702 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 { };
3703 },
3704 ); 3821 };
3705 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3822 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3706 after => 11,
3707 interval => 60,
3708 hard => 1,
3709 prio => 0,
3710 data => WF_AUTOCANCEL,
3711 cb => sub {
3712 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3823 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3713 },
3714 ); 3824 };
3715 $BDB_TRICKLE_WATCHER = Event->timer ( 3825 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3716 after => 5,
3717 interval => 10,
3718 hard => 1,
3719 prio => 0,
3720 data => WF_AUTOCANCEL,
3721 cb => sub {
3722 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3826 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3723 },
3724 ); 3827 };
3725} 3828}
3726 3829
3727{ 3830{
3831 # configure IO::AIO
3832
3728 IO::AIO::min_parallel 8; 3833 IO::AIO::min_parallel 8;
3729
3730 undef $Coro::AIO::WATCHER;
3731 IO::AIO::max_poll_time $TICK * 0.1; 3834 IO::AIO::max_poll_time $TICK * 0.1;
3732 $AIO_POLL_WATCHER = Event->io ( 3835 undef $AnyEvent::AIO::WATCHER;
3733 reentrant => 0,
3734 data => WF_AUTOCANCEL,
3735 fd => IO::AIO::poll_fileno,
3736 poll => 'r',
3737 prio => 0,
3738 cb => \&IO::AIO::poll_cb,
3739 );
3740} 3836}
3741 3837
3742my $_log_backtrace; 3838my $_log_backtrace;
3743 3839
3744sub _log_backtrace { 3840sub _log_backtrace {

Diff Legend

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