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.283 by root, Sun Jun 24 04:09:29 2007 UTC vs.
Revision 1.442 by root, Sun Aug 31 09:03:31 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
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
15use Coro 3.61 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
49use Coro::Util ();
24 50
51use JSON::XS 2.01 ();
25use BDB (); 52use BDB ();
26use Data::Dumper; 53use Data::Dumper;
27use Digest::MD5; 54use Digest::MD5;
28use Fcntl; 55use Fcntl;
29use YAML::Syck (); 56use YAML ();
30use IO::AIO 2.32 (); 57use IO::AIO ();
31use Time::HiRes; 58use Time::HiRes;
32use Compress::LZF; 59use Compress::LZF;
60use Digest::MD5 ();
61
62AnyEvent::detect;
33 63
34# configure various modules to our taste 64# configure various modules to our taste
35# 65#
36$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39 69
40$Event::Eval = 1; # no idea why this is required, but it is
41
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1;
44
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 71
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
48 73
49our %COMMAND = (); 74our %COMMAND = ();
50our %COMMAND_TIME = (); 75our %COMMAND_TIME = ();
51 76
52our @EXTS = (); # list of extension package names 77our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 78our %EXTCMD = ();
79our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 80our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 81our %EXT_MAP = (); # pluggable maps
56 82
57our $RELOAD; # number of reloads so far 83our $RELOAD; # number of reloads so far
58our @EVENT; 84our @EVENT;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our %RESOURCE;
71 98
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER;
74our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 101our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
79 103
104our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER;
80our $BDB_POLL_WATCHER; 106our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 107our $DB_ENV;
82 108
83our %CFG; 109our %CFG;
84 110
85our $UPTIME; $UPTIME ||= time; 111our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 112our $RUNTIME;
113our $NOW;
87 114
88our %PLAYER; # all users 115our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 116our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 117our $LINK_MAP; # the special {link} map, which is always available
91 118
92# used to convert map paths into valid unix filenames by replacing / by ∕ 119# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 121
95our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
97our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
98 126
99binmode STDOUT; 127binmode STDOUT;
100binmode STDERR; 128binmode STDERR;
101 129
102# read virtual server time, if available 130# read virtual server time, if available
155 183
156The raw value load value from the last tick. 184The raw value load value from the last tick.
157 185
158=item %cf::CFG 186=item %cf::CFG
159 187
160Configuration for the server, loaded from C</etc/crossfire/config>, or 188Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 189from wherever your confdir points to.
162 190
163=item cf::wait_for_tick, cf::wait_for_tick_begin 191=item cf::wait_for_tick, cf::wait_for_tick_begin
164 192
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 193These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 194returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 195per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 196
197=item @cf::INVOKE_RESULTS
198
199This array contains the results of the last C<invoke ()> call. When
200C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
201that call.
202
169=back 203=back
170 204
171=cut 205=cut
172 206
173BEGIN { 207BEGIN {
177 $msg .= "\n" 211 $msg .= "\n"
178 unless $msg =~ /\n$/; 212 unless $msg =~ /\n$/;
179 213
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 215
182 utf8::encode $msg;
183 LOG llevError, $msg; 216 LOG llevError, $msg;
184 }; 217 };
185} 218}
219
220$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "=="
222
223 if ($Coro::current == $Coro::main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d#
226 }#d#
227
228 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate
231};
232
233$SIG{__DIE__} = sub { }; #d#?
186 234
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
197for my $pkg (qw( 245for my $pkg (qw(
198 cf::global cf::attachable 246 cf::global cf::attachable
199 cf::object cf::object::player 247 cf::object cf::object::player
200 cf::client cf::player 248 cf::client cf::player
201 cf::arch cf::living 249 cf::arch cf::living
250 cf::map cf::mapspace
202 cf::map cf::party cf::region 251 cf::party cf::region
203)) { 252)) {
204 no strict 'refs';
205 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
206} 254}
207 255
208$Event::DIED = sub { 256$EV::DIED = sub {
209 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
210}; 258};
211 259
212############################################################################# 260#############################################################################
213 261
236 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 284 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237 $d 285 $d
238 } || "[unable to dump $_[0]: '$@']"; 286 } || "[unable to dump $_[0]: '$@']";
239} 287}
240 288
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243=item $ref = cf::from_json $json 289=item $ref = cf::decode_json $json
244 290
245Converts a JSON string into the corresponding perl data structure. 291Converts a JSON string into the corresponding perl data structure.
246 292
247=item $json = cf::to_json $ref 293=item $json = cf::encode_json $ref
248 294
249Converts a perl data structure into its JSON representation. 295Converts a perl data structure into its JSON representation.
296
297=cut
298
299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
300
301sub encode_json($) { $json_coder->encode ($_[0]) }
302sub decode_json($) { $json_coder->decode ($_[0]) }
250 303
251=item cf::lock_wait $string 304=item cf::lock_wait $string
252 305
253Wait until the given lock is available. See cf::lock_acquire. 306Wait until the given lock is available. See cf::lock_acquire.
254 307
257Wait until the given lock is available and then acquires it and returns 310Wait until the given lock is available and then acquires it and returns
258a Coro::guard object. If the guard object gets destroyed (goes out of scope, 311a Coro::guard object. If the guard object gets destroyed (goes out of scope,
259for example when the coroutine gets canceled), the lock is automatically 312for example when the coroutine gets canceled), the lock is automatically
260returned. 313returned.
261 314
315Locks are *not* recursive, locking from the same coro twice results in a
316deadlocked coro.
317
262Lock names should begin with a unique identifier (for example, cf::map::find 318Lock names should begin with a unique identifier (for example, cf::map::find
263uses map_find and cf::map::load uses map_load). 319uses map_find and cf::map::load uses map_load).
264 320
265=item $locked = cf::lock_active $string 321=item $locked = cf::lock_active $string
266 322
267Return true if the lock is currently active, i.e. somebody has locked it. 323Return true if the lock is currently active, i.e. somebody has locked it.
268 324
269=cut 325=cut
270 326
271our %LOCK; 327our %LOCK;
328our %LOCKER;#d#
272 329
273sub lock_wait($) { 330sub lock_wait($) {
274 my ($key) = @_; 331 my ($key) = @_;
332
333 if ($LOCKER{$key} == $Coro::current) {#d#
334 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
335 return;#d#
336 }#d#
275 337
276 # wait for lock, if any 338 # wait for lock, if any
277 while ($LOCK{$key}) { 339 while ($LOCK{$key}) {
278 push @{ $LOCK{$key} }, $Coro::current; 340 push @{ $LOCK{$key} }, $Coro::current;
279 Coro::schedule; 341 Coro::schedule;
285 347
286 # wait, to be sure we are not locked 348 # wait, to be sure we are not locked
287 lock_wait $key; 349 lock_wait $key;
288 350
289 $LOCK{$key} = []; 351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
290 353
291 Coro::guard { 354 Coro::guard {
355 delete $LOCKER{$key};#d#
292 # wake up all waiters, to be on the safe side 356 # wake up all waiters, to be on the safe side
293 $_->ready for @{ delete $LOCK{$key} }; 357 $_->ready for @{ delete $LOCK{$key} };
294 } 358 }
295} 359}
296 360
299 363
300 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
301} 365}
302 366
303sub freeze_mainloop { 367sub freeze_mainloop {
304 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
305 369
306 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
307 $TICK_WATCHER->start; 371}
372
373=item cf::periodic $interval, $cb
374
375Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer.
377
378=cut
379
380sub periodic($$) {
381 my ($interval, $cb) = @_;
382
383 my $start = rand List::Util::min 180, $interval;
384
385 EV::periodic $start, $interval, 0, $cb
386}
387
388=item cf::get_slot $time[, $priority[, $name]]
389
390Allocate $time seconds of blocking CPU time at priority C<$priority>:
391This call blocks and returns only when you have at least C<$time> seconds
392of cpu time till the next tick. The slot is only valid till the next cede.
393
394The optional C<$name> can be used to identify the job to run. It might be
395used for statistical purposes and should identify the same time-class.
396
397Useful for short background jobs.
398
399=cut
400
401our @SLOT_QUEUE;
402our $SLOT_QUEUE;
403
404$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager");
407
408 my $signal = new Coro::Signal;
409
410 while () {
411 next_job:
412 my $avail = cf::till_tick;
413 if ($avail > 0.01) {
414 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) {
416 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send;
418 Coro::cede;
419 goto next_job;
420 }
421 }
422 }
423
424 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait;
428 } else {
429 Coro::schedule;
430 }
308 }; 431 }
309 $TICK_WATCHER->stop; 432};
310 $guard 433
434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
437 my ($time, $pri, $name) = @_;
438
439 $time = $TICK * .6 if $time > $TICK * .6;
440 my $sig = new Coro::Signal;
441
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready;
445 $sig->wait;
311} 446}
312 447
313=item cf::async { BLOCK } 448=item cf::async { BLOCK }
314 449
315Currently the same as Coro::async_pool, meaning you cannot use 450Currently the same as Coro::async_pool, meaning you cannot use
320 455
321BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
322 457
323=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
324 459
325The design of Crossfire TRT requires that the main coroutine ($Coro::main) 460The design of Deliantra requires that the main coroutine ($Coro::main)
326is always able to handle events or runnable, as Crossfire TRT is only 461is always able to handle events or runnable, as Deliantra is only
327partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 462partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
328acceptable. 463acceptable.
329 464
330If it must be done, put the blocking parts into C<sync_job>. This will run 465If it must be done, put the blocking parts into C<sync_job>. This will run
331the given BLOCK in another coroutine while waiting for the result. The 466the given BLOCK in another coroutine while waiting for the result. The
336 471
337sub sync_job(&) { 472sub sync_job(&) {
338 my ($job) = @_; 473 my ($job) = @_;
339 474
340 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
341 my $time = Event::time; 476 my $time = EV::time;
342 477
343 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
344 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
345 480
346 # TODO: use suspend/resume instead 481 LOG llevError, Carp::longmess "sync job";#d#
347 # (but this is cancel-safe) 482
348 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
349 484
350 my $busy = 1; 485 my $busy = 1;
351 my @res; 486 my @res;
352 487
353 (async { 488 (async {
489 $Coro::current->desc ("sync job coro");
354 @res = eval { $job->() }; 490 @res = eval { $job->() };
355 warn $@ if $@; 491 warn $@ if $@;
356 undef $busy; 492 undef $busy;
357 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
358 494
359 while ($busy) { 495 while ($busy) {
360 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
361 } 500 }
501 }
362 502
363 $time = Event::time - $time; 503 my $time = EV::time - $time;
364 504
365 LOG llevError | logBacktrace, Carp::longmess "long sync job"
366 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
367
368 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
369 506
370 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
371 } else { 508 } else {
372 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
373 510
398=item fork_call { }, $args 535=item fork_call { }, $args
399 536
400Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
401process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
402Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
403never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
404 541
405=cut 542=cut
406 543
407sub fork_call(&@) { 544sub fork_call(&@) {
408 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
409 546
410# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 547 # we seemingly have to make a local copy of the whole thing,
411# or die "socketpair: $!"; 548 # otherwise perl prematurely frees the stuff :/
412 pipe my $fh1, my $fh2 549 # TODO: investigate and fix (likely this will be rather laborious)
413 or die "pipe: $!";
414 550
415 if (my $pid = fork) { 551 my @res = Coro::Util::fork_eval {
416 close $fh2;
417
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
419 $res = Coro::Storable::thaw $res;
420
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423 die $$res unless "ARRAY" eq ref $res;
424
425 return wantarray ? @$res : $res->[-1];
426 } else {
427 reset_signals; 552 reset_signals;
428 local $SIG{__WARN__}; 553 &$cb
429 local $SIG{__DIE__}; 554 }, @args;
430 eval {
431 close $fh1;
432 555
433 my @res = eval { $cb->(@args) }; 556 wantarray ? @res : $res[-1]
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 557}
435 };
436 558
437 warn $@ if $@; 559=item $coin = coin_from_name $name
438 _exit 0; 560
439 } 561=cut
562
563our %coin_alias = (
564 "silver" => "silvercoin",
565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
579
580sub coin_from_name($) {
581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
440} 584}
441 585
442=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
443 587
444Returns a single value from the environment database. 588Returns a single value from the environment database.
446=item cf::db_put $family => $key => $value 590=item cf::db_put $family => $key => $value
447 591
448Stores the given C<$value> in the family. It can currently store binary 592Stores the given C<$value> in the family. It can currently store binary
449data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 593data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
450 594
595=item $db = cf::db_table "name"
596
597Create and/or open a new database table. The string must not be "db" and must be unique
598within each server.
599
451=cut 600=cut
601
602sub db_table($) {
603 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV;
605
606 eval {
607 $db->set_flags (BDB::CHKSUM);
608
609 utf8::encode $name;
610 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
611 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
612 cf::cleanup "db_open(db): $!" if $!;
613 };
614 cf::cleanup "db_open(db): $@" if $@;
615
616 $db
617}
452 618
453our $DB; 619our $DB;
454 620
455sub db_init { 621sub db_init {
456 unless ($DB) {
457 $DB = BDB::db_create $DB_ENV;
458
459 cf::sync_job { 622 cf::sync_job {
460 eval { 623 $DB ||= db_table "db";
461 $DB->set_flags (BDB::CHKSUM);
462
463 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
464 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
465 cf::cleanup "db_open(db): $!" if $!;
466 };
467 cf::cleanup "db_open(db): $@" if $@;
468 };
469 } 624 };
470} 625}
471 626
472sub db_get($$) { 627sub db_get($$) {
473 my $key = "$_[0]/$_[1]"; 628 my $key = "$_[0]/$_[1]";
474 629
524 if (1) { 679 if (1) {
525 $md5 = 680 $md5 =
526 join "\x00", 681 join "\x00",
527 $processversion, 682 $processversion,
528 map { 683 map {
529 Coro::cede; 684 cf::cede_to_tick;
530 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 685 ($src->[$_], Digest::MD5::md5_hex $data[$_])
531 } 0.. $#$src; 686 } 0.. $#$src;
532 687
533 688
534 my $dbmd5 = db_get cache => "$id/md5"; 689 my $dbmd5 = db_get cache => "$id/md5";
578attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
579to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
580 735
581In the following description, CLASS can be any of C<global>, C<object> 736In the following description, CLASS can be any of C<global>, C<object>
582C<player>, C<client> or C<map> (i.e. the attachable objects in 737C<player>, C<client> or C<map> (i.e. the attachable objects in
583Crossfire TRT). 738Deliantra).
584 739
585=over 4 740=over 4
586 741
587=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
588 743
840 "; 995 ";
841 die if $@; 996 die if $@;
842} 997}
843 998
844our $override; 999our $override;
845our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1000our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846 1001
847sub override { 1002sub override {
848 $override = 1; 1003 $override = 1;
849 @invoke_results = (); 1004 @INVOKE_RESULTS = (@_);
850} 1005}
851 1006
852sub do_invoke { 1007sub do_invoke {
853 my $event = shift; 1008 my $event = shift;
854 my $callbacks = shift; 1009 my $callbacks = shift;
855 1010
856 @invoke_results = (); 1011 @INVOKE_RESULTS = ();
857 1012
858 local $override; 1013 local $override;
859 1014
860 for (@$callbacks) { 1015 for (@$callbacks) {
861 eval { &{$_->[1]} }; 1016 eval { &{$_->[1]} };
870 } 1025 }
871 1026
872 0 1027 0
873} 1028}
874 1029
875=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
876 1031
877=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
878 1033
879Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
880 1035
881This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1036This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
882removed in future versions), and there is no public API to access override 1037removed in future versions), and there is no public API to access override
883results (if you must, access C<@cf::invoke_results> directly). 1038results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884 1039
885=back 1040=back
886 1041
887=cut 1042=cut
888 1043
889############################################################################# 1044#############################################################################
890# object support 1045# object support
1046
1047sub _object_equal($$);
1048sub _object_equal($$) {
1049 my ($a, $b) = @_;
1050
1051 return 0 unless (ref $a) eq (ref $b);
1052
1053 if ("HASH" eq ref $a) {
1054 my @ka = keys %$a;
1055 my @kb = keys %$b;
1056
1057 return 0 if @ka != @kb;
1058
1059 for (0 .. $#ka) {
1060 return 0 unless $ka[$_] eq $kb[$_];
1061 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1062 }
1063
1064 } elsif ("ARRAY" eq ref $a) {
1065
1066 return 0 if @$a != @$b;
1067
1068 for (0 .. $#$a) {
1069 return 0 unless _object_equal $a->[$_], $b->[$_];
1070 }
1071
1072 } elsif ($a ne $b) {
1073 return 0;
1074 }
1075
1076 1
1077}
1078
1079our $SLOW_MERGES;#d#
1080sub _can_merge {
1081 my ($ob1, $ob2) = @_;
1082
1083 ++$SLOW_MERGES;#d#
1084
1085 # we do the slow way here
1086 return _object_equal $ob1, $ob2
1087}
891 1088
892sub reattach { 1089sub reattach {
893 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
894 my ($obj) = @_; 1091 my ($obj) = @_;
895 1092
1093 # no longer needed after getting rid of delete_package?
896 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
897 1095
898 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
899 1097
900 @$registry = (); 1098 @$registry = ();
901 1099
916cf::attachable->attach ( 1114cf::attachable->attach (
917 prio => -1000000, 1115 prio => -1000000,
918 on_instantiate => sub { 1116 on_instantiate => sub {
919 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
920 1118
921 $data = from_json $data; 1119 $data = decode_json $data;
922 1120
923 for (@$data) { 1121 for (@$data) {
924 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
925 1123
926 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
942sub object_freezer_save { 1140sub object_freezer_save {
943 my ($filename, $rdata, $objs) = @_; 1141 my ($filename, $rdata, $objs) = @_;
944 1142
945 sync_job { 1143 sync_job {
946 if (length $$rdata) { 1144 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename);
947 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
948 $filename, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
949 1148
950 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
952 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
954 close $fh; 1153 aio_close $fh;
955 1154
956 if (@$objs) { 1155 if (@$objs) {
957 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
959 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
960 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
962 close $fh; 1161 aio_close $fh;
963 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
964 } 1163 }
965 } else { 1164 } else {
966 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
967 } 1166 }
972 } 1171 }
973 } else { 1172 } else {
974 aio_unlink $filename; 1173 aio_unlink $filename;
975 aio_unlink "$filename.pst"; 1174 aio_unlink "$filename.pst";
976 } 1175 }
977 } 1176 };
978} 1177}
979 1178
980sub object_freezer_as_string { 1179sub object_freezer_as_string {
981 my ($rdata, $objs) = @_; 1180 my ($rdata, $objs) = @_;
982 1181
994 or return; 1193 or return;
995 1194
996 unless (aio_stat "$filename.pst") { 1195 unless (aio_stat "$filename.pst") {
997 (aio_load "$filename.pst", $av) >= 0 1196 (aio_load "$filename.pst", $av) >= 0
998 or return; 1197 or return;
1198
999 $av = eval { (Storable::thaw $av)->{objs} }; 1199 my $st = eval { Coro::Storable::thaw $av };
1200 $av = $st->{objs};
1000 } 1201 }
1001 1202
1203 utf8::decode (my $decname = $filename);
1002 warn sprintf "loading %s (%d)\n", 1204 warn sprintf "loading %s (%d,%d)\n",
1003 $filename, length $data, scalar @{$av || []}; 1205 $decname, length $data, scalar @{$av || []};
1206
1004 return ($data, $av); 1207 ($data, $av)
1005} 1208}
1006 1209
1007=head2 COMMAND CALLBACKS 1210=head2 COMMAND CALLBACKS
1008 1211
1009=over 4 1212=over 4
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1232 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1233}
1031 1234
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1235=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1236
1034Register a callback fro execution when the client sends an extcmd packet. 1237Register a callback for execution when the client sends an (synchronous)
1238extcmd packet. Ext commands will be processed in the order they are
1239received by the server, like other user commands. The first argument is
1240the logged-in player. Ext commands can only be processed after a player
1241has logged in successfully.
1035 1242
1036If the callback returns something, it is sent back as if reply was being 1243If the callback returns something, it is sent back as if reply was being
1037called. 1244called.
1038 1245
1246=item cf::register_exticmd $name => \&callback($ns,$packet);
1247
1248Register a callback for execution when the client sends an (asynchronous)
1249exticmd packet. Exti commands are processed by the server as soon as they
1250are received, i.e. out of order w.r.t. other commands. The first argument
1251is a client socket. Exti commands can be received anytime, even before
1252log-in.
1253
1254If the callback returns something, it is sent back as if reply was being
1255called.
1256
1039=cut 1257=cut
1040 1258
1041sub register_extcmd { 1259sub register_extcmd {
1042 my ($name, $cb) = @_; 1260 my ($name, $cb) = @_;
1043 1261
1044 $EXTCMD{$name} = $cb; 1262 $EXTCMD{$name} = $cb;
1263}
1264
1265sub register_exticmd {
1266 my ($name, $cb) = @_;
1267
1268 $EXTICMD{$name} = $cb;
1045} 1269}
1046 1270
1047cf::player->attach ( 1271cf::player->attach (
1048 on_command => sub { 1272 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1273 my ($pl, $name, $params) = @_;
1058 cf::override; 1282 cf::override;
1059 }, 1283 },
1060 on_extcmd => sub { 1284 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1285 my ($pl, $buf) = @_;
1062 1286
1063 my $msg = eval { from_json $buf }; 1287 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1288
1065 if (ref $msg) { 1289 if (ref $msg) {
1290 my ($type, $reply, @payload) =
1291 "ARRAY" eq ref $msg
1292 ? @$msg
1293 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1294
1295 my @reply;
1296
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1297 if (my $cb = $EXTCMD{$type}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1298 @reply = $cb->($pl, @payload);
1068 $pl->ext_reply ($msg->{msgid}, %reply);
1069 }
1070 } 1299 }
1300
1301 $pl->ext_reply ($reply, @reply)
1302 if $reply;
1303
1071 } else { 1304 } else {
1072 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1305 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073 } 1306 }
1074 1307
1075 cf::override; 1308 cf::override;
1102 1335
1103 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1104 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1105 1338
1106 $ext{source} = 1339 $ext{source} =
1107 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1108 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1109 . $source 1342 . $source
1110 . "\n};\n1"; 1343 . "\n};\n1";
1111 1344
1112 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
1128 my $msg = $@ ? "$v->{path}: $@\n" 1361 my $msg = $@ ? "$v->{path}: $@\n"
1129 : "$v->{base}: extension inactive.\n"; 1362 : "$v->{base}: extension inactive.\n";
1130 1363
1131 if (exists $v->{meta}{mandatory}) { 1364 if (exists $v->{meta}{mandatory}) {
1132 warn $msg; 1365 warn $msg;
1133 warn "mandatory extension failed to load, exiting.\n"; 1366 cf::cleanup "mandatory extension failed to load, exiting.";
1134 exit 1;
1135 } 1367 }
1136 1368
1137 warn $msg; 1369 warn $msg;
1138 } 1370 }
1139 1371
1164use Coro::AIO; 1396use Coro::AIO;
1165 1397
1166=head3 cf::player 1398=head3 cf::player
1167 1399
1168=over 4 1400=over 4
1401
1402=item cf::player::num_playing
1403
1404Returns the official number of playing players, as per the Crossfire metaserver rules.
1405
1406=cut
1407
1408sub num_playing {
1409 scalar grep
1410 $_->ob->map
1411 && !$_->hidden
1412 && !$_->ob->flag (cf::FLAG_WIZ),
1413 cf::player::list
1414}
1169 1415
1170=item cf::player::find $login 1416=item cf::player::find $login
1171 1417
1172Returns the given player object, loading it if necessary (might block). 1418Returns the given player object, loading it if necessary (might block).
1173 1419
1209 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1455 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1456 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1457 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212 aio_unlink +(playerdir $login) . "/$login.pl"; 1458 aio_unlink +(playerdir $login) . "/$login.pl";
1213 1459
1214 my $pl = load_pl path $login 1460 my $f = new_from_file cf::object::thawer path $login
1215 or return; 1461 or return;
1462
1463 my $pl = cf::player::load_pl $f
1464 or return;
1465
1466 local $cf::PLAYER_LOADING{$login} = $pl;
1467 $f->resolve_delayed_derefs;
1216 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1217 } 1469 }
1218 } 1470 }
1219} 1471}
1220 1472
1229 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1230 1482
1231 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1232 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1233 1485
1486 cf::get_slot 0.01;
1487
1234 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1235 Coro::cede; 1489 cf::cede_to_tick;
1236} 1490}
1237 1491
1238sub new($) { 1492sub new($) {
1239 my ($login) = @_; 1493 my ($login) = @_;
1240 1494
1246 $cf::PLAYER{$login} = $self; 1500 $cf::PLAYER{$login} = $self;
1247 1501
1248 $self 1502 $self
1249} 1503}
1250 1504
1505=item $player->send_msg ($channel, $msg, $color, [extra...])
1506
1507=cut
1508
1509sub send_msg {
1510 my $ns = shift->ns
1511 or return;
1512 $ns->send_msg (@_);
1513}
1514
1251=item $pl->quit_character 1515=item $pl->quit_character
1252 1516
1253Nukes the player without looking back. If logged in, the connection will 1517Nukes the player without looking back. If logged in, the connection will
1254be destroyed. May block for a long time. 1518be destroyed. May block for a long time.
1255 1519
1263 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1264 $pl->password ("*"); # this should lock out the player until we nuked the dir 1528 $pl->password ("*"); # this should lock out the player until we nuked the dir
1265 1529
1266 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1267 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1268 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1269 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1270 1536
1271 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1272 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
1308 or return []; 1574 or return [];
1309 1575
1310 my @logins; 1576 my @logins;
1311 1577
1312 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1579 my $path = path $login;
1580
1581 # a .pst is a dead give-away for a valid player
1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1313 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1315 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1587 }
1316 1588
1317 utf8::decode $login; 1589 utf8::decode $login;
1318 push @logins, $login; 1590 push @logins, $login;
1319 } 1591 }
1320 1592
1354Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1355 1627
1356=cut 1628=cut
1357 1629
1358sub expand_cfpod { 1630sub expand_cfpod {
1359 ((my $self), (local $_)) = @_; 1631 my ($self, $pod) = @_;
1360 1632
1361 # escape & and < 1633 my @nest = [qr<\G$>, undef, ""];
1362 s/&/&amp;/g; 1634 my $xml;
1363 s/(?<![BIUGH])</&lt;/g;
1364 1635
1365 # this is buggy, it needs to properly take care of nested <'s 1636 for ($pod) {
1637 while () {
1638 if (/\G( (?: [^BCEGHITUZ&>\n\ ]+ | [BCEGHITUZ](?!<) | \ (?!>) )+ )/xgcs) {
1639 $xml .= $1;
1640 } elsif (/\G\n(?=\S)/xgcs) {
1641 $xml .= " ";
1642 } elsif (/\G\n/xgcs) {
1643 $xml .= "\n";
1644 } elsif (/\G ([BCEGHITUZ]) (< (?: <+\ | (?!<) ) )/xgcs) {
1645 my ($code, $delim) = ($1, scalar reverse $2);
1646 $delim =~ y/</>/; # delim now contains the stop sequence
1647 $delim = qr{\G\Q$delim};
1366 1648
1367 1 while 1649 my $cb;
1368 # replace B<>, I<>, U<> etc. 1650
1369 s/B<([^\>]*)>/<b>$1<\/b>/ 1651 if ($code eq "B") {
1370 || s/I<([^\>]*)>/<i>$1<\/i>/ 1652 $cb = sub { "<b>$_[0]</b>" };
1371 || s/U<([^\>]*)>/<u>$1<\/u>/ 1653 } elsif ($code eq "C") {
1372 # replace G<male|female> tags 1654 $cb = sub { "<tt>$_[0]</tt>" };
1373 || s{G<([^>|]*)\|([^>]*)>}{ 1655 } elsif ($code eq "E") {
1374 $self->gender ? $2 : $1 1656 $cb = sub { warn "E<$_[0]>\n";"&$_[0];" };
1657 } elsif ($code eq "G") {
1658 $cb = sub {
1659 my ($male, $female) = split /\|/, $_[0];
1660 $self->gender ? $female : $male
1661 };
1662 } elsif ($code eq "H") {
1663 $cb = sub {
1664 (
1665 "<fg name=\"lightblue\">[$_[0] (Use hintmode to suppress hints)]</fg>",
1666 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1667 "",
1668 )[$self->{hintmode}];
1669 };
1670 } elsif ($code eq "I") {
1671 $cb = sub { "<i>$_[0]</i>" };
1672 } elsif ($code eq "T") {
1673 $cb = sub { "<big><b>$_[0]</b></big>" };
1674 } elsif ($code eq "U") {
1675 $cb = sub { "<u>$_[0]</u>" };
1676 } elsif ($code eq "Z") {
1677 $cb = sub { };
1678 } else {
1679 die "FATAL error in expand_cfpod";
1680 }
1681
1682 push @nest, [$delim, $cb, $xml];
1683 undef $xml;
1684
1685 } elsif ($_ =~ /$nest[-1][0]/gcs) {
1686 my $nest = pop @nest;
1687
1688 if ($nest->[1]) {
1689 $xml = $nest->[2] . $nest->[1]->($xml);
1690 } else {
1691 last;
1692 }
1693 } elsif (/\G</xgcs) {
1694 $xml .= "&lt;";
1695 } elsif (/\G&/xgcs) {
1696 $xml .= "&amp;";
1697 } elsif (/\G>/xgcs) {
1698 $xml .= ">";
1699 } else {
1700 if ($pod =~ /\G(.+)/xgcs) {
1701 warn "parse error (at $1)($nest[-1][0]) while expanding cfpod:\n$pod";
1702 last;
1703 } else {
1704 warn "parse error (unclosed interior sequence at end of cfpod) while expanding cfpod:\n$pod";
1705 return "<b>Sorry, the server encountered an internal error when formatting this message, please report this.</b>";
1706 }
1707 }
1375 }ge 1708 }
1376 # replace H<hint text> 1709 }
1377 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1378 1710
1379 # create single paragraphs (very hackish) 1711 $xml
1380 s/(?<=\S)\n(?=\w)/ /g;
1381
1382 $_
1383} 1712}
1384 1713
1714sub hintmode {
1715 $_[0]{hintmode} = $_[1] if @_ > 1;
1716 $_[0]{hintmode}
1717}
1718
1385=item $player->ext_reply ($msgid, %msg) 1719=item $player->ext_reply ($msgid, @msg)
1386 1720
1387Sends an ext reply to the player. 1721Sends an ext reply to the player.
1388 1722
1389=cut 1723=cut
1390 1724
1391sub ext_reply($$%) { 1725sub ext_reply($$@) {
1392 my ($self, $id, %msg) = @_; 1726 my ($self, $id, @msg) = @_;
1393 1727
1394 $msg{msgid} = $id; 1728 $self->ns->ext_reply ($id, @msg)
1395
1396 $self->send ("ext " . cf::to_json \%msg);
1397} 1729}
1398 1730
1399=item $player->ext_event ($type, %msg) 1731=item $player->ext_msg ($type, @msg)
1400 1732
1401Sends an ext event to the client. 1733Sends an ext event to the client.
1402 1734
1403=cut 1735=cut
1404 1736
1405sub ext_event($$%) { 1737sub ext_msg($$@) {
1406 my ($self, $type, %msg) = @_; 1738 my ($self, $type, @msg) = @_;
1407 1739
1408 $self->ns->ext_event ($type, %msg); 1740 $self->ns->ext_msg ($type, @msg);
1409} 1741}
1410 1742
1411=head3 cf::region 1743=head3 cf::region
1412 1744
1413=over 4 1745=over 4
1426 my ($path) = @_; 1758 my ($path) = @_;
1427 1759
1428 my ($match, $specificity); 1760 my ($match, $specificity);
1429 1761
1430 for my $region (list) { 1762 for my $region (list) {
1431 if ($region->match && $path =~ $region->match) { 1763 if ($region->{match} && $path =~ $region->{match}) {
1432 ($match, $specificity) = ($region, $region->specificity) 1764 ($match, $specificity) = ($region, $region->specificity)
1433 if $region->specificity > $specificity; 1765 if $region->specificity > $specificity;
1434 } 1766 }
1435 } 1767 }
1436 1768
1457our $MAX_RESET = 3600; 1789our $MAX_RESET = 3600;
1458our $DEFAULT_RESET = 3000; 1790our $DEFAULT_RESET = 3000;
1459 1791
1460sub generate_random_map { 1792sub generate_random_map {
1461 my ($self, $rmp) = @_; 1793 my ($self, $rmp) = @_;
1794
1795 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1796
1462 # mit "rum" bekleckern, nicht 1797 # mit "rum" bekleckern, nicht
1463 $self->_create_random_map ( 1798 $self->_create_random_map (
1464 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1799 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1465 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1800 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1466 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1801 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1556 $self->init; # pass $1 etc. 1891 $self->init; # pass $1 etc.
1557 return $self; 1892 return $self;
1558 } 1893 }
1559 } 1894 }
1560 1895
1561 Carp::carp "unable to resolve path '$path' (base '$base')."; 1896 Carp::cluck "unable to resolve path '$path' (base '$base').";
1562 () 1897 ()
1563} 1898}
1564 1899
1565sub init { 1900sub init {
1566 my ($self) = @_; 1901 my ($self) = @_;
1588 1923
1589# the temporary/swap location 1924# the temporary/swap location
1590sub save_path { 1925sub save_path {
1591 my ($self) = @_; 1926 my ($self) = @_;
1592 1927
1593 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1594 "$TMPDIR/$path.map" 1929 "$TMPDIR/$path.map"
1595} 1930}
1596 1931
1597# the unique path, undef == no special unique path 1932# the unique path, undef == no special unique path
1598sub uniq_path { 1933sub uniq_path {
1599 my ($self) = @_; 1934 my ($self) = @_;
1600 1935
1601 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1936 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1602 "$UNIQUEDIR/$path" 1937 "$UNIQUEDIR/$path"
1603} 1938}
1604 1939
1605# and all this just because we cannot iterate over 1940# and all this just because we cannot iterate over
1606# all maps in C++... 1941# all maps in C++...
1629 1964
1630sub load_header_from($) { 1965sub load_header_from($) {
1631 my ($self, $path) = @_; 1966 my ($self, $path) = @_;
1632 1967
1633 utf8::encode $path; 1968 utf8::encode $path;
1634 #aio_open $path, O_RDONLY, 0 1969 my $f = new_from_file cf::object::thawer $path
1635 # or return;
1636
1637 $self->_load_header ($path)
1638 or return; 1970 or return;
1971
1972 $self->_load_header ($f)
1973 or return;
1974
1975 local $MAP_LOADING{$self->{path}} = $self;
1976 $f->resolve_delayed_derefs;
1639 1977
1640 $self->{load_path} = $path; 1978 $self->{load_path} = $path;
1641 1979
1642 1 1980 1
1643} 1981}
1697sub find { 2035sub find {
1698 my ($path, $origin) = @_; 2036 my ($path, $origin) = @_;
1699 2037
1700 $path = normalise $path, $origin && $origin->path; 2038 $path = normalise $path, $origin && $origin->path;
1701 2039
2040 cf::lock_wait "map_data:$path";#d#remove
1702 cf::lock_wait "map_find:$path"; 2041 cf::lock_wait "map_find:$path";
1703 2042
1704 $cf::MAP{$path} || do { 2043 $cf::MAP{$path} || do {
2044 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1705 my $guard = cf::lock_acquire "map_find:$path"; 2045 my $guard2 = cf::lock_acquire "map_find:$path";
2046
1706 my $map = new_from_path cf::map $path 2047 my $map = new_from_path cf::map $path
1707 or return; 2048 or return;
1708 2049
1709 $map->{last_save} = $cf::RUNTIME; 2050 $map->{last_save} = $cf::RUNTIME;
1710 2051
1712 or return; 2053 or return;
1713 2054
1714 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2055 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1715 # doing this can freeze the server in a sync job, obviously 2056 # doing this can freeze the server in a sync job, obviously
1716 #$cf::WAIT_FOR_TICK->wait; 2057 #$cf::WAIT_FOR_TICK->wait;
2058 undef $guard2;
2059 undef $guard1;
1717 $map->reset; 2060 $map->reset;
1718 undef $guard;
1719 return find $path; 2061 return find $path;
1720 } 2062 }
1721 2063
1722 $cf::MAP{$path} = $map 2064 $cf::MAP{$path} = $map
1723 } 2065 }
1732 local $self->{deny_reset} = 1; # loading can take a long time 2074 local $self->{deny_reset} = 1; # loading can take a long time
1733 2075
1734 my $path = $self->{path}; 2076 my $path = $self->{path};
1735 2077
1736 { 2078 {
1737 my $guard = cf::lock_acquire "map_load:$path"; 2079 my $guard = cf::lock_acquire "map_data:$path";
1738 2080
2081 return unless $self->valid;
1739 return if $self->in_memory != cf::MAP_SWAPPED; 2082 return unless $self->in_memory == cf::MAP_SWAPPED;
1740 2083
1741 $self->in_memory (cf::MAP_LOADING); 2084 $self->in_memory (cf::MAP_LOADING);
1742 2085
1743 $self->alloc; 2086 $self->alloc;
1744 2087
1745 $self->pre_load; 2088 $self->pre_load;
1746 Coro::cede; 2089 cf::cede_to_tick;
1747 2090
2091 my $f = new_from_file cf::object::thawer $self->{load_path};
2092 $f->skip_block;
1748 $self->_load_objects ($self->{load_path}, 1) 2093 $self->_load_objects ($f)
1749 or return; 2094 or return;
1750 2095
1751 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2096 $self->post_load_original
1752 if delete $self->{load_original}; 2097 if delete $self->{load_original};
1753 2098
1754 if (my $uniq = $self->uniq_path) { 2099 if (my $uniq = $self->uniq_path) {
1755 utf8::encode $uniq; 2100 utf8::encode $uniq;
1756 if (aio_open $uniq, O_RDONLY, 0) { 2101 unless (aio_stat $uniq) {
2102 if (my $f = new_from_file cf::object::thawer $uniq) {
1757 $self->clear_unique_items; 2103 $self->clear_unique_items;
1758 $self->_load_objects ($uniq, 0); 2104 $self->_load_objects ($f);
2105 $f->resolve_delayed_derefs;
2106 }
1759 } 2107 }
1760 } 2108 }
1761 2109
1762 Coro::cede; 2110 $f->resolve_delayed_derefs;
2111
2112 cf::cede_to_tick;
1763 # now do the right thing for maps 2113 # now do the right thing for maps
1764 $self->link_multipart_objects; 2114 $self->link_multipart_objects;
1765 $self->difficulty ($self->estimate_difficulty) 2115 $self->difficulty ($self->estimate_difficulty)
1766 unless $self->difficulty; 2116 unless $self->difficulty;
1767 Coro::cede; 2117 cf::cede_to_tick;
1768 2118
1769 unless ($self->{deny_activate}) { 2119 unless ($self->{deny_activate}) {
1770 $self->decay_objects; 2120 $self->decay_objects;
1771 $self->fix_auto_apply; 2121 $self->fix_auto_apply;
1772 $self->update_buttons; 2122 $self->update_buttons;
1773 Coro::cede; 2123 cf::cede_to_tick;
1774 $self->set_darkness_map; 2124 $self->set_darkness_map;
1775 Coro::cede; 2125 cf::cede_to_tick;
1776 $self->activate; 2126 $self->activate;
1777 } 2127 }
1778 2128
2129 $self->{last_save} = $cf::RUNTIME;
2130 $self->last_access ($cf::RUNTIME);
2131
1779 $self->in_memory (cf::MAP_IN_MEMORY); 2132 $self->in_memory (cf::MAP_ACTIVE);
1780 } 2133 }
1781 2134
1782 $self->post_load; 2135 $self->post_load;
1783} 2136}
1784 2137
1793 2146
1794 $self 2147 $self
1795} 2148}
1796 2149
1797# find and load all maps in the 3x3 area around a map 2150# find and load all maps in the 3x3 area around a map
1798sub load_diag { 2151sub load_neighbours {
1799 my ($map) = @_; 2152 my ($map) = @_;
1800 2153
1801 my @diag; # diagonal neighbours 2154 my @neigh; # diagonal neighbours
1802 2155
1803 for (0 .. 3) { 2156 for (0 .. 3) {
1804 my $neigh = $map->tile_path ($_) 2157 my $neigh = $map->tile_path ($_)
1805 or next; 2158 or next;
1806 $neigh = find $neigh, $map 2159 $neigh = find $neigh, $map
1807 or next; 2160 or next;
1808 $neigh->load; 2161 $neigh->load;
1809 2162
2163 push @neigh,
1810 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2164 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1811 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2165 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1812 } 2166 }
1813 2167
1814 for (@diag) { 2168 for (grep defined $_->[0], @neigh) {
2169 my ($path, $origin) = @$_;
1815 my $neigh = find @$_ 2170 my $neigh = find $path, $origin
1816 or next; 2171 or next;
1817 $neigh->load; 2172 $neigh->load;
1818 } 2173 }
1819} 2174}
1820 2175
1825} 2180}
1826 2181
1827sub do_load_sync { 2182sub do_load_sync {
1828 my ($map) = @_; 2183 my ($map) = @_;
1829 2184
2185 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2186 if $Coro::current == $Coro::main;
2187
1830 cf::sync_job { $map->load }; 2188 cf::sync_job { $map->load };
1831} 2189}
1832 2190
1833our %MAP_PREFETCH; 2191our %MAP_PREFETCH;
1834our $MAP_PREFETCHER = undef; 2192our $MAP_PREFETCHER = undef;
1835 2193
1836sub find_async { 2194sub find_async {
1837 my ($path, $origin) = @_; 2195 my ($path, $origin, $load) = @_;
1838 2196
1839 $path = normalise $path, $origin && $origin->{path}; 2197 $path = normalise $path, $origin && $origin->{path};
1840 2198
1841 if (my $map = $cf::MAP{$path}) { 2199 if (my $map = $cf::MAP{$path}) {
1842 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2200 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1843 } 2201 }
1844 2202
1845 undef $MAP_PREFETCH{$path}; 2203 $MAP_PREFETCH{$path} |= $load;
2204
1846 $MAP_PREFETCHER ||= cf::async { 2205 $MAP_PREFETCHER ||= cf::async {
2206 $Coro::current->{desc} = "map prefetcher";
2207
1847 while (%MAP_PREFETCH) { 2208 while (%MAP_PREFETCH) {
1848 for my $path (keys %MAP_PREFETCH) { 2209 while (my ($k, $v) = each %MAP_PREFETCH) {
1849 my $map = find $path 2210 if (my $map = find $k) {
1850 or next;
1851 $map->load; 2211 $map->load if $v;
2212 }
1852 2213
1853 delete $MAP_PREFETCH{$path}; 2214 delete $MAP_PREFETCH{$k};
1854 } 2215 }
1855 } 2216 }
1856 undef $MAP_PREFETCHER; 2217 undef $MAP_PREFETCHER;
1857 }; 2218 };
1858 $MAP_PREFETCHER->prio (6); 2219 $MAP_PREFETCHER->prio (6);
1861} 2222}
1862 2223
1863sub save { 2224sub save {
1864 my ($self) = @_; 2225 my ($self) = @_;
1865 2226
1866 my $lock = cf::lock_acquire "map_data:" . $self->path; 2227 my $lock = cf::lock_acquire "map_data:$self->{path}";
1867 2228
1868 $self->{last_save} = $cf::RUNTIME; 2229 $self->{last_save} = $cf::RUNTIME;
1869 2230
1870 return unless $self->dirty; 2231 return unless $self->dirty;
1871 2232
1877 return if $self->{deny_save}; 2238 return if $self->{deny_save};
1878 2239
1879 local $self->{last_access} = $self->last_access;#d# 2240 local $self->{last_access} = $self->last_access;#d#
1880 2241
1881 cf::async { 2242 cf::async {
2243 $Coro::current->{desc} = "map player save";
1882 $_->contr->save for $self->players; 2244 $_->contr->save for $self->players;
1883 }; 2245 };
2246
2247 cf::get_slot 0.02;
1884 2248
1885 if ($uniq) { 2249 if ($uniq) {
1886 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2250 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1887 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2251 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1888 } else { 2252 } else {
1894 my ($self) = @_; 2258 my ($self) = @_;
1895 2259
1896 # save first because save cedes 2260 # save first because save cedes
1897 $self->save; 2261 $self->save;
1898 2262
1899 my $lock = cf::lock_acquire "map_data:" . $self->path; 2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
1900 2264
1901 return if $self->players; 2265 return if $self->players;
1902 return if $self->in_memory != cf::MAP_IN_MEMORY; 2266 return if $self->in_memory != cf::MAP_ACTIVE;
1903 return if $self->{deny_save}; 2267 return if $self->{deny_save};
1904 2268
2269 $self->in_memory (cf::MAP_SWAPPED);
2270
2271 $self->deactivate;
2272 $_->clear_links_to ($self) for values %cf::MAP;
1905 $self->clear; 2273 $self->clear;
1906 $self->in_memory (cf::MAP_SWAPPED);
1907} 2274}
1908 2275
1909sub reset_at { 2276sub reset_at {
1910 my ($self) = @_; 2277 my ($self) = @_;
1911 2278
1943 if $uniq; 2310 if $uniq;
1944 } 2311 }
1945 2312
1946 delete $cf::MAP{$self->path}; 2313 delete $cf::MAP{$self->path};
1947 2314
2315 $self->deactivate;
2316 $_->clear_links_to ($self) for values %cf::MAP;
1948 $self->clear; 2317 $self->clear;
1949
1950 $_->clear_links_to ($self) for values %cf::MAP;
1951 2318
1952 $self->unlink_save; 2319 $self->unlink_save;
1953 $self->destroy; 2320 $self->destroy;
1954} 2321}
1955 2322
1956my $nuke_counter = "aaaa"; 2323my $nuke_counter = "aaaa";
1957 2324
1958sub nuke { 2325sub nuke {
1959 my ($self) = @_; 2326 my ($self) = @_;
1960 2327
2328 {
2329 my $lock = cf::lock_acquire "map_data:$self->{path}";
2330
1961 delete $cf::MAP{$self->path}; 2331 delete $cf::MAP{$self->path};
1962 2332
1963 $self->unlink_save; 2333 $self->unlink_save;
1964 2334
1965 bless $self, "cf::map"; 2335 bless $self, "cf::map";
1966 delete $self->{deny_reset}; 2336 delete $self->{deny_reset};
1967 $self->{deny_save} = 1; 2337 $self->{deny_save} = 1;
1968 $self->reset_timeout (1); 2338 $self->reset_timeout (1);
1969 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2339 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1970 2340
1971 $cf::MAP{$self->path} = $self; 2341 $cf::MAP{$self->path} = $self;
2342 }
1972 2343
1973 $self->reset; # polite request, might not happen 2344 $self->reset; # polite request, might not happen
1974} 2345}
1975 2346
1976=item $maps = cf::map::tmp_maps 2347=item $maps = cf::map::tmp_maps
2018 2389
2019sub unique_maps() { 2390sub unique_maps() {
2020 [ 2391 [
2021 map { 2392 map {
2022 utf8::decode $_; 2393 utf8::decode $_;
2023 /\.map$/ 2394 s/\.map$//; # TODO future compatibility hack
2395 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2396 ? ()
2024 ? normalise $_ 2397 : normalise $_
2025 : ()
2026 } @{ aio_readdir $UNIQUEDIR or [] } 2398 } @{ aio_readdir $UNIQUEDIR or [] }
2027 ] 2399 ]
2028} 2400}
2029 2401
2030package cf;
2031
2032=back 2402=back
2033 2403
2034=head3 cf::object 2404=head3 cf::object
2035 2405
2036=cut 2406=cut
2039 2409
2040=over 4 2410=over 4
2041 2411
2042=item $ob->inv_recursive 2412=item $ob->inv_recursive
2043 2413
2044Returns the inventory of the object _and_ their inventories, recursively. 2414Returns the inventory of the object I<and> their inventories, recursively,
2415but I<not> the object itself.
2045 2416
2046=cut 2417=cut
2047 2418
2048sub inv_recursive_; 2419sub inv_recursive_;
2049sub inv_recursive_ { 2420sub inv_recursive_ {
2052 2423
2053sub inv_recursive { 2424sub inv_recursive {
2054 inv_recursive_ inv $_[0] 2425 inv_recursive_ inv $_[0]
2055} 2426}
2056 2427
2428=item $ref = $ob->ref
2429
2430Creates and returns a persistent reference to an object that can be stored as a string.
2431
2432=item $ob = cf::object::deref ($refstring)
2433
2434returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2435even if the object actually exists. May block.
2436
2437=cut
2438
2439sub deref {
2440 my ($ref) = @_;
2441
2442 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2443 my ($uuid, $name) = ($1, $2);
2444 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2445 or return;
2446 $pl->ob->uuid eq $uuid
2447 or return;
2448
2449 $pl->ob
2450 } else {
2451 warn "$ref: cannot resolve object reference\n";
2452 undef
2453 }
2454}
2455
2057package cf; 2456package cf;
2058 2457
2059=back 2458=back
2060 2459
2061=head3 cf::object::player 2460=head3 cf::object::player
2067Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2466Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2068can be C<undef>. Does the right thing when the player is currently in a 2467can be C<undef>. Does the right thing when the player is currently in a
2069dialogue with the given NPC character. 2468dialogue with the given NPC character.
2070 2469
2071=cut 2470=cut
2471
2472our $SAY_CHANNEL = {
2473 id => "say",
2474 title => "Map",
2475 reply => "say ",
2476 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2477};
2478
2479our $CHAT_CHANNEL = {
2480 id => "chat",
2481 title => "Chat",
2482 reply => "chat ",
2483 tooltip => "Player chat and shouts, global to the server.",
2484};
2072 2485
2073# rough implementation of a future "reply" method that works 2486# rough implementation of a future "reply" method that works
2074# with dialog boxes. 2487# with dialog boxes.
2075#TODO: the first argument must go, split into a $npc->reply_to ( method 2488#TODO: the first argument must go, split into a $npc->reply_to ( method
2076sub cf::object::player::reply($$$;$) { 2489sub cf::object::player::reply($$$;$) {
2083 2496
2084 } else { 2497 } else {
2085 my $pl = $self->contr; 2498 my $pl = $self->contr;
2086 2499
2087 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2500 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2088 my $diag = $pl->{npc_dialog}; 2501 my $dialog = $pl->{npc_dialog};
2089 $diag->{pl}->ext_reply ( 2502 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2090 $diag->{id},
2091 msgtype => "reply",
2092 msg => $diag->{pl}->expand_cfpod ($msg),
2093 add_topics => []
2094 );
2095 2503
2096 } else { 2504 } else {
2097 $msg = $npc->name . " says: $msg" if $npc; 2505 $msg = $npc->name . " says: $msg" if $npc;
2098 $self->message ($msg, $flags); 2506 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2099 } 2507 }
2100 } 2508 }
2509}
2510
2511=item $object->send_msg ($channel, $msg, $color, [extra...])
2512
2513=cut
2514
2515sub cf::object::send_msg {
2516 my $pl = shift->contr
2517 or return;
2518 $pl->send_msg (@_);
2101} 2519}
2102 2520
2103=item $player_object->may ("access") 2521=item $player_object->may ("access")
2104 2522
2105Returns wether the given player is authorized to access resource "access" 2523Returns wether the given player is authorized to access resource "access"
2184 # use -1 or undef as default coordinates, not 0, 0 2602 # use -1 or undef as default coordinates, not 0, 0
2185 ($x, $y) = ($map->enter_x, $map->enter_y) 2603 ($x, $y) = ($map->enter_x, $map->enter_y)
2186 if $x <=0 && $y <= 0; 2604 if $x <=0 && $y <= 0;
2187 2605
2188 $map->load; 2606 $map->load;
2189 $map->load_diag; 2607 $map->load_neighbours;
2190 2608
2191 return unless $self->contr->active; 2609 return unless $self->contr->active;
2192 $self->activate_recursive; 2610 $self->activate_recursive;
2193 2611
2194 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2612 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2195 $self->enter_map ($map, $x, $y); 2613 $self->enter_map ($map, $x, $y);
2196} 2614}
2197 2615
2198=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2616=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2199 2617
2200Moves the player to the given map-path and coordinates by first freezing 2618Moves the player to the given map-path and coordinates by first freezing
2201her, loading and preparing them map, calling the provided $check callback 2619her, loading and preparing them map, calling the provided $check callback
2202that has to return the map if sucecssful, and then unfreezes the player on 2620that has to return the map if sucecssful, and then unfreezes the player on
2203the new (success) or old (failed) map position. 2621the new (success) or old (failed) map position. In either case, $done will
2622be called at the end of this process.
2623
2624Note that $check will be called with a potentially non-loaded map, so if
2625it needs a loaded map it has to call C<< ->load >>.
2204 2626
2205=cut 2627=cut
2206 2628
2207our $GOTOGEN; 2629our $GOTOGEN;
2208 2630
2209sub cf::object::player::goto { 2631sub cf::object::player::goto {
2210 my ($self, $path, $x, $y, $check) = @_; 2632 my ($self, $path, $x, $y, $check, $done) = @_;
2211 2633
2212 # do generation counting so two concurrent goto's will be executed in-order 2634 # do generation counting so two concurrent goto's will be executed in-order
2213 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2635 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2214 2636
2215 $self->enter_link; 2637 $self->enter_link;
2216 2638
2217 (async { 2639 (async {
2640 $Coro::current->{desc} = "player::goto $path $x $y";
2641
2642 # *tag paths override both path and x|y
2643 if ($path =~ /^\*(.*)$/) {
2644 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2645 my $ob = $obs[rand @obs];
2646
2647 # see if we actually can go there
2648 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2649 $ob = $obs[rand @obs];
2650 } else {
2651 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2652 }
2653 # else put us there anyways for now #d#
2654
2655 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2656 } else {
2657 ($path, $x, $y) = (undef, undef, undef);
2658 }
2659 }
2660
2218 my $map = eval { 2661 my $map = eval {
2219 my $map = cf::map::find $path; 2662 my $map = defined $path ? cf::map::find $path : undef;
2220 2663
2221 if ($map) { 2664 if ($map) {
2222 $map = $map->customise_for ($self); 2665 $map = $map->customise_for ($self);
2223 $map = $check->($map) if $check && $map; 2666 $map = $check->($map) if $check && $map;
2224 } else { 2667 } else {
2225 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2668 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2226 } 2669 }
2227 2670
2228 $map 2671 $map
2229 }; 2672 };
2230 2673
2235 2678
2236 if ($gen == $self->{_goto_generation}) { 2679 if ($gen == $self->{_goto_generation}) {
2237 delete $self->{_goto_generation}; 2680 delete $self->{_goto_generation};
2238 $self->leave_link ($map, $x, $y); 2681 $self->leave_link ($map, $x, $y);
2239 } 2682 }
2683
2684 $done->() if $done;
2240 })->prio (1); 2685 })->prio (1);
2241} 2686}
2242 2687
2243=item $player_object->enter_exit ($exit_object) 2688=item $player_object->enter_exit ($exit_object)
2244 2689
2264} 2709}
2265 2710
2266sub prepare_random_map { 2711sub prepare_random_map {
2267 my ($exit) = @_; 2712 my ($exit) = @_;
2268 2713
2269 my $guard = cf::lock_acquire "exit_prepare:$exit";
2270
2271 # all this does is basically replace the /! path by 2714 # all this does is basically replace the /! path by
2272 # a new random map path (?random/...) with a seed 2715 # a new random map path (?random/...) with a seed
2273 # that depends on the exit object 2716 # that depends on the exit object
2274 2717
2275 my $rmp = parse_random_map_params $exit->msg; 2718 my $rmp = parse_random_map_params $exit->msg;
2277 if ($exit->map) { 2720 if ($exit->map) {
2278 $rmp->{region} = $exit->region->name; 2721 $rmp->{region} = $exit->region->name;
2279 $rmp->{origin_map} = $exit->map->path; 2722 $rmp->{origin_map} = $exit->map->path;
2280 $rmp->{origin_x} = $exit->x; 2723 $rmp->{origin_x} = $exit->x;
2281 $rmp->{origin_y} = $exit->y; 2724 $rmp->{origin_y} = $exit->y;
2725
2726 $exit->map->touch;
2282 } 2727 }
2283 2728
2284 $rmp->{random_seed} ||= $exit->random_seed; 2729 $rmp->{random_seed} ||= $exit->random_seed;
2285 2730
2286 my $data = cf::to_json $rmp; 2731 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2287 my $md5 = Digest::MD5::md5_hex $data; 2732 my $md5 = Digest::MD5::md5_hex $data;
2288 my $meta = "$RANDOMDIR/$md5.meta"; 2733 my $meta = "$RANDOMDIR/$md5.meta";
2289 2734
2290 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2735 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2291 aio_write $fh, 0, (length $data), $data, 0; 2736 aio_write $fh, 0, (length $data), $data, 0;
2292 undef $fh; 2737 undef $fh;
2293 aio_rename "$meta~", $meta; 2738 aio_rename "$meta~", $meta;
2294 2739
2740 my $slaying = "?random/$md5";
2741
2742 if ($exit->valid) {
2295 $exit->slaying ("?random/$md5"); 2743 $exit->slaying ("?random/$md5");
2296 $exit->msg (undef); 2744 $exit->msg (undef);
2745 }
2297 } 2746 }
2298} 2747}
2299 2748
2300sub cf::object::player::enter_exit { 2749sub cf::object::player::enter_exit {
2301 my ($self, $exit) = @_; 2750 my ($self, $exit) = @_;
2302 2751
2303 return unless $self->type == cf::PLAYER; 2752 return unless $self->type == cf::PLAYER;
2304 2753
2305 if ($exit->slaying eq "/!") {
2306 #TODO: this should de-fi-ni-te-ly not be a sync-job
2307 # the problem is that $exit might not survive long enough
2308 # so it needs to be done right now, right here
2309 cf::sync_job { prepare_random_map $exit };
2310 }
2311
2312 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2313 my $hp = $exit->stats->hp;
2314 my $sp = $exit->stats->sp;
2315
2316 $self->enter_link; 2754 $self->enter_link;
2317 2755
2318 (async { 2756 (async {
2319 $self->deactivate_recursive; # just to be sure 2757 $Coro::current->{desc} = "enter_exit";
2758
2320 unless (eval { 2759 unless (eval {
2760 $self->deactivate_recursive; # just to be sure
2761
2762 # random map handling
2763 {
2764 my $guard = cf::lock_acquire "exit_prepare:$exit";
2765
2766 prepare_random_map $exit
2767 if $exit->slaying eq "/!";
2768 }
2769
2770 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2771 my $x = $exit->stats->hp;
2772 my $y = $exit->stats->sp;
2773
2321 $self->goto ($slaying, $hp, $sp); 2774 $self->goto ($map, $x, $y);
2322 2775
2776 # if exit is damned, update players death & WoR home-position
2777 $self->contr->savebed ($map, $x, $y)
2778 if $exit->flag (cf::FLAG_DAMNED);
2779
2323 1; 2780 1
2324 }) { 2781 }) {
2325 $self->message ("Something went wrong deep within the crossfire server. " 2782 $self->message ("Something went wrong deep within the crossfire server. "
2326 . "I'll try to bring you back to the map you were before. " 2783 . "I'll try to bring you back to the map you were before. "
2327 . "Please report this to the dungeon master!", 2784 . "Please report this to the dungeon master!",
2328 cf::NDI_UNIQUE | cf::NDI_RED); 2785 cf::NDI_UNIQUE | cf::NDI_RED);
2349 2806
2350 utf8::encode $text; 2807 utf8::encode $text;
2351 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2808 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2352} 2809}
2353 2810
2354=item $client->send_msg ($color, $type, $msg, [extra...]) 2811=item $client->send_msg ($channel, $msg, $color, [extra...])
2355 2812
2356Send a drawinfo or msg packet to the client, formatting the msg for the 2813Send a drawinfo or msg packet to the client, formatting the msg for the
2357client if neccessary. C<$type> should be a string identifying the type of 2814client if neccessary. C<$type> should be a string identifying the type of
2358the message, with C<log> being the default. If C<$color> is negative, suppress 2815the message, with C<log> being the default. If C<$color> is negative, suppress
2359the message unless the client supports the msg packet. 2816the message unless the client supports the msg packet.
2360 2817
2361=cut 2818=cut
2362 2819
2820# non-persistent channels (usually the info channel)
2821our %CHANNEL = (
2822 "c/identify" => {
2823 id => "infobox",
2824 title => "Identify",
2825 reply => undef,
2826 tooltip => "Items recently identified",
2827 },
2828 "c/examine" => {
2829 id => "infobox",
2830 title => "Examine",
2831 reply => undef,
2832 tooltip => "Signs and other items you examined",
2833 },
2834 "c/book" => {
2835 id => "infobox",
2836 title => "Book",
2837 reply => undef,
2838 tooltip => "The contents of a note or book",
2839 },
2840 "c/lookat" => {
2841 id => "infobox",
2842 title => "Look",
2843 reply => undef,
2844 tooltip => "What you saw there",
2845 },
2846 "c/who" => {
2847 id => "infobox",
2848 title => "Players",
2849 reply => undef,
2850 tooltip => "Shows players who are currently online",
2851 },
2852 "c/body" => {
2853 id => "infobox",
2854 title => "Body Parts",
2855 reply => undef,
2856 tooltip => "Shows which body parts you posess and are available",
2857 },
2858 "c/uptime" => {
2859 id => "infobox",
2860 title => "Uptime",
2861 reply => undef,
2862 tooltip => "How long the server has been running since last restart",
2863 },
2864 "c/mapinfo" => {
2865 id => "infobox",
2866 title => "Map Info",
2867 reply => undef,
2868 tooltip => "Information related to the maps",
2869 },
2870 "c/party" => {
2871 id => "party",
2872 title => "Party",
2873 reply => "gsay ",
2874 tooltip => "Messages and chat related to your party",
2875 },
2876);
2877
2363sub cf::client::send_msg { 2878sub cf::client::send_msg {
2364 my ($self, $color, $type, $msg, @extra) = @_; 2879 my ($self, $channel, $msg, $color, @extra) = @_;
2365 2880
2366 $msg = $self->pl->expand_cfpod ($msg); 2881 $msg = $self->pl->expand_cfpod ($msg);
2367 2882
2883 $color &= cf::NDI_CLIENT_MASK; # just in case...
2884
2885 # check predefined channels, for the benefit of C
2886 if ($CHANNEL{$channel}) {
2887 $channel = $CHANNEL{$channel};
2888
2889 $self->ext_msg (channel_info => $channel)
2890 if $self->can_msg;
2891
2892 $channel = $channel->{id};
2893
2894 } elsif (ref $channel) {
2895 # send meta info to client, if not yet sent
2896 unless (exists $self->{channel}{$channel->{id}}) {
2897 $self->{channel}{$channel->{id}} = $channel;
2898 $self->ext_msg (channel_info => $channel)
2899 if $self->can_msg;
2900 }
2901
2902 $channel = $channel->{id};
2903 }
2904
2905 return unless @extra || length $msg;
2906
2368 if ($self->can_msg) { 2907 if ($self->can_msg) {
2369 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2908 # default colour, mask it out
2909 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2910 if $color & cf::NDI_DEF;
2911
2912 $self->send_packet ("msg " . $self->{json_coder}->encode (
2913 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2370 } else { 2914 } else {
2371 # replace some tags by gcfclient-compatible ones
2372 for ($msg) {
2373 1 while
2374 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2375 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2376 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2377 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2378 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${1}[\/color]/;
2379 }
2380
2381 if ($color >= 0) { 2915 if ($color >= 0) {
2916 # replace some tags by gcfclient-compatible ones
2917 for ($msg) {
2918 1 while
2919 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2920 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2921 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2922 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2923 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2924 }
2925
2926 $color &= cf::NDI_COLOR_MASK;
2927
2928 utf8::encode $msg;
2929
2382 if ($msg =~ /\[/) { 2930 if (0 && $msg =~ /\[/) {
2931 # COMMAND/INFO
2383 $self->send_packet ("drawextinfo $color 4 0 $msg") 2932 $self->send_packet ("drawextinfo $color 10 8 $msg")
2384 } else { 2933 } else {
2934 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2385 $self->send_packet ("drawinfo $color $msg") 2935 $self->send_packet ("drawinfo $color $msg")
2386 } 2936 }
2387 } 2937 }
2388 } 2938 }
2389} 2939}
2390 2940
2391=item $client->ext_event ($type, %msg) 2941=item $client->ext_msg ($type, @msg)
2392 2942
2393Sends an exti event to the client. 2943Sends an ext event to the client.
2394 2944
2395=cut 2945=cut
2396 2946
2397sub cf::client::ext_event($$%) { 2947sub cf::client::ext_msg($$@) {
2398 my ($self, $type, %msg) = @_; 2948 my ($self, $type, @msg) = @_;
2399 2949
2950 if ($self->extcmd == 2) {
2951 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2952 } elsif ($self->extcmd == 1) { # TODO: remove
2400 $msg{msgtype} = "event_$type"; 2953 push @msg, msgtype => "event_$type";
2401 $self->send_packet ("ext " . cf::to_json \%msg); 2954 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2955 }
2956}
2957
2958=item $client->ext_reply ($msgid, @msg)
2959
2960Sends an ext reply to the client.
2961
2962=cut
2963
2964sub cf::client::ext_reply($$@) {
2965 my ($self, $id, @msg) = @_;
2966
2967 if ($self->extcmd == 2) {
2968 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2969 } elsif ($self->extcmd == 1) {
2970 #TODO: version 1, remove
2971 unshift @msg, msgtype => "reply", msgid => $id;
2972 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2973 }
2402} 2974}
2403 2975
2404=item $success = $client->query ($flags, "text", \&cb) 2976=item $success = $client->query ($flags, "text", \&cb)
2405 2977
2406Queues a query to the client, calling the given callback with 2978Queues a query to the client, calling the given callback with
2407the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2979the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2408C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2980C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2409 2981
2410Queries can fail, so check the return code. Or don't, as queries will become 2982Queries can fail, so check the return code. Or don't, as queries will
2411reliable at some point in the future. 2983become reliable at some point in the future.
2412 2984
2413=cut 2985=cut
2414 2986
2415sub cf::client::query { 2987sub cf::client::query {
2416 my ($self, $flags, $text, $cb) = @_; 2988 my ($self, $flags, $text, $cb) = @_;
2424 utf8::encode $text; 2996 utf8::encode $text;
2425 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2997 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2426 2998
2427 $self->send_packet ($self->{query_queue}[0][0]) 2999 $self->send_packet ($self->{query_queue}[0][0])
2428 if @{ $self->{query_queue} } == 1; 3000 if @{ $self->{query_queue} } == 1;
3001
3002 1
2429} 3003}
2430 3004
2431cf::client->attach ( 3005cf::client->attach (
3006 on_connect => sub {
3007 my ($ns) = @_;
3008
3009 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
3010 },
2432 on_reply => sub { 3011 on_reply => sub {
2433 my ($ns, $msg) = @_; 3012 my ($ns, $msg) = @_;
2434 3013
2435 # this weird shuffling is so that direct followup queries 3014 # this weird shuffling is so that direct followup queries
2436 # get handled first 3015 # get handled first
2448 } else { 3027 } else {
2449 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 3028 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2450 } 3029 }
2451 } 3030 }
2452 }, 3031 },
3032 on_exticmd => sub {
3033 my ($ns, $buf) = @_;
3034
3035 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3036
3037 if (ref $msg) {
3038 my ($type, $reply, @payload) =
3039 "ARRAY" eq ref $msg
3040 ? @$msg
3041 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3042
3043 my @reply;
3044
3045 if (my $cb = $EXTICMD{$type}) {
3046 @reply = $cb->($ns, @payload);
3047 }
3048
3049 $ns->ext_reply ($reply, @reply)
3050 if $reply;
3051
3052 } else {
3053 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3054 }
3055
3056 cf::override;
3057 },
2453); 3058);
2454 3059
2455=item $client->async (\&cb) 3060=item $client->async (\&cb)
2456 3061
2457Create a new coroutine, running the specified callback. The coroutine will 3062Create a new coroutine, running the specified callback. The coroutine will
2498our $safe = new Safe "safe"; 3103our $safe = new Safe "safe";
2499our $safe_hole = new Safe::Hole; 3104our $safe_hole = new Safe::Hole;
2500 3105
2501$SIG{FPE} = 'IGNORE'; 3106$SIG{FPE} = 'IGNORE';
2502 3107
2503$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3108$safe->permit_only (Opcode::opset qw(
3109 :base_core :base_mem :base_orig :base_math
3110 grepstart grepwhile mapstart mapwhile
3111 sort time
3112));
2504 3113
2505# here we export the classes and methods available to script code 3114# here we export the classes and methods available to script code
2506 3115
2507=pod 3116=pod
2508 3117
2509The following functions and methods are available within a safe environment: 3118The following functions and methods are available within a safe environment:
2510 3119
2511 cf::object contr pay_amount pay_player map 3120 cf::object
3121 contr pay_amount pay_player map x y force_find force_add destroy
3122 insert remove name archname title slaying race decrease split
3123
2512 cf::object::player player 3124 cf::object::player
2513 cf::player peaceful 3125 player
2514 cf::map trigger 3126
3127 cf::player
3128 peaceful
3129
3130 cf::map
3131 trigger
2515 3132
2516=cut 3133=cut
2517 3134
2518for ( 3135for (
2519 ["cf::object" => qw(contr pay_amount pay_player map)], 3136 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3137 insert remove inv nrof name archname title slaying race
3138 decrease split destroy change_exp)],
2520 ["cf::object::player" => qw(player)], 3139 ["cf::object::player" => qw(player)],
2521 ["cf::player" => qw(peaceful)], 3140 ["cf::player" => qw(peaceful)],
2522 ["cf::map" => qw(trigger)], 3141 ["cf::map" => qw(trigger)],
2523) { 3142) {
2524 no strict 'refs'; 3143 no strict 'refs';
2600# the server's init and main functions 3219# the server's init and main functions
2601 3220
2602sub load_facedata($) { 3221sub load_facedata($) {
2603 my ($path) = @_; 3222 my ($path) = @_;
2604 3223
3224 # HACK to clear player env face cache, we need some signal framework
3225 # for this (global event?)
3226 %ext::player_env::MUSIC_FACE_CACHE = ();
3227
3228 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3229
2605 warn "loading facedata from $path\n"; 3230 warn "loading facedata from $path\n";
2606 3231
2607 my $facedata; 3232 my $facedata;
2608 0 < aio_load $path, $facedata 3233 0 < aio_load $path, $facedata
2609 or die "$path: $!"; 3234 or die "$path: $!";
2611 $facedata = Coro::Storable::thaw $facedata; 3236 $facedata = Coro::Storable::thaw $facedata;
2612 3237
2613 $facedata->{version} == 2 3238 $facedata->{version} == 2
2614 or cf::cleanup "$path: version mismatch, cannot proceed."; 3239 or cf::cleanup "$path: version mismatch, cannot proceed.";
2615 3240
3241 # patch in the exptable
3242 $facedata->{resource}{"res/exp_table"} = {
3243 type => FT_RSRC,
3244 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3245 };
3246 cf::cede_to_tick;
3247
2616 { 3248 {
2617 my $faces = $facedata->{faceinfo}; 3249 my $faces = $facedata->{faceinfo};
2618 3250
2619 while (my ($face, $info) = each %$faces) { 3251 while (my ($face, $info) = each %$faces) {
2620 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3252 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3253
2621 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3254 cf::face::set_visibility $idx, $info->{visibility};
3255 cf::face::set_magicmap $idx, $info->{magicmap};
2622 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3256 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2623 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3257 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2624 Coro::cede; 3258
3259 cf::cede_to_tick;
2625 } 3260 }
2626 3261
2627 while (my ($face, $info) = each %$faces) { 3262 while (my ($face, $info) = each %$faces) {
2628 next unless $info->{smooth}; 3263 next unless $info->{smooth};
3264
2629 my $idx = cf::face::find $face 3265 my $idx = cf::face::find $face
2630 or next; 3266 or next;
3267
2631 if (my $smooth = cf::face::find $info->{smooth}) { 3268 if (my $smooth = cf::face::find $info->{smooth}) {
3269 cf::face::set_smooth $idx, $smooth;
2632 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3270 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2633 } else { 3271 } else {
2634 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3272 warn "smooth face '$info->{smooth}' not found for face '$face'";
2635 } 3273 }
2636 Coro::cede; 3274
3275 cf::cede_to_tick;
2637 } 3276 }
2638 } 3277 }
2639 3278
2640 { 3279 {
2641 my $anims = $facedata->{animinfo}; 3280 my $anims = $facedata->{animinfo};
2642 3281
2643 while (my ($anim, $info) = each %$anims) { 3282 while (my ($anim, $info) = each %$anims) {
2644 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3283 cf::anim::set $anim, $info->{frames}, $info->{facings};
2645 Coro::cede; 3284 cf::cede_to_tick;
2646 } 3285 }
2647 3286
2648 cf::anim::invalidate_all; # d'oh 3287 cf::anim::invalidate_all; # d'oh
2649 } 3288 }
2650 3289
3290 {
3291 # TODO: for gcfclient pleasure, we should give resources
3292 # that gcfclient doesn't grok a >10000 face index.
3293 my $res = $facedata->{resource};
3294
3295 while (my ($name, $info) = each %$res) {
3296 if (defined $info->{type}) {
3297 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3298 my $data;
3299
3300 if ($info->{type} & 1) {
3301 # prepend meta info
3302
3303 my $meta = $enc->encode ({
3304 name => $name,
3305 %{ $info->{meta} || {} },
3306 });
3307
3308 $data = pack "(w/a*)*", $meta, $info->{data};
3309 } else {
3310 $data = $info->{data};
3311 }
3312
3313 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3314 cf::face::set_type $idx, $info->{type};
3315 } else {
3316 $RESOURCE{$name} = $info;
3317 }
3318
3319 cf::cede_to_tick;
3320 }
3321 }
3322
3323 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3324
2651 1 3325 1
2652} 3326}
2653 3327
3328cf::global->attach (on_resource_update => sub {
3329 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3330 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3331
3332 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3333 my $sound = $soundconf->{compat}[$_]
3334 or next;
3335
3336 my $face = cf::face::find "sound/$sound->[1]";
3337 cf::sound::set $sound->[0] => $face;
3338 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3339 }
3340
3341 while (my ($k, $v) = each %{$soundconf->{event}}) {
3342 my $face = cf::face::find "sound/$v";
3343 cf::sound::set $k => $face;
3344 }
3345 }
3346});
3347
3348register_exticmd fx_want => sub {
3349 my ($ns, $want) = @_;
3350
3351 while (my ($k, $v) = each %$want) {
3352 $ns->fx_want ($k, $v);
3353 }
3354};
3355
3356sub load_resource_file($) {
3357 my $guard = lock_acquire "load_resource_file";
3358
3359 my $status = load_resource_file_ $_[0];
3360 get_slot 0.1, 100;
3361 cf::arch::commit_load;
3362
3363 $status
3364}
3365
2654sub reload_regions { 3366sub reload_regions {
3367 # HACK to clear player env face cache, we need some signal framework
3368 # for this (global event?)
3369 %ext::player_env::MUSIC_FACE_CACHE = ();
3370
2655 load_resource_file "$MAPDIR/regions" 3371 load_resource_file "$MAPDIR/regions"
2656 or die "unable to load regions file\n"; 3372 or die "unable to load regions file\n";
3373
3374 for (cf::region::list) {
3375 $_->{match} = qr/$_->{match}/
3376 if exists $_->{match};
3377 }
2657} 3378}
2658 3379
2659sub reload_facedata { 3380sub reload_facedata {
2660 load_facedata "$DATADIR/facedata" 3381 load_facedata "$DATADIR/facedata"
2661 or die "unable to load facedata\n"; 3382 or die "unable to load facedata\n";
2672} 3393}
2673 3394
2674sub reload_resources { 3395sub reload_resources {
2675 warn "reloading resource files...\n"; 3396 warn "reloading resource files...\n";
2676 3397
3398 reload_facedata;
3399 reload_archetypes;
2677 reload_regions; 3400 reload_regions;
2678 reload_facedata;
2679 #reload_archetypes;#d#
2680 reload_archetypes;
2681 reload_treasures; 3401 reload_treasures;
2682 3402
2683 warn "finished reloading resource files\n"; 3403 warn "finished reloading resource files\n";
2684} 3404}
2685 3405
2686sub init { 3406sub init {
3407 my $guard = freeze_mainloop;
3408
3409 evthread_start IO::AIO::poll_fileno;
3410
2687 reload_resources; 3411 reload_resources;
2688} 3412}
2689 3413
2690sub cfg_load { 3414sub reload_config {
2691 open my $fh, "<:utf8", "$CONFDIR/config" 3415 open my $fh, "<:utf8", "$CONFDIR/config"
2692 or return; 3416 or return;
2693 3417
2694 local $/; 3418 local $/;
2695 *CFG = YAML::Syck::Load <$fh>; 3419 *CFG = YAML::Load <$fh>;
2696 3420
2697 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3421 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2698 3422
2699 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3423 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2700 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3424 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2711sub main { 3435sub main {
2712 # we must not ever block the main coroutine 3436 # we must not ever block the main coroutine
2713 local $Coro::idle = sub { 3437 local $Coro::idle = sub {
2714 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3438 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2715 (async { 3439 (async {
2716 Event::one_event; 3440 $Coro::current->{desc} = "IDLE BUG HANDLER";
3441 EV::loop EV::LOOP_ONESHOT;
2717 })->prio (Coro::PRIO_MAX); 3442 })->prio (Coro::PRIO_MAX);
2718 }; 3443 };
2719 3444
2720 cfg_load; 3445 {
3446 my $guard = freeze_mainloop;
3447 reload_config;
2721 db_init; 3448 db_init;
2722 load_extensions; 3449 load_extensions;
2723 3450
2724 $TICK_WATCHER->start; 3451 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3452 }
3453
2725 Event::loop; 3454 EV::loop;
2726} 3455}
2727 3456
2728############################################################################# 3457#############################################################################
2729# initialisation and cleanup 3458# initialisation and cleanup
2730 3459
2731# install some emergency cleanup handlers 3460# install some emergency cleanup handlers
2732BEGIN { 3461BEGIN {
3462 our %SIGWATCHER = ();
2733 for my $signal (qw(INT HUP TERM)) { 3463 for my $signal (qw(INT HUP TERM)) {
2734 Event->signal ( 3464 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2735 reentrant => 0,
2736 data => WF_AUTOCANCEL,
2737 signal => $signal,
2738 prio => 0,
2739 cb => sub {
2740 cf::cleanup "SIG$signal"; 3465 cf::cleanup "SIG$signal";
2741 },
2742 ); 3466 };
2743 } 3467 }
2744} 3468}
2745 3469
2746sub write_runtime { 3470sub write_runtime_sync {
2747 my $runtime = "$LOCALDIR/runtime"; 3471 my $runtime = "$LOCALDIR/runtime";
2748 3472
2749 # first touch the runtime file to show we are still running: 3473 # first touch the runtime file to show we are still running:
2750 # the fsync below can take a very very long time. 3474 # the fsync below can take a very very long time.
2751 3475
2777 and return; 3501 and return;
2778 3502
2779 warn "runtime file written.\n"; 3503 warn "runtime file written.\n";
2780 3504
2781 1 3505 1
3506}
3507
3508our $uuid_lock;
3509our $uuid_skip;
3510
3511sub write_uuid_sync($) {
3512 $uuid_skip ||= $_[0];
3513
3514 return if $uuid_lock;
3515 local $uuid_lock = 1;
3516
3517 my $uuid = "$LOCALDIR/uuid";
3518
3519 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3520 or return;
3521
3522 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3523 $uuid_skip = 0;
3524
3525 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3526 and return;
3527
3528 # always fsync - this file is important
3529 aio_fsync $fh
3530 and return;
3531
3532 close $fh
3533 or return;
3534
3535 aio_rename "$uuid~", $uuid
3536 and return;
3537
3538 warn "uuid file written ($value).\n";
3539
3540 1
3541
3542}
3543
3544sub write_uuid($$) {
3545 my ($skip, $sync) = @_;
3546
3547 $sync ? write_uuid_sync $skip
3548 : async { write_uuid_sync $skip };
2782} 3549}
2783 3550
2784sub emergency_save() { 3551sub emergency_save() {
2785 my $freeze_guard = cf::freeze_mainloop; 3552 my $freeze_guard = cf::freeze_mainloop;
2786 3553
2792 # and maps saved/destroyed asynchronously. 3559 # and maps saved/destroyed asynchronously.
2793 warn "begin emergency player save\n"; 3560 warn "begin emergency player save\n";
2794 for my $login (keys %cf::PLAYER) { 3561 for my $login (keys %cf::PLAYER) {
2795 my $pl = $cf::PLAYER{$login} or next; 3562 my $pl = $cf::PLAYER{$login} or next;
2796 $pl->valid or next; 3563 $pl->valid or next;
3564 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2797 $pl->save; 3565 $pl->save;
2798 } 3566 }
2799 warn "end emergency player save\n"; 3567 warn "end emergency player save\n";
2800 3568
2801 warn "begin emergency map save\n"; 3569 warn "begin emergency map save\n";
2807 warn "end emergency map save\n"; 3575 warn "end emergency map save\n";
2808 3576
2809 warn "begin emergency database checkpoint\n"; 3577 warn "begin emergency database checkpoint\n";
2810 BDB::db_env_txn_checkpoint $DB_ENV; 3578 BDB::db_env_txn_checkpoint $DB_ENV;
2811 warn "end emergency database checkpoint\n"; 3579 warn "end emergency database checkpoint\n";
3580
3581 warn "begin write uuid\n";
3582 write_uuid_sync 1;
3583 warn "end write uuid\n";
2812 }; 3584 };
2813 3585
2814 warn "leave emergency perl save\n"; 3586 warn "leave emergency perl save\n";
2815} 3587}
2816 3588
2818 my ($make_core) = @_; 3590 my ($make_core) = @_;
2819 3591
2820 warn Carp::longmess "post_cleanup backtrace" 3592 warn Carp::longmess "post_cleanup backtrace"
2821 if $make_core; 3593 if $make_core;
2822} 3594}
3595
3596# a safer delete_package, copied from Symbol
3597sub clear_package($) {
3598 my $pkg = shift;
3599
3600 # expand to full symbol table name if needed
3601 unless ($pkg =~ /^main::.*::$/) {
3602 $pkg = "main$pkg" if $pkg =~ /^::/;
3603 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3604 $pkg .= '::' unless $pkg =~ /::$/;
3605 }
3606
3607 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3608 my $stem_symtab = *{$stem}{HASH};
3609
3610 defined $stem_symtab and exists $stem_symtab->{$leaf}
3611 or return;
3612
3613 # clear all symbols
3614 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3615 for my $name (keys %$leaf_symtab) {
3616 _gv_clear *{"$pkg$name"};
3617# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3618 }
3619 warn "cleared package #$pkg\n";#d#
3620}
3621
3622our $RELOAD; # how many times to reload
2823 3623
2824sub do_reload_perl() { 3624sub do_reload_perl() {
2825 # can/must only be called in main 3625 # can/must only be called in main
2826 if ($Coro::current != $Coro::main) { 3626 if ($Coro::current != $Coro::main) {
2827 warn "can only reload from main coroutine"; 3627 warn "can only reload from main coroutine";
2828 return; 3628 return;
2829 } 3629 }
2830 3630
3631 return if $RELOAD++;
3632
3633 while ($RELOAD) {
2831 warn "reloading..."; 3634 warn "reloading...";
2832 3635
2833 warn "entering sync_job"; 3636 warn "entering sync_job";
2834 3637
2835 cf::sync_job { 3638 cf::sync_job {
2836 cf::write_runtime; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
2837 cf::emergency_save; 3640 cf::emergency_save;
2838 cf::write_runtime; # external watchdog should not bark 3641 cf::write_runtime_sync; # external watchdog should not bark
2839 3642
2840 warn "syncing database to disk"; 3643 warn "syncing database to disk";
2841 BDB::db_env_txn_checkpoint $DB_ENV; 3644 BDB::db_env_txn_checkpoint $DB_ENV;
2842 3645
2843 # if anything goes wrong in here, we should simply crash as we already saved 3646 # if anything goes wrong in here, we should simply crash as we already saved
2844 3647
2845 warn "cancelling all WF_AUTOCANCEL watchers";
2846 for (Event::all_watchers) {
2847 $_->cancel if $_->data & WF_AUTOCANCEL;
2848 }
2849
2850 warn "flushing outstanding aio requests"; 3648 warn "flushing outstanding aio requests";
2851 for (;;) {
2852 BDB::flush;
2853 IO::AIO::flush;
2854 Coro::cede;
2855 last unless IO::AIO::nreqs || BDB::nreqs; 3649 while (IO::AIO::nreqs || BDB::nreqs) {
2856 warn "iterate..."; 3650 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2857 }
2858
2859 ++$RELOAD;
2860
2861 warn "cancelling all extension coros";
2862 $_->cancel for values %EXT_CORO;
2863 %EXT_CORO = ();
2864
2865 warn "removing commands";
2866 %COMMAND = ();
2867
2868 warn "removing ext commands";
2869 %EXTCMD = ();
2870
2871 warn "unloading/nuking all extensions";
2872 for my $pkg (@EXTS) {
2873 warn "... unloading $pkg";
2874
2875 if (my $cb = $pkg->can ("unload")) {
2876 eval {
2877 $cb->($pkg);
2878 1
2879 } or warn "$pkg unloaded, but with errors: $@";
2880 } 3651 }
2881 3652
2882 warn "... nuking $pkg"; 3653 warn "cancelling all extension coros";
2883 Symbol::delete_package $pkg; 3654 $_->cancel for values %EXT_CORO;
2884 } 3655 %EXT_CORO = ();
2885 3656
2886 warn "unloading all perl modules loaded from $LIBDIR"; 3657 warn "removing commands";
2887 while (my ($k, $v) = each %INC) { 3658 %COMMAND = ();
2888 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2889 3659
3660 warn "removing ext/exti commands";
3661 %EXTCMD = ();
3662 %EXTICMD = ();
3663
3664 warn "unloading/nuking all extensions";
3665 for my $pkg (@EXTS) {
2890 warn "... unloading $k"; 3666 warn "... unloading $pkg";
2891 delete $INC{$k};
2892 3667
2893 $k =~ s/\.pm$//;
2894 $k =~ s/\//::/g;
2895
2896 if (my $cb = $k->can ("unload_module")) { 3668 if (my $cb = $pkg->can ("unload")) {
3669 eval {
2897 $cb->(); 3670 $cb->($pkg);
3671 1
3672 } or warn "$pkg unloaded, but with errors: $@";
3673 }
3674
3675 warn "... clearing $pkg";
3676 clear_package $pkg;
2898 } 3677 }
2899 3678
2900 Symbol::delete_package $k; 3679 warn "unloading all perl modules loaded from $LIBDIR";
3680 while (my ($k, $v) = each %INC) {
3681 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3682
3683 warn "... unloading $k";
3684 delete $INC{$k};
3685
3686 $k =~ s/\.pm$//;
3687 $k =~ s/\//::/g;
3688
3689 if (my $cb = $k->can ("unload_module")) {
3690 $cb->();
3691 }
3692
3693 clear_package $k;
2901 } 3694 }
2902 3695
2903 warn "getting rid of safe::, as good as possible"; 3696 warn "getting rid of safe::, as good as possible";
2904 Symbol::delete_package "safe::$_" 3697 clear_package "safe::$_"
2905 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3698 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2906 3699
2907 warn "unloading cf.pm \"a bit\""; 3700 warn "unloading cf.pm \"a bit\"";
2908 delete $INC{"cf.pm"}; 3701 delete $INC{"cf.pm"};
2909 delete $INC{"cf/pod.pm"}; 3702 delete $INC{"cf/pod.pm"};
2910 3703
2911 # don't, removes xs symbols, too, 3704 # don't, removes xs symbols, too,
2912 # and global variables created in xs 3705 # and global variables created in xs
2913 #Symbol::delete_package __PACKAGE__; 3706 #clear_package __PACKAGE__;
2914 3707
2915 warn "unload completed, starting to reload now"; 3708 warn "unload completed, starting to reload now";
2916 3709
2917 warn "reloading cf.pm"; 3710 warn "reloading cf.pm";
2918 require cf; 3711 require cf;
2919 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3712 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2920 3713
2921 warn "loading config and database again"; 3714 warn "loading config and database again";
2922 cf::cfg_load; 3715 cf::reload_config;
2923 3716
2924 warn "loading extensions"; 3717 warn "loading extensions";
2925 cf::load_extensions; 3718 cf::load_extensions;
2926 3719
2927 warn "reattaching attachments to objects/players"; 3720 warn "reattaching attachments to objects/players";
2928 _global_reattach; # objects, sockets 3721 _global_reattach; # objects, sockets
2929 warn "reattaching attachments to maps"; 3722 warn "reattaching attachments to maps";
2930 reattach $_ for values %MAP; 3723 reattach $_ for values %MAP;
2931 warn "reattaching attachments to players"; 3724 warn "reattaching attachments to players";
2932 reattach $_ for values %PLAYER; 3725 reattach $_ for values %PLAYER;
2933 3726
2934 warn "leaving sync_job"; 3727 warn "leaving sync_job";
2935 3728
2936 1 3729 1
2937 } or do { 3730 } or do {
2938 warn $@; 3731 warn $@;
2939 warn "error while reloading, exiting."; 3732 cf::cleanup "error while reloading, exiting.";
2940 exit 1;
2941 }; 3733 };
2942 3734
2943 warn "reloaded"; 3735 warn "reloaded";
3736 --$RELOAD;
3737 }
2944}; 3738};
2945 3739
2946our $RELOAD_WATCHER; # used only during reload 3740our $RELOAD_WATCHER; # used only during reload
2947 3741
2948sub reload_perl() { 3742sub reload_perl() {
2949 # doing reload synchronously and two reloads happen back-to-back, 3743 # doing reload synchronously and two reloads happen back-to-back,
2950 # coro crashes during coro_state_free->destroy here. 3744 # coro crashes during coro_state_free->destroy here.
2951 3745
2952 $RELOAD_WATCHER ||= Event->timer ( 3746 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
2953 reentrant => 0,
2954 after => 0,
2955 data => WF_AUTOCANCEL,
2956 cb => sub {
2957 do_reload_perl; 3747 do_reload_perl;
2958 undef $RELOAD_WATCHER; 3748 undef $RELOAD_WATCHER;
2959 },
2960 ); 3749 };
2961} 3750}
2962 3751
2963register_command "reload" => sub { 3752register_command "reload" => sub {
2964 my ($who, $arg) = @_; 3753 my ($who, $arg) = @_;
2965 3754
2966 if ($who->flag (FLAG_WIZ)) { 3755 if ($who->flag (FLAG_WIZ)) {
2967 $who->message ("reloading server."); 3756 $who->message ("reloading server.");
3757 async {
3758 $Coro::current->{desc} = "perl_reload";
2968 async { reload_perl }; 3759 reload_perl;
3760 };
2969 } 3761 }
2970}; 3762};
2971 3763
2972unshift @INC, $LIBDIR; 3764unshift @INC, $LIBDIR;
2973 3765
2975 3767
2976our @WAIT_FOR_TICK; 3768our @WAIT_FOR_TICK;
2977our @WAIT_FOR_TICK_BEGIN; 3769our @WAIT_FOR_TICK_BEGIN;
2978 3770
2979sub wait_for_tick { 3771sub wait_for_tick {
2980 return unless $TICK_WATCHER->is_active;
2981 return if $Coro::current == $Coro::main; 3772 return if tick_inhibit || $Coro::current == $Coro::main;
2982 3773
2983 my $signal = new Coro::Signal; 3774 my $signal = new Coro::Signal;
2984 push @WAIT_FOR_TICK, $signal; 3775 push @WAIT_FOR_TICK, $signal;
2985 $signal->wait; 3776 $signal->wait;
2986} 3777}
2987 3778
2988sub wait_for_tick_begin { 3779sub wait_for_tick_begin {
2989 return unless $TICK_WATCHER->is_active;
2990 return if $Coro::current == $Coro::main; 3780 return if tick_inhibit || $Coro::current == $Coro::main;
2991 3781
2992 my $signal = new Coro::Signal; 3782 my $signal = new Coro::Signal;
2993 push @WAIT_FOR_TICK_BEGIN, $signal; 3783 push @WAIT_FOR_TICK_BEGIN, $signal;
2994 $signal->wait; 3784 $signal->wait;
2995} 3785}
2996 3786
2997 my $min = 1e6;#d# 3787sub tick {
2998 my $avg = 10;
2999$TICK_WATCHER = Event->timer (
3000 reentrant => 0,
3001 parked => 1,
3002 prio => 0,
3003 at => $NEXT_TICK || $TICK,
3004 data => WF_AUTOCANCEL,
3005 cb => sub {
3006 if ($Coro::current != $Coro::main) { 3788 if ($Coro::current != $Coro::main) {
3007 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3789 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3008 unless ++$bug_warning > 10; 3790 unless ++$bug_warning > 10;
3009 return; 3791 return;
3010 } 3792 }
3011 3793
3012 $NOW = $tick_start = Event::time;
3013
3014 cf::server_tick; # one server iteration 3794 cf::server_tick; # one server iteration
3015 3795
3016 0 && sync_job {#d# 3796 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3017 for(1..10) { 3797 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3018 my $t = Event::time; 3798 Coro::async_pool {
3019 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3799 $Coro::current->{desc} = "runtime saver";
3020 or die; 3800 write_runtime_sync
3021 3801 or warn "ERROR: unable to write runtime file: $!";
3022 $map->width (50);
3023 $map->height (50);
3024 $map->alloc;
3025 $map->_load_objects ("/tmp/x.map", 1);
3026 my $t = Event::time - $t;
3027
3028 #next unless $t < 0.0013;#d#
3029 if ($t < $min) {
3030 $min = $t;
3031 }
3032 $avg = $avg * 0.99 + $t * 0.01;
3033 }
3034 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3035 exit 0;
3036 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3037 }; 3802 };
3803 }
3038 3804
3039 $RUNTIME += $TICK;
3040 $NEXT_TICK += $TICK;
3041
3042 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3043 $NEXT_RUNTIME_WRITE = $NOW + 10;
3044 Coro::async_pool {
3045 write_runtime
3046 or warn "ERROR: unable to write runtime file: $!";
3047 };
3048 }
3049
3050# my $AFTER = Event::time;
3051# warn $AFTER - $NOW;#d#
3052
3053 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3805 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3054 $sig->send; 3806 $sig->send;
3055 } 3807 }
3056 while (my $sig = shift @WAIT_FOR_TICK) { 3808 while (my $sig = shift @WAIT_FOR_TICK) {
3057 $sig->send; 3809 $sig->send;
3058 } 3810 }
3059 3811
3060 $NOW = Event::time; 3812 $LOAD = ($NOW - $TICK_START) / $TICK;
3061
3062 # if we are delayed by four ticks or more, skip them all
3063 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3064
3065 $TICK_WATCHER->at ($NEXT_TICK);
3066 $TICK_WATCHER->start;
3067
3068 $LOAD = ($NOW - $tick_start) / $TICK;
3069 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3813 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3070 3814
3071 _post_tick; 3815 if (0) {
3072 3816 if ($NEXT_TICK) {
3073 3817 my $jitter = $TICK_START - $NEXT_TICK;
3818 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3819 warn "jitter $JITTER\n";#d#
3820 }
3074 }, 3821 }
3075); 3822}
3076 3823
3077{ 3824{
3078 BDB::max_poll_time $TICK * 0.1; 3825 # configure BDB
3079 $BDB_POLL_WATCHER = Event->io ( 3826
3080 reentrant => 0,
3081 fd => BDB::poll_fileno,
3082 poll => 'r',
3083 prio => 0,
3084 data => WF_AUTOCANCEL,
3085 cb => \&BDB::poll_cb,
3086 );
3087 BDB::min_parallel 8; 3827 BDB::min_parallel 8;
3088 3828 BDB::max_poll_reqs $TICK * 0.1;
3089 BDB::set_sync_prepare { 3829 $AnyEvent::BDB::WATCHER->priority (1);
3090 my $status;
3091 my $current = $Coro::current;
3092 (
3093 sub {
3094 $status = $!;
3095 $current->ready; undef $current;
3096 },
3097 sub {
3098 Coro::schedule while defined $current;
3099 $! = $status;
3100 },
3101 )
3102 };
3103 3830
3104 unless ($DB_ENV) { 3831 unless ($DB_ENV) {
3105 $DB_ENV = BDB::db_env_create; 3832 $DB_ENV = BDB::db_env_create;
3833 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3834 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3835 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3836 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3837 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3106 3838
3107 cf::sync_job { 3839 cf::sync_job {
3108 eval { 3840 eval {
3109 BDB::db_env_open 3841 BDB::db_env_open
3110 $DB_ENV, 3842 $DB_ENV,
3112 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3844 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3113 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3845 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3114 0666; 3846 0666;
3115 3847
3116 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3848 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3117
3118 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3119 $DB_ENV->set_lk_detect;
3120 }; 3849 };
3121 3850
3122 cf::cleanup "db_env_open(db): $@" if $@; 3851 cf::cleanup "db_env_open(db): $@" if $@;
3123 }; 3852 };
3124 } 3853 }
3854
3855 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3856 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3857 };
3858 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3859 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3860 };
3861 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3862 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3863 };
3125} 3864}
3126 3865
3127{ 3866{
3867 # configure IO::AIO
3868
3128 IO::AIO::min_parallel 8; 3869 IO::AIO::min_parallel 8;
3129
3130 undef $Coro::AIO::WATCHER;
3131 IO::AIO::max_poll_time $TICK * 0.1; 3870 IO::AIO::max_poll_time $TICK * 0.1;
3132 $AIO_POLL_WATCHER = Event->io ( 3871 undef $AnyEvent::AIO::WATCHER;
3133 reentrant => 0,
3134 data => WF_AUTOCANCEL,
3135 fd => IO::AIO::poll_fileno,
3136 poll => 'r',
3137 prio => 6,
3138 cb => \&IO::AIO::poll_cb,
3139 );
3140} 3872}
3141 3873
3142my $_log_backtrace; 3874my $_log_backtrace;
3143 3875
3144sub _log_backtrace { 3876sub _log_backtrace {
3148 3880
3149 # limit the # of concurrent backtraces 3881 # limit the # of concurrent backtraces
3150 if ($_log_backtrace < 2) { 3882 if ($_log_backtrace < 2) {
3151 ++$_log_backtrace; 3883 ++$_log_backtrace;
3152 async { 3884 async {
3885 $Coro::current->{desc} = "abt $msg";
3886
3153 my @bt = fork_call { 3887 my @bt = fork_call {
3154 @addr = map { sprintf "%x", $_ } @addr; 3888 @addr = map { sprintf "%x", $_ } @addr;
3155 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3889 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3156 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3890 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3157 or die "addr2line: $!"; 3891 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines