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.305 by root, Thu Jul 12 08:40:14 2007 UTC vs.
Revision 1.443 by root, Sun Aug 31 10:05:26 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
25use JSON::XS 1.4 (); 51use JSON::XS 2.01 ();
26use BDB (); 52use BDB ();
27use Data::Dumper; 53use Data::Dumper;
28use Digest::MD5; 54use Digest::MD5;
29use Fcntl; 55use Fcntl;
30use YAML::Syck (); 56use YAML ();
31use IO::AIO 2.32 (); 57use IO::AIO ();
32use Time::HiRes; 58use Time::HiRes;
33use Compress::LZF; 59use Compress::LZF;
34use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
35 63
36# configure various modules to our taste 64# configure various modules to our taste
37# 65#
38$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
39Coro::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
40Compress::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
41
42$Event::Eval = 1; # no idea why this is required, but it is
43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46 69
47$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
48 71
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 73
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our %RESOURCE;
74 98
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 101our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
82 103
104our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER;
83our $BDB_POLL_WATCHER; 106our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 107our $DB_ENV;
85 108
86our %CFG; 109our %CFG;
87 110
88our $UPTIME; $UPTIME ||= time; 111our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 112our $RUNTIME;
113our $NOW;
90 114
91our %PLAYER; # all users 115our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 116our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 117our $LINK_MAP; # the special {link} map, which is always available
94 118
95# 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 ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 121
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
101 126
102binmode STDOUT; 127binmode STDOUT;
103binmode STDERR; 128binmode STDERR;
104 129
105# read virtual server time, if available 130# read virtual server time, if available
158 183
159The raw value load value from the last tick. 184The raw value load value from the last tick.
160 185
161=item %cf::CFG 186=item %cf::CFG
162 187
163Configuration for the server, loaded from C</etc/crossfire/config>, or 188Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 189from wherever your confdir points to.
165 190
166=item cf::wait_for_tick, cf::wait_for_tick_begin 191=item cf::wait_for_tick, cf::wait_for_tick_begin
167 192
168These 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
169returns 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
170per 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.
171 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
172=back 203=back
173 204
174=cut 205=cut
175 206
176BEGIN { 207BEGIN {
180 $msg .= "\n" 211 $msg .= "\n"
181 unless $msg =~ /\n$/; 212 unless $msg =~ /\n$/;
182 213
183 $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;
184 215
185 utf8::encode $msg;
186 LOG llevError, $msg; 216 LOG llevError, $msg;
187 }; 217 };
188} 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#?
189 234
190@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
191@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
192@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
193@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
200for my $pkg (qw( 245for my $pkg (qw(
201 cf::global cf::attachable 246 cf::global cf::attachable
202 cf::object cf::object::player 247 cf::object cf::object::player
203 cf::client cf::player 248 cf::client cf::player
204 cf::arch cf::living 249 cf::arch cf::living
250 cf::map cf::mapspace
205 cf::map cf::party cf::region 251 cf::party cf::region
206)) { 252)) {
207 no strict 'refs';
208 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
209} 254}
210 255
211$Event::DIED = sub { 256$EV::DIED = sub {
212 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
213}; 258};
214 259
215############################################################################# 260#############################################################################
216 261
239 $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;
240 $d 285 $d
241 } || "[unable to dump $_[0]: '$@']"; 286 } || "[unable to dump $_[0]: '$@']";
242} 287}
243 288
244=item $ref = cf::from_json $json 289=item $ref = cf::decode_json $json
245 290
246Converts a JSON string into the corresponding perl data structure. 291Converts a JSON string into the corresponding perl data structure.
247 292
248=item $json = cf::to_json $ref 293=item $json = cf::encode_json $ref
249 294
250Converts a perl data structure into its JSON representation. 295Converts a perl data structure into its JSON representation.
251 296
252=cut 297=cut
253 298
254our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255 300
256sub to_json ($) { $json_coder->encode ($_[0]) } 301sub encode_json($) { $json_coder->encode ($_[0]) }
257sub from_json ($) { $json_coder->decode ($_[0]) } 302sub decode_json($) { $json_coder->decode ($_[0]) }
258 303
259=item cf::lock_wait $string 304=item cf::lock_wait $string
260 305
261Wait until the given lock is available. See cf::lock_acquire. 306Wait until the given lock is available. See cf::lock_acquire.
262 307
265Wait 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
266a 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,
267for example when the coroutine gets canceled), the lock is automatically 312for example when the coroutine gets canceled), the lock is automatically
268returned. 313returned.
269 314
315Locks are *not* recursive, locking from the same coro twice results in a
316deadlocked coro.
317
270Lock 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
271uses map_find and cf::map::load uses map_load). 319uses map_find and cf::map::load uses map_load).
272 320
273=item $locked = cf::lock_active $string 321=item $locked = cf::lock_active $string
274 322
275Return 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.
276 324
277=cut 325=cut
278 326
279our %LOCK; 327our %LOCK;
328our %LOCKER;#d#
280 329
281sub lock_wait($) { 330sub lock_wait($) {
282 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#
283 337
284 # wait for lock, if any 338 # wait for lock, if any
285 while ($LOCK{$key}) { 339 while ($LOCK{$key}) {
286 push @{ $LOCK{$key} }, $Coro::current; 340 push @{ $LOCK{$key} }, $Coro::current;
287 Coro::schedule; 341 Coro::schedule;
293 347
294 # wait, to be sure we are not locked 348 # wait, to be sure we are not locked
295 lock_wait $key; 349 lock_wait $key;
296 350
297 $LOCK{$key} = []; 351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
298 353
299 Coro::guard { 354 Coro::guard {
355 delete $LOCKER{$key};#d#
300 # wake up all waiters, to be on the safe side 356 # wake up all waiters, to be on the safe side
301 $_->ready for @{ delete $LOCK{$key} }; 357 $_->ready for @{ delete $LOCK{$key} };
302 } 358 }
303} 359}
304 360
307 363
308 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
309} 365}
310 366
311sub freeze_mainloop { 367sub freeze_mainloop {
312 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
313 369
314 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
315 $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 }
316 }; 431 }
317 $TICK_WATCHER->stop; 432};
318 $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;
319} 446}
320 447
321=item cf::async { BLOCK } 448=item cf::async { BLOCK }
322 449
323Currently the same as Coro::async_pool, meaning you cannot use 450Currently the same as Coro::async_pool, meaning you cannot use
328 455
329BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
330 457
331=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
332 459
333The design of Crossfire TRT requires that the main coroutine ($Coro::main) 460The design of Deliantra requires that the main coroutine ($Coro::main)
334is always able to handle events or runnable, as Crossfire TRT is only 461is always able to handle events or runnable, as Deliantra is only
335partly 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
336acceptable. 463acceptable.
337 464
338If 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
339the given BLOCK in another coroutine while waiting for the result. The 466the given BLOCK in another coroutine while waiting for the result. The
344 471
345sub sync_job(&) { 472sub sync_job(&) {
346 my ($job) = @_; 473 my ($job) = @_;
347 474
348 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
349 my $time = Event::time; 476 my $time = EV::time;
350 477
351 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
352 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
353 480
354 # TODO: use suspend/resume instead 481 LOG llevError, Carp::longmess "sync job";#d#
355 # (but this is cancel-safe) 482
356 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
357 484
358 my $busy = 1; 485 my $busy = 1;
359 my @res; 486 my @res;
360 487
361 (async { 488 (async {
489 $Coro::current->desc ("sync job coro");
362 @res = eval { $job->() }; 490 @res = eval { $job->() };
363 warn $@ if $@; 491 warn $@ if $@;
364 undef $busy; 492 undef $busy;
365 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
366 494
367 while ($busy) { 495 while ($busy) {
368 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
369 } 500 }
501 }
370 502
371 $time = Event::time - $time; 503 my $time = EV::time - $time;
372 504
373 LOG llevError | logBacktrace, Carp::longmess "long sync job"
374 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
375
376 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
377 506
378 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
379 } else { 508 } else {
380 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
381 510
406=item fork_call { }, $args 535=item fork_call { }, $args
407 536
408Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
409process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
410Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
412 541
413=cut 542=cut
414
415sub _store_scalar {
416 open my $fh, ">", \my $buf
417 or die "fork_call: cannot open fh-to-buf in child : $!";
418 Storable::store_fd $_[0], $fh;
419 close $fh;
420
421 $buf
422}
423 543
424sub fork_call(&@) { 544sub fork_call(&@) {
425 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
426 546
427# 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,
428# or die "socketpair: $!"; 548 # otherwise perl prematurely frees the stuff :/
429 pipe my $fh1, my $fh2 549 # TODO: investigate and fix (likely this will be rather laborious)
430 or die "pipe: $!";
431 550
432 if (my $pid = fork) { 551 my @res = Coro::Util::fork_eval {
433 close $fh2;
434
435 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
436 warn "pst<$res>" unless $res =~ /^pst/;
437 $res = Coro::Storable::thaw $res;
438
439 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
440
441 Carp::confess $$res unless "ARRAY" eq ref $res;
442
443 return wantarray ? @$res : $res->[-1];
444 } else {
445 reset_signals; 552 reset_signals;
446 local $SIG{__WARN__}; 553 &$cb
447 local $SIG{__DIE__}; 554 }, @args;
448 # just in case, this hack effectively disables event
449 # in the child. cleaner and slower would be canceling all watchers,
450 # but this works for the time being.
451 local $Coro::idle;
452 $Coro::current->prio (Coro::PRIO_MAX);
453 555
454 eval { 556 wantarray ? @res : $res[-1]
455 close $fh1; 557}
456 558
457 my @res = eval { $cb->(@args) }; 559=item $coin = coin_from_name $name
458 560
459 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 561=cut
460 close $fh2;
461 };
462 562
463 warn $@ if $@; 563our %coin_alias = (
464 _exit 0; 564 "silver" => "silvercoin",
465 } 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
466} 584}
467 585
468=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
469 587
470Returns a single value from the environment database. 588Returns a single value from the environment database.
472=item cf::db_put $family => $key => $value 590=item cf::db_put $family => $key => $value
473 591
474Stores 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
475data 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).
476 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
477=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}
478 618
479our $DB; 619our $DB;
480 620
481sub db_init { 621sub db_init {
482 unless ($DB) {
483 $DB = BDB::db_create $DB_ENV;
484
485 cf::sync_job { 622 cf::sync_job {
486 eval { 623 $DB ||= db_table "db";
487 $DB->set_flags (BDB::CHKSUM);
488
489 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
490 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
491 cf::cleanup "db_open(db): $!" if $!;
492 };
493 cf::cleanup "db_open(db): $@" if $@;
494 };
495 } 624 };
496} 625}
497 626
498sub db_get($$) { 627sub db_get($$) {
499 my $key = "$_[0]/$_[1]"; 628 my $key = "$_[0]/$_[1]";
500 629
550 if (1) { 679 if (1) {
551 $md5 = 680 $md5 =
552 join "\x00", 681 join "\x00",
553 $processversion, 682 $processversion,
554 map { 683 map {
555 Coro::cede; 684 cf::cede_to_tick;
556 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 685 ($src->[$_], Digest::MD5::md5_hex $data[$_])
557 } 0.. $#$src; 686 } 0.. $#$src;
558 687
559 688
560 my $dbmd5 = db_get cache => "$id/md5"; 689 my $dbmd5 = db_get cache => "$id/md5";
604attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
605to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
606 735
607In 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>
608C<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
609Crossfire TRT). 738Deliantra).
610 739
611=over 4 740=over 4
612 741
613=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
614 743
866 "; 995 ";
867 die if $@; 996 die if $@;
868} 997}
869 998
870our $override; 999our $override;
871our @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?
872 1001
873sub override { 1002sub override {
874 $override = 1; 1003 $override = 1;
875 @invoke_results = (); 1004 @INVOKE_RESULTS = (@_);
876} 1005}
877 1006
878sub do_invoke { 1007sub do_invoke {
879 my $event = shift; 1008 my $event = shift;
880 my $callbacks = shift; 1009 my $callbacks = shift;
881 1010
882 @invoke_results = (); 1011 @INVOKE_RESULTS = ();
883 1012
884 local $override; 1013 local $override;
885 1014
886 for (@$callbacks) { 1015 for (@$callbacks) {
887 eval { &{$_->[1]} }; 1016 eval { &{$_->[1]} };
896 } 1025 }
897 1026
898 0 1027 0
899} 1028}
900 1029
901=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
902 1031
903=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
904 1033
905Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
906 1035
907This 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
908removed 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
909results (if you must, access C<@cf::invoke_results> directly). 1038results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910 1039
911=back 1040=back
912 1041
913=cut 1042=cut
914 1043
915############################################################################# 1044#############################################################################
916# 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}
917 1088
918sub reattach { 1089sub reattach {
919 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
920 my ($obj) = @_; 1091 my ($obj) = @_;
921 1092
1093 # no longer needed after getting rid of delete_package?
922 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
923 1095
924 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
925 1097
926 @$registry = (); 1098 @$registry = ();
927 1099
942cf::attachable->attach ( 1114cf::attachable->attach (
943 prio => -1000000, 1115 prio => -1000000,
944 on_instantiate => sub { 1116 on_instantiate => sub {
945 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
946 1118
947 $data = from_json $data; 1119 $data = decode_json $data;
948 1120
949 for (@$data) { 1121 for (@$data) {
950 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
951 1123
952 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
968sub object_freezer_save { 1140sub object_freezer_save {
969 my ($filename, $rdata, $objs) = @_; 1141 my ($filename, $rdata, $objs) = @_;
970 1142
971 sync_job { 1143 sync_job {
972 if (length $$rdata) { 1144 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename);
973 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
974 $filename, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
975 1148
976 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
977 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
978 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
979 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
980 close $fh; 1153 aio_close $fh;
981 1154
982 if (@$objs) { 1155 if (@$objs) {
983 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) {
984 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
985 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
986 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
987 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
988 close $fh; 1161 aio_close $fh;
989 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
990 } 1163 }
991 } else { 1164 } else {
992 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
993 } 1166 }
998 } 1171 }
999 } else { 1172 } else {
1000 aio_unlink $filename; 1173 aio_unlink $filename;
1001 aio_unlink "$filename.pst"; 1174 aio_unlink "$filename.pst";
1002 } 1175 }
1003 } 1176 };
1004} 1177}
1005 1178
1006sub object_freezer_as_string { 1179sub object_freezer_as_string {
1007 my ($rdata, $objs) = @_; 1180 my ($rdata, $objs) = @_;
1008 1181
1020 or return; 1193 or return;
1021 1194
1022 unless (aio_stat "$filename.pst") { 1195 unless (aio_stat "$filename.pst") {
1023 (aio_load "$filename.pst", $av) >= 0 1196 (aio_load "$filename.pst", $av) >= 0
1024 or return; 1197 or return;
1198
1025 $av = eval { (Storable::thaw $av)->{objs} }; 1199 my $st = eval { Coro::Storable::thaw $av };
1200 $av = $st->{objs};
1026 } 1201 }
1027 1202
1203 utf8::decode (my $decname = $filename);
1028 warn sprintf "loading %s (%d)\n", 1204 warn sprintf "loading %s (%d,%d)\n",
1029 $filename, length $data, scalar @{$av || []}; 1205 $decname, length $data, scalar @{$av || []};
1206
1030 return ($data, $av); 1207 ($data, $av)
1031} 1208}
1032 1209
1033=head2 COMMAND CALLBACKS 1210=head2 COMMAND CALLBACKS
1034 1211
1035=over 4 1212=over 4
1108 my ($pl, $buf) = @_; 1285 my ($pl, $buf) = @_;
1109 1286
1110 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1287 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111 1288
1112 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
1113 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1297 if (my $cb = $EXTCMD{$type}) {
1114 if (my %reply = $cb->($pl, $msg)) { 1298 @reply = $cb->($pl, @payload);
1115 $pl->ext_reply ($msg->{msgid}, %reply);
1116 }
1117 } 1299 }
1300
1301 $pl->ext_reply ($reply, @reply)
1302 if $reply;
1303
1118 } else { 1304 } else {
1119 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1305 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120 } 1306 }
1121 1307
1122 cf::override; 1308 cf::override;
1149 1335
1150 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1151 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1152 1338
1153 $ext{source} = 1339 $ext{source} =
1154 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1155 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1156 . $source 1342 . $source
1157 . "\n};\n1"; 1343 . "\n};\n1";
1158 1344
1159 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
1175 my $msg = $@ ? "$v->{path}: $@\n" 1361 my $msg = $@ ? "$v->{path}: $@\n"
1176 : "$v->{base}: extension inactive.\n"; 1362 : "$v->{base}: extension inactive.\n";
1177 1363
1178 if (exists $v->{meta}{mandatory}) { 1364 if (exists $v->{meta}{mandatory}) {
1179 warn $msg; 1365 warn $msg;
1180 warn "mandatory extension failed to load, exiting.\n"; 1366 cf::cleanup "mandatory extension failed to load, exiting.";
1181 exit 1;
1182 } 1367 }
1183 1368
1184 warn $msg; 1369 warn $msg;
1185 } 1370 }
1186 1371
1211use Coro::AIO; 1396use Coro::AIO;
1212 1397
1213=head3 cf::player 1398=head3 cf::player
1214 1399
1215=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}
1216 1415
1217=item cf::player::find $login 1416=item cf::player::find $login
1218 1417
1219Returns the given player object, loading it if necessary (might block). 1418Returns the given player object, loading it if necessary (might block).
1220 1419
1256 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1455 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1257 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1456 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1258 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1457 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1259 aio_unlink +(playerdir $login) . "/$login.pl"; 1458 aio_unlink +(playerdir $login) . "/$login.pl";
1260 1459
1261 my $pl = load_pl path $login 1460 my $f = new_from_file cf::object::thawer path $login
1262 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;
1263 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1264 } 1469 }
1265 } 1470 }
1266} 1471}
1267 1472
1276 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1277 1482
1278 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1279 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1280 1485
1486 cf::get_slot 0.01;
1487
1281 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1282 Coro::cede; 1489 cf::cede_to_tick;
1283} 1490}
1284 1491
1285sub new($) { 1492sub new($) {
1286 my ($login) = @_; 1493 my ($login) = @_;
1287 1494
1293 $cf::PLAYER{$login} = $self; 1500 $cf::PLAYER{$login} = $self;
1294 1501
1295 $self 1502 $self
1296} 1503}
1297 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
1298=item $pl->quit_character 1515=item $pl->quit_character
1299 1516
1300Nukes the player without looking back. If logged in, the connection will 1517Nukes the player without looking back. If logged in, the connection will
1301be destroyed. May block for a long time. 1518be destroyed. May block for a long time.
1302 1519
1306 my ($pl) = @_; 1523 my ($pl) = @_;
1307 1524
1308 my $name = $pl->ob->name; 1525 my $name = $pl->ob->name;
1309 1526
1310 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1311 $pl->password ("*"); # this should lock out the player until we nuked the dir 1528 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1312 1529
1313 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1314 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1315 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1316 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1317 1536
1318 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1319 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
1355 or return []; 1574 or return [];
1356 1575
1357 my @logins; 1576 my @logins;
1358 1577
1359 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") {
1360 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1361 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1362 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1587 }
1363 1588
1364 utf8::decode $login; 1589 utf8::decode $login;
1365 push @logins, $login; 1590 push @logins, $login;
1366 } 1591 }
1367 1592
1401Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1402 1627
1403=cut 1628=cut
1404 1629
1405sub expand_cfpod { 1630sub expand_cfpod {
1406 ((my $self), (local $_)) = @_; 1631 my ($self, $pod) = @_;
1407 1632
1408 # escape & and < 1633 my @nest = [qr<\G$>, undef, ""];
1409 s/&/&amp;/g; 1634 my $xml;
1410 s/(?<![BIUGH])</&lt;/g;
1411 1635
1412 # 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};
1413 1648
1414 1 while 1649 my $cb;
1415 # replace B<>, I<>, U<> etc. 1650
1416 s/B<([^\>]*)>/<b>$1<\/b>/ 1651 if ($code eq "B") {
1417 || s/I<([^\>]*)>/<i>$1<\/i>/ 1652 $cb = sub { "<b>$_[0]</b>" };
1418 || s/U<([^\>]*)>/<u>$1<\/u>/ 1653 } elsif ($code eq "C") {
1419 # replace G<male|female> tags 1654 $cb = sub { "<tt>$_[0]</tt>" };
1420 || s{G<([^>|]*)\|([^>]*)>}{ 1655 } elsif ($code eq "E") {
1421 $self->gender ? $2 : $1 1656 $cb = sub { warn "E<$_[0]>\n";"&$_[0];" };
1422 }ge 1657 } elsif ($code eq "G") {
1423 # replace H<hint text> 1658 $cb = sub {
1424 || s{H<([^\>]*)>} 1659 my ($male, $female) = split /\|/, $_[0];
1425 { 1660 $self->gender ? $female : $male
1661 };
1662 } elsif ($code eq "H") {
1663 $cb = sub {
1664 (
1426 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1665 "<fg name=\"lightblue\">[$_[0] (Use hintmode to suppress hints)]</fg>",
1427 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1666 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1428 "") 1667 "",
1429 [$self->{hintmode}] 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 }
1430 }ge; 1707 }
1708 }
1709 }
1431 1710
1432 # create single paragraphs (very hackish) 1711 $xml
1433 s/(?<=\S)\n(?=\w)/ /g;
1434
1435 # compress some whitespace
1436 s/\s+\n/\n/g; # ws line-ends
1437 s/\n\n+/\n/g; # double lines
1438 s/^\n+//; # beginning lines
1439 s/\n+$//; # ending lines
1440
1441 $_
1442} 1712}
1443 1713
1444sub hintmode { 1714sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1; 1715 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode} 1716 $_[0]{hintmode}
1447} 1717}
1448 1718
1449=item $player->ext_reply ($msgid, %msg) 1719=item $player->ext_reply ($msgid, @msg)
1450 1720
1451Sends an ext reply to the player. 1721Sends an ext reply to the player.
1452 1722
1453=cut 1723=cut
1454 1724
1455sub ext_reply($$%) { 1725sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1726 my ($self, $id, @msg) = @_;
1457 1727
1458 $msg{msgid} = $id; 1728 $self->ns->ext_reply ($id, @msg)
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460} 1729}
1461 1730
1462=item $player->ext_event ($type, %msg) 1731=item $player->ext_msg ($type, @msg)
1463 1732
1464Sends an ext event to the client. 1733Sends an ext event to the client.
1465 1734
1466=cut 1735=cut
1467 1736
1468sub ext_event($$%) { 1737sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1738 my ($self, $type, @msg) = @_;
1470 1739
1471 $self->ns->ext_event ($type, %msg); 1740 $self->ns->ext_msg ($type, @msg);
1472} 1741}
1473 1742
1474=head3 cf::region 1743=head3 cf::region
1475 1744
1476=over 4 1745=over 4
1520our $MAX_RESET = 3600; 1789our $MAX_RESET = 3600;
1521our $DEFAULT_RESET = 3000; 1790our $DEFAULT_RESET = 3000;
1522 1791
1523sub generate_random_map { 1792sub generate_random_map {
1524 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
1525 # mit "rum" bekleckern, nicht 1797 # mit "rum" bekleckern, nicht
1526 $self->_create_random_map ( 1798 $self->_create_random_map (
1527 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1799 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1528 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1800 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1529 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1801 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1619 $self->init; # pass $1 etc. 1891 $self->init; # pass $1 etc.
1620 return $self; 1892 return $self;
1621 } 1893 }
1622 } 1894 }
1623 1895
1624 Carp::carp "unable to resolve path '$path' (base '$base')."; 1896 Carp::cluck "unable to resolve path '$path' (base '$base').";
1625 () 1897 ()
1626} 1898}
1627 1899
1628sub init { 1900sub init {
1629 my ($self) = @_; 1901 my ($self) = @_;
1651 1923
1652# the temporary/swap location 1924# the temporary/swap location
1653sub save_path { 1925sub save_path {
1654 my ($self) = @_; 1926 my ($self) = @_;
1655 1927
1656 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1657 "$TMPDIR/$path.map" 1929 "$TMPDIR/$path.map"
1658} 1930}
1659 1931
1660# the unique path, undef == no special unique path 1932# the unique path, undef == no special unique path
1661sub uniq_path { 1933sub uniq_path {
1662 my ($self) = @_; 1934 my ($self) = @_;
1663 1935
1664 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1936 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1665 "$UNIQUEDIR/$path" 1937 "$UNIQUEDIR/$path"
1666} 1938}
1667 1939
1668# and all this just because we cannot iterate over 1940# and all this just because we cannot iterate over
1669# all maps in C++... 1941# all maps in C++...
1692 1964
1693sub load_header_from($) { 1965sub load_header_from($) {
1694 my ($self, $path) = @_; 1966 my ($self, $path) = @_;
1695 1967
1696 utf8::encode $path; 1968 utf8::encode $path;
1697 #aio_open $path, O_RDONLY, 0 1969 my $f = new_from_file cf::object::thawer $path
1698 # or return;
1699
1700 $self->_load_header ($path)
1701 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;
1702 1977
1703 $self->{load_path} = $path; 1978 $self->{load_path} = $path;
1704 1979
1705 1 1980 1
1706} 1981}
1760sub find { 2035sub find {
1761 my ($path, $origin) = @_; 2036 my ($path, $origin) = @_;
1762 2037
1763 $path = normalise $path, $origin && $origin->path; 2038 $path = normalise $path, $origin && $origin->path;
1764 2039
2040 cf::lock_wait "map_data:$path";#d#remove
1765 cf::lock_wait "map_find:$path"; 2041 cf::lock_wait "map_find:$path";
1766 2042
1767 $cf::MAP{$path} || do { 2043 $cf::MAP{$path} || do {
2044 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1768 my $guard = cf::lock_acquire "map_find:$path"; 2045 my $guard2 = cf::lock_acquire "map_find:$path";
2046
1769 my $map = new_from_path cf::map $path 2047 my $map = new_from_path cf::map $path
1770 or return; 2048 or return;
1771 2049
1772 $map->{last_save} = $cf::RUNTIME; 2050 $map->{last_save} = $cf::RUNTIME;
1773 2051
1775 or return; 2053 or return;
1776 2054
1777 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2055 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778 # doing this can freeze the server in a sync job, obviously 2056 # doing this can freeze the server in a sync job, obviously
1779 #$cf::WAIT_FOR_TICK->wait; 2057 #$cf::WAIT_FOR_TICK->wait;
2058 undef $guard2;
2059 undef $guard1;
1780 $map->reset; 2060 $map->reset;
1781 undef $guard;
1782 return find $path; 2061 return find $path;
1783 } 2062 }
1784 2063
1785 $cf::MAP{$path} = $map 2064 $cf::MAP{$path} = $map
1786 } 2065 }
1795 local $self->{deny_reset} = 1; # loading can take a long time 2074 local $self->{deny_reset} = 1; # loading can take a long time
1796 2075
1797 my $path = $self->{path}; 2076 my $path = $self->{path};
1798 2077
1799 { 2078 {
1800 my $guard = cf::lock_acquire "map_load:$path"; 2079 my $guard = cf::lock_acquire "map_data:$path";
1801 2080
2081 return unless $self->valid;
1802 return if $self->in_memory != cf::MAP_SWAPPED; 2082 return unless $self->in_memory == cf::MAP_SWAPPED;
1803 2083
1804 $self->in_memory (cf::MAP_LOADING); 2084 $self->in_memory (cf::MAP_LOADING);
1805 2085
1806 $self->alloc; 2086 $self->alloc;
1807 2087
1808 $self->pre_load; 2088 $self->pre_load;
1809 Coro::cede; 2089 cf::cede_to_tick;
1810 2090
2091 my $f = new_from_file cf::object::thawer $self->{load_path};
2092 $f->skip_block;
1811 $self->_load_objects ($self->{load_path}, 1) 2093 $self->_load_objects ($f)
1812 or return; 2094 or return;
1813 2095
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2096 $self->post_load_original
1815 if delete $self->{load_original}; 2097 if delete $self->{load_original};
1816 2098
1817 if (my $uniq = $self->uniq_path) { 2099 if (my $uniq = $self->uniq_path) {
1818 utf8::encode $uniq; 2100 utf8::encode $uniq;
1819 if (aio_open $uniq, O_RDONLY, 0) { 2101 unless (aio_stat $uniq) {
2102 if (my $f = new_from_file cf::object::thawer $uniq) {
1820 $self->clear_unique_items; 2103 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0); 2104 $self->_load_objects ($f);
2105 $f->resolve_delayed_derefs;
2106 }
1822 } 2107 }
1823 } 2108 }
1824 2109
1825 Coro::cede; 2110 $f->resolve_delayed_derefs;
2111
2112 cf::cede_to_tick;
1826 # now do the right thing for maps 2113 # now do the right thing for maps
1827 $self->link_multipart_objects; 2114 $self->link_multipart_objects;
1828 $self->difficulty ($self->estimate_difficulty) 2115 $self->difficulty ($self->estimate_difficulty)
1829 unless $self->difficulty; 2116 unless $self->difficulty;
1830 Coro::cede; 2117 cf::cede_to_tick;
1831 2118
1832 unless ($self->{deny_activate}) { 2119 unless ($self->{deny_activate}) {
1833 $self->decay_objects; 2120 $self->decay_objects;
1834 $self->fix_auto_apply; 2121 $self->fix_auto_apply;
1835 $self->update_buttons; 2122 $self->update_buttons;
1836 Coro::cede; 2123 cf::cede_to_tick;
1837 $self->set_darkness_map; 2124 $self->set_darkness_map;
1838 Coro::cede; 2125 cf::cede_to_tick;
1839 $self->activate; 2126 $self->activate;
1840 } 2127 }
1841 2128
2129 $self->{last_save} = $cf::RUNTIME;
2130 $self->last_access ($cf::RUNTIME);
2131
1842 $self->in_memory (cf::MAP_IN_MEMORY); 2132 $self->in_memory (cf::MAP_ACTIVE);
1843 } 2133 }
1844 2134
1845 $self->post_load; 2135 $self->post_load;
1846} 2136}
1847 2137
1856 2146
1857 $self 2147 $self
1858} 2148}
1859 2149
1860# 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
1861sub load_diag { 2151sub load_neighbours {
1862 my ($map) = @_; 2152 my ($map) = @_;
1863 2153
1864 my @diag; # diagonal neighbours 2154 my @neigh; # diagonal neighbours
1865 2155
1866 for (0 .. 3) { 2156 for (0 .. 3) {
1867 my $neigh = $map->tile_path ($_) 2157 my $neigh = $map->tile_path ($_)
1868 or next; 2158 or next;
1869 $neigh = find $neigh, $map 2159 $neigh = find $neigh, $map
1870 or next; 2160 or next;
1871 $neigh->load; 2161 $neigh->load;
1872 2162
2163 push @neigh,
1873 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2164 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1874 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2165 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1875 } 2166 }
1876 2167
1877 for (@diag) { 2168 for (grep defined $_->[0], @neigh) {
2169 my ($path, $origin) = @$_;
1878 my $neigh = find @$_ 2170 my $neigh = find $path, $origin
1879 or next; 2171 or next;
1880 $neigh->load; 2172 $neigh->load;
1881 } 2173 }
1882} 2174}
1883 2175
1888} 2180}
1889 2181
1890sub do_load_sync { 2182sub do_load_sync {
1891 my ($map) = @_; 2183 my ($map) = @_;
1892 2184
2185 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2186 if $Coro::current == $Coro::main;
2187
1893 cf::sync_job { $map->load }; 2188 cf::sync_job { $map->load };
1894} 2189}
1895 2190
1896our %MAP_PREFETCH; 2191our %MAP_PREFETCH;
1897our $MAP_PREFETCHER = undef; 2192our $MAP_PREFETCHER = undef;
1898 2193
1899sub find_async { 2194sub find_async {
1900 my ($path, $origin) = @_; 2195 my ($path, $origin, $load) = @_;
1901 2196
1902 $path = normalise $path, $origin && $origin->{path}; 2197 $path = normalise $path, $origin && $origin->{path};
1903 2198
1904 if (my $map = $cf::MAP{$path}) { 2199 if (my $map = $cf::MAP{$path}) {
1905 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2200 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1906 } 2201 }
1907 2202
1908 undef $MAP_PREFETCH{$path}; 2203 $MAP_PREFETCH{$path} |= $load;
2204
1909 $MAP_PREFETCHER ||= cf::async { 2205 $MAP_PREFETCHER ||= cf::async {
2206 $Coro::current->{desc} = "map prefetcher";
2207
1910 while (%MAP_PREFETCH) { 2208 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 2209 while (my ($k, $v) = each %MAP_PREFETCH) {
1912 my $map = find $path 2210 if (my $map = find $k) {
1913 or next;
1914 $map->load; 2211 $map->load if $v;
2212 }
1915 2213
1916 delete $MAP_PREFETCH{$path}; 2214 delete $MAP_PREFETCH{$k};
1917 } 2215 }
1918 } 2216 }
1919 undef $MAP_PREFETCHER; 2217 undef $MAP_PREFETCHER;
1920 }; 2218 };
1921 $MAP_PREFETCHER->prio (6); 2219 $MAP_PREFETCHER->prio (6);
1924} 2222}
1925 2223
1926sub save { 2224sub save {
1927 my ($self) = @_; 2225 my ($self) = @_;
1928 2226
1929 my $lock = cf::lock_acquire "map_data:" . $self->path; 2227 my $lock = cf::lock_acquire "map_data:$self->{path}";
1930 2228
1931 $self->{last_save} = $cf::RUNTIME; 2229 $self->{last_save} = $cf::RUNTIME;
1932 2230
1933 return unless $self->dirty; 2231 return unless $self->dirty;
1934 2232
1940 return if $self->{deny_save}; 2238 return if $self->{deny_save};
1941 2239
1942 local $self->{last_access} = $self->last_access;#d# 2240 local $self->{last_access} = $self->last_access;#d#
1943 2241
1944 cf::async { 2242 cf::async {
2243 $Coro::current->{desc} = "map player save";
1945 $_->contr->save for $self->players; 2244 $_->contr->save for $self->players;
1946 }; 2245 };
2246
2247 cf::get_slot 0.02;
1947 2248
1948 if ($uniq) { 2249 if ($uniq) {
1949 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2250 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1950 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2251 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1951 } else { 2252 } else {
1957 my ($self) = @_; 2258 my ($self) = @_;
1958 2259
1959 # save first because save cedes 2260 # save first because save cedes
1960 $self->save; 2261 $self->save;
1961 2262
1962 my $lock = cf::lock_acquire "map_data:" . $self->path; 2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
1963 2264
1964 return if $self->players; 2265 return if $self->players;
1965 return if $self->in_memory != cf::MAP_IN_MEMORY; 2266 return if $self->in_memory != cf::MAP_ACTIVE;
1966 return if $self->{deny_save}; 2267 return if $self->{deny_save};
1967 2268
2269 $self->in_memory (cf::MAP_SWAPPED);
2270
2271 $self->deactivate;
2272 $_->clear_links_to ($self) for values %cf::MAP;
1968 $self->clear; 2273 $self->clear;
1969 $self->in_memory (cf::MAP_SWAPPED);
1970} 2274}
1971 2275
1972sub reset_at { 2276sub reset_at {
1973 my ($self) = @_; 2277 my ($self) = @_;
1974 2278
2006 if $uniq; 2310 if $uniq;
2007 } 2311 }
2008 2312
2009 delete $cf::MAP{$self->path}; 2313 delete $cf::MAP{$self->path};
2010 2314
2315 $self->deactivate;
2316 $_->clear_links_to ($self) for values %cf::MAP;
2011 $self->clear; 2317 $self->clear;
2012
2013 $_->clear_links_to ($self) for values %cf::MAP;
2014 2318
2015 $self->unlink_save; 2319 $self->unlink_save;
2016 $self->destroy; 2320 $self->destroy;
2017} 2321}
2018 2322
2019my $nuke_counter = "aaaa"; 2323my $nuke_counter = "aaaa";
2020 2324
2021sub nuke { 2325sub nuke {
2022 my ($self) = @_; 2326 my ($self) = @_;
2023 2327
2328 {
2329 my $lock = cf::lock_acquire "map_data:$self->{path}";
2330
2024 delete $cf::MAP{$self->path}; 2331 delete $cf::MAP{$self->path};
2025 2332
2026 $self->unlink_save; 2333 $self->unlink_save;
2027 2334
2028 bless $self, "cf::map"; 2335 bless $self, "cf::map";
2029 delete $self->{deny_reset}; 2336 delete $self->{deny_reset};
2030 $self->{deny_save} = 1; 2337 $self->{deny_save} = 1;
2031 $self->reset_timeout (1); 2338 $self->reset_timeout (1);
2032 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2339 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033 2340
2034 $cf::MAP{$self->path} = $self; 2341 $cf::MAP{$self->path} = $self;
2342 }
2035 2343
2036 $self->reset; # polite request, might not happen 2344 $self->reset; # polite request, might not happen
2037} 2345}
2038 2346
2039=item $maps = cf::map::tmp_maps 2347=item $maps = cf::map::tmp_maps
2081 2389
2082sub unique_maps() { 2390sub unique_maps() {
2083 [ 2391 [
2084 map { 2392 map {
2085 utf8::decode $_; 2393 utf8::decode $_;
2086 /\.map$/ 2394 s/\.map$//; # TODO future compatibility hack
2395 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2396 ? ()
2087 ? normalise $_ 2397 : normalise $_
2088 : ()
2089 } @{ aio_readdir $UNIQUEDIR or [] } 2398 } @{ aio_readdir $UNIQUEDIR or [] }
2090 ] 2399 ]
2091} 2400}
2092 2401
2093package cf;
2094
2095=back 2402=back
2096 2403
2097=head3 cf::object 2404=head3 cf::object
2098 2405
2099=cut 2406=cut
2102 2409
2103=over 4 2410=over 4
2104 2411
2105=item $ob->inv_recursive 2412=item $ob->inv_recursive
2106 2413
2107Returns 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.
2108 2416
2109=cut 2417=cut
2110 2418
2111sub inv_recursive_; 2419sub inv_recursive_;
2112sub inv_recursive_ { 2420sub inv_recursive_ {
2115 2423
2116sub inv_recursive { 2424sub inv_recursive {
2117 inv_recursive_ inv $_[0] 2425 inv_recursive_ inv $_[0]
2118} 2426}
2119 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
2120package cf; 2456package cf;
2121 2457
2122=back 2458=back
2123 2459
2124=head3 cf::object::player 2460=head3 cf::object::player
2130Sends 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>
2131can 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
2132dialogue with the given NPC character. 2468dialogue with the given NPC character.
2133 2469
2134=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};
2135 2485
2136# rough implementation of a future "reply" method that works 2486# rough implementation of a future "reply" method that works
2137# with dialog boxes. 2487# with dialog boxes.
2138#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
2139sub cf::object::player::reply($$$;$) { 2489sub cf::object::player::reply($$$;$) {
2146 2496
2147 } else { 2497 } else {
2148 my $pl = $self->contr; 2498 my $pl = $self->contr;
2149 2499
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2500 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2501 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2502 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158 2503
2159 } else { 2504 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2505 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2506 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2162 } 2507 }
2163 } 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 (@_);
2164} 2519}
2165 2520
2166=item $player_object->may ("access") 2521=item $player_object->may ("access")
2167 2522
2168Returns wether the given player is authorized to access resource "access" 2523Returns wether the given player is authorized to access resource "access"
2247 # use -1 or undef as default coordinates, not 0, 0 2602 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2603 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2604 if $x <=0 && $y <= 0;
2250 2605
2251 $map->load; 2606 $map->load;
2252 $map->load_diag; 2607 $map->load_neighbours;
2253 2608
2254 return unless $self->contr->active; 2609 return unless $self->contr->active;
2255 $self->activate_recursive; 2610 $self->activate_recursive;
2256 2611
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2612 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258 $self->enter_map ($map, $x, $y); 2613 $self->enter_map ($map, $x, $y);
2259} 2614}
2260 2615
2261=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2616=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2262 2617
2263Moves 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
2264her, loading and preparing them map, calling the provided $check callback 2619her, loading and preparing them map, calling the provided $check callback
2265that 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
2266the 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 >>.
2267 2626
2268=cut 2627=cut
2269 2628
2270our $GOTOGEN; 2629our $GOTOGEN;
2271 2630
2272sub cf::object::player::goto { 2631sub cf::object::player::goto {
2273 my ($self, $path, $x, $y, $check) = @_; 2632 my ($self, $path, $x, $y, $check, $done) = @_;
2274 2633
2275 # 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
2276 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2635 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2277 2636
2278 $self->enter_link; 2637 $self->enter_link;
2279 2638
2280 (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
2281 my $map = eval { 2661 my $map = eval {
2282 my $map = cf::map::find $path; 2662 my $map = defined $path ? cf::map::find $path : undef;
2283 2663
2284 if ($map) { 2664 if ($map) {
2285 $map = $map->customise_for ($self); 2665 $map = $map->customise_for ($self);
2286 $map = $check->($map) if $check && $map; 2666 $map = $check->($map) if $check && $map;
2287 } else { 2667 } else {
2288 $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);
2289 } 2669 }
2290 2670
2291 $map 2671 $map
2292 }; 2672 };
2293 2673
2298 2678
2299 if ($gen == $self->{_goto_generation}) { 2679 if ($gen == $self->{_goto_generation}) {
2300 delete $self->{_goto_generation}; 2680 delete $self->{_goto_generation};
2301 $self->leave_link ($map, $x, $y); 2681 $self->leave_link ($map, $x, $y);
2302 } 2682 }
2683
2684 $done->() if $done;
2303 })->prio (1); 2685 })->prio (1);
2304} 2686}
2305 2687
2306=item $player_object->enter_exit ($exit_object) 2688=item $player_object->enter_exit ($exit_object)
2307 2689
2327} 2709}
2328 2710
2329sub prepare_random_map { 2711sub prepare_random_map {
2330 my ($exit) = @_; 2712 my ($exit) = @_;
2331 2713
2332 my $guard = cf::lock_acquire "exit_prepare:$exit";
2333
2334 # all this does is basically replace the /! path by 2714 # all this does is basically replace the /! path by
2335 # a new random map path (?random/...) with a seed 2715 # a new random map path (?random/...) with a seed
2336 # that depends on the exit object 2716 # that depends on the exit object
2337 2717
2338 my $rmp = parse_random_map_params $exit->msg; 2718 my $rmp = parse_random_map_params $exit->msg;
2340 if ($exit->map) { 2720 if ($exit->map) {
2341 $rmp->{region} = $exit->region->name; 2721 $rmp->{region} = $exit->region->name;
2342 $rmp->{origin_map} = $exit->map->path; 2722 $rmp->{origin_map} = $exit->map->path;
2343 $rmp->{origin_x} = $exit->x; 2723 $rmp->{origin_x} = $exit->x;
2344 $rmp->{origin_y} = $exit->y; 2724 $rmp->{origin_y} = $exit->y;
2725
2726 $exit->map->touch;
2345 } 2727 }
2346 2728
2347 $rmp->{random_seed} ||= $exit->random_seed; 2729 $rmp->{random_seed} ||= $exit->random_seed;
2348 2730
2349 my $data = cf::to_json $rmp; 2731 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2350 my $md5 = Digest::MD5::md5_hex $data; 2732 my $md5 = Digest::MD5::md5_hex $data;
2351 my $meta = "$RANDOMDIR/$md5.meta"; 2733 my $meta = "$RANDOMDIR/$md5.meta";
2352 2734
2353 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2735 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2354 aio_write $fh, 0, (length $data), $data, 0; 2736 aio_write $fh, 0, (length $data), $data, 0;
2355 undef $fh; 2737 undef $fh;
2356 aio_rename "$meta~", $meta; 2738 aio_rename "$meta~", $meta;
2357 2739
2740 my $slaying = "?random/$md5";
2741
2742 if ($exit->valid) {
2358 $exit->slaying ("?random/$md5"); 2743 $exit->slaying ("?random/$md5");
2359 $exit->msg (undef); 2744 $exit->msg (undef);
2745 }
2360 } 2746 }
2361} 2747}
2362 2748
2363sub cf::object::player::enter_exit { 2749sub cf::object::player::enter_exit {
2364 my ($self, $exit) = @_; 2750 my ($self, $exit) = @_;
2365 2751
2366 return unless $self->type == cf::PLAYER; 2752 return unless $self->type == cf::PLAYER;
2367 2753
2368 if ($exit->slaying eq "/!") {
2369 #TODO: this should de-fi-ni-te-ly not be a sync-job
2370 # the problem is that $exit might not survive long enough
2371 # so it needs to be done right now, right here
2372 cf::sync_job { prepare_random_map $exit };
2373 }
2374
2375 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2376 my $hp = $exit->stats->hp;
2377 my $sp = $exit->stats->sp;
2378
2379 $self->enter_link; 2754 $self->enter_link;
2380 2755
2381 # if exit is damned, update players death & WoR home-position
2382 $self->contr->savebed ($slaying, $hp, $sp)
2383 if $exit->flag (FLAG_DAMNED);
2384
2385 (async { 2756 (async {
2386 $self->deactivate_recursive; # just to be sure 2757 $Coro::current->{desc} = "enter_exit";
2758
2387 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
2388 $self->goto ($slaying, $hp, $sp); 2774 $self->goto ($map, $x, $y);
2389 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
2390 1; 2780 1
2391 }) { 2781 }) {
2392 $self->message ("Something went wrong deep within the crossfire server. " 2782 $self->message ("Something went wrong deep within the crossfire server. "
2393 . "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. "
2394 . "Please report this to the dungeon master!", 2784 . "Please report this to the dungeon master!",
2395 cf::NDI_UNIQUE | cf::NDI_RED); 2785 cf::NDI_UNIQUE | cf::NDI_RED);
2416 2806
2417 utf8::encode $text; 2807 utf8::encode $text;
2418 $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);
2419} 2809}
2420 2810
2421=item $client->send_msg ($color, $type, $msg, [extra...]) 2811=item $client->send_msg ($channel, $msg, $color, [extra...])
2422 2812
2423Send 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
2424client 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
2425the 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
2426the message unless the client supports the msg packet. 2816the message unless the client supports the msg packet.
2427 2817
2428=cut 2818=cut
2429 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
2430sub cf::client::send_msg { 2878sub cf::client::send_msg {
2431 my ($self, $color, $type, $msg, @extra) = @_; 2879 my ($self, $channel, $msg, $color, @extra) = @_;
2432 2880
2433 $msg = $self->pl->expand_cfpod ($msg); 2881 $msg = $self->pl->expand_cfpod ($msg);
2434 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
2435 return unless @extra || length $msg; 2905 return unless @extra || length $msg;
2436 2906
2437 if ($self->can_msg) { 2907 if ($self->can_msg) {
2438 $self->send_packet ("msg " . $self->{json_coder}->encode ([$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 my $pkt = "msg "
2913 . $self->{json_coder}->encode (
2914 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2915 );
2916
2917 # try lzf for large packets
2918 $pkt = "lzf " . Compress::LZF::compress $pkt
2919 if 1024 <= length $pkt and $self->{can_lzf};
2920
2921 # split very large packets
2922 if (8192 < length $pkt and $self->{can_lzf}) {
2923 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2924 $pkt = "frag";
2925 }
2926
2927 $self->send_packet ($pkt);
2439 } else { 2928 } else {
2440 # replace some tags by gcfclient-compatible ones
2441 for ($msg) {
2442 1 while
2443 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2444 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2445 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2446 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2447 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2448 }
2449
2450 if ($color >= 0) { 2929 if ($color >= 0) {
2930 # replace some tags by gcfclient-compatible ones
2931 for ($msg) {
2932 1 while
2933 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2934 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2935 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2936 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2937 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2938 }
2939
2940 $color &= cf::NDI_COLOR_MASK;
2941
2942 utf8::encode $msg;
2943
2451 if (0 && $msg =~ /\[/) { 2944 if (0 && $msg =~ /\[/) {
2945 # COMMAND/INFO
2452 $self->send_packet ("drawextinfo $color 4 0 $msg") 2946 $self->send_packet ("drawextinfo $color 10 8 $msg")
2453 } else { 2947 } else {
2454 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2948 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2455 $self->send_packet ("drawinfo $color $msg") 2949 $self->send_packet ("drawinfo $color $msg")
2456 } 2950 }
2457 } 2951 }
2458 } 2952 }
2459} 2953}
2460 2954
2461=item $client->ext_event ($type, %msg) 2955=item $client->ext_msg ($type, @msg)
2462 2956
2463Sends an ext event to the client. 2957Sends an ext event to the client.
2464 2958
2465=cut 2959=cut
2466 2960
2467sub cf::client::ext_event($$%) { 2961sub cf::client::ext_msg($$@) {
2468 my ($self, $type, %msg) = @_; 2962 my ($self, $type, @msg) = @_;
2469 2963
2470 return unless $self->extcmd; 2964 if ($self->extcmd == 2) {
2471 2965 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2966 } elsif ($self->extcmd == 1) { # TODO: remove
2472 $msg{msgtype} = "event_$type"; 2967 push @msg, msgtype => "event_$type";
2473 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2968 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2969 }
2970}
2971
2972=item $client->ext_reply ($msgid, @msg)
2973
2974Sends an ext reply to the client.
2975
2976=cut
2977
2978sub cf::client::ext_reply($$@) {
2979 my ($self, $id, @msg) = @_;
2980
2981 if ($self->extcmd == 2) {
2982 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2983 } elsif ($self->extcmd == 1) {
2984 #TODO: version 1, remove
2985 unshift @msg, msgtype => "reply", msgid => $id;
2986 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2987 }
2474} 2988}
2475 2989
2476=item $success = $client->query ($flags, "text", \&cb) 2990=item $success = $client->query ($flags, "text", \&cb)
2477 2991
2478Queues a query to the client, calling the given callback with 2992Queues a query to the client, calling the given callback with
2533 my ($ns, $buf) = @_; 3047 my ($ns, $buf) = @_;
2534 3048
2535 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3049 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2536 3050
2537 if (ref $msg) { 3051 if (ref $msg) {
3052 my ($type, $reply, @payload) =
3053 "ARRAY" eq ref $msg
3054 ? @$msg
3055 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3056
3057 my @reply;
3058
2538 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3059 if (my $cb = $EXTICMD{$type}) {
2539 if (my %reply = $cb->($ns, $msg)) { 3060 @reply = $cb->($ns, @payload);
2540 $reply{msgid} = $msg->{msgid};
2541 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2542 }
2543 } 3061 }
3062
3063 $ns->ext_reply ($reply, @reply)
3064 if $reply;
3065
2544 } else { 3066 } else {
2545 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3067 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2546 } 3068 }
2547 3069
2548 cf::override; 3070 cf::override;
2595our $safe = new Safe "safe"; 3117our $safe = new Safe "safe";
2596our $safe_hole = new Safe::Hole; 3118our $safe_hole = new Safe::Hole;
2597 3119
2598$SIG{FPE} = 'IGNORE'; 3120$SIG{FPE} = 'IGNORE';
2599 3121
2600$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3122$safe->permit_only (Opcode::opset qw(
3123 :base_core :base_mem :base_orig :base_math
3124 grepstart grepwhile mapstart mapwhile
3125 sort time
3126));
2601 3127
2602# here we export the classes and methods available to script code 3128# here we export the classes and methods available to script code
2603 3129
2604=pod 3130=pod
2605 3131
2606The following functions and methods are available within a safe environment: 3132The following functions and methods are available within a safe environment:
2607 3133
2608 cf::object 3134 cf::object
2609 contr pay_amount pay_player map x y force_find force_add 3135 contr pay_amount pay_player map x y force_find force_add destroy
2610 insert remove 3136 insert remove name archname title slaying race decrease split
2611 3137
2612 cf::object::player 3138 cf::object::player
2613 player 3139 player
2614 3140
2615 cf::player 3141 cf::player
2620 3146
2621=cut 3147=cut
2622 3148
2623for ( 3149for (
2624 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3150 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2625 insert remove)], 3151 insert remove inv nrof name archname title slaying race
3152 decrease split destroy change_exp)],
2626 ["cf::object::player" => qw(player)], 3153 ["cf::object::player" => qw(player)],
2627 ["cf::player" => qw(peaceful)], 3154 ["cf::player" => qw(peaceful)],
2628 ["cf::map" => qw(trigger)], 3155 ["cf::map" => qw(trigger)],
2629) { 3156) {
2630 no strict 'refs'; 3157 no strict 'refs';
2706# the server's init and main functions 3233# the server's init and main functions
2707 3234
2708sub load_facedata($) { 3235sub load_facedata($) {
2709 my ($path) = @_; 3236 my ($path) = @_;
2710 3237
3238 # HACK to clear player env face cache, we need some signal framework
3239 # for this (global event?)
3240 %ext::player_env::MUSIC_FACE_CACHE = ();
3241
3242 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3243
2711 warn "loading facedata from $path\n"; 3244 warn "loading facedata from $path\n";
2712 3245
2713 my $facedata; 3246 my $facedata;
2714 0 < aio_load $path, $facedata 3247 0 < aio_load $path, $facedata
2715 or die "$path: $!"; 3248 or die "$path: $!";
2717 $facedata = Coro::Storable::thaw $facedata; 3250 $facedata = Coro::Storable::thaw $facedata;
2718 3251
2719 $facedata->{version} == 2 3252 $facedata->{version} == 2
2720 or cf::cleanup "$path: version mismatch, cannot proceed."; 3253 or cf::cleanup "$path: version mismatch, cannot proceed.";
2721 3254
3255 # patch in the exptable
3256 $facedata->{resource}{"res/exp_table"} = {
3257 type => FT_RSRC,
3258 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3259 };
3260 cf::cede_to_tick;
3261
2722 { 3262 {
2723 my $faces = $facedata->{faceinfo}; 3263 my $faces = $facedata->{faceinfo};
2724 3264
2725 while (my ($face, $info) = each %$faces) { 3265 while (my ($face, $info) = each %$faces) {
2726 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3266 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3267
2727 cf::face::set_visibility $idx, $info->{visibility}; 3268 cf::face::set_visibility $idx, $info->{visibility};
2728 cf::face::set_magicmap $idx, $info->{magicmap}; 3269 cf::face::set_magicmap $idx, $info->{magicmap};
2729 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3270 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2730 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3271 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2731 3272
2732 cf::cede_to_tick; 3273 cf::cede_to_tick;
2733 } 3274 }
2734 3275
2735 while (my ($face, $info) = each %$faces) { 3276 while (my ($face, $info) = each %$faces) {
2736 next unless $info->{smooth}; 3277 next unless $info->{smooth};
3278
2737 my $idx = cf::face::find $face 3279 my $idx = cf::face::find $face
2738 or next; 3280 or next;
3281
2739 if (my $smooth = cf::face::find $info->{smooth}) { 3282 if (my $smooth = cf::face::find $info->{smooth}) {
2740 cf::face::set_smooth $idx, $smooth; 3283 cf::face::set_smooth $idx, $smooth;
2741 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3284 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2742 } else { 3285 } else {
2743 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3286 warn "smooth face '$info->{smooth}' not found for face '$face'";
2760 3303
2761 { 3304 {
2762 # TODO: for gcfclient pleasure, we should give resources 3305 # TODO: for gcfclient pleasure, we should give resources
2763 # that gcfclient doesn't grok a >10000 face index. 3306 # that gcfclient doesn't grok a >10000 face index.
2764 my $res = $facedata->{resource}; 3307 my $res = $facedata->{resource};
2765 my $enc = JSON::XS->new->utf8->canonical;
2766 3308
2767 while (my ($name, $info) = each %$res) { 3309 while (my ($name, $info) = each %$res) {
2768 my $meta = $enc->encode ({ 3310 if (defined $info->{type}) {
2769 name => $name,
2770 type => $info->{type},
2771 copyright => $info->{copyright}, #TODO#
2772 });
2773 my $data = pack "(w/a*)*", $meta, $info->{data};
2774 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2775
2776 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3311 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3312 my $data;
3313
3314 if ($info->{type} & 1) {
3315 # prepend meta info
3316
3317 my $meta = $enc->encode ({
3318 name => $name,
3319 %{ $info->{meta} || {} },
3320 });
3321
3322 $data = pack "(w/a*)*", $meta, $info->{data};
3323 } else {
3324 $data = $info->{data};
3325 }
3326
3327 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2777 cf::face::set_type $idx, 1; 3328 cf::face::set_type $idx, $info->{type};
2778 cf::face::set_data $idx, 0, $data, $chk; 3329 } else {
3330 $RESOURCE{$name} = $info;
3331 }
2779 3332
2780 cf::cede_to_tick; 3333 cf::cede_to_tick;
2781 } 3334 }
2782 } 3335 }
2783 3336
3337 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3338
2784 1 3339 1
2785} 3340}
2786 3341
3342cf::global->attach (on_resource_update => sub {
3343 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3344 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3345
3346 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3347 my $sound = $soundconf->{compat}[$_]
3348 or next;
3349
3350 my $face = cf::face::find "sound/$sound->[1]";
3351 cf::sound::set $sound->[0] => $face;
3352 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3353 }
3354
3355 while (my ($k, $v) = each %{$soundconf->{event}}) {
3356 my $face = cf::face::find "sound/$v";
3357 cf::sound::set $k => $face;
3358 }
3359 }
3360});
3361
3362register_exticmd fx_want => sub {
3363 my ($ns, $want) = @_;
3364
3365 while (my ($k, $v) = each %$want) {
3366 $ns->fx_want ($k, $v);
3367 }
3368};
3369
3370sub load_resource_file($) {
3371 my $guard = lock_acquire "load_resource_file";
3372
3373 my $status = load_resource_file_ $_[0];
3374 get_slot 0.1, 100;
3375 cf::arch::commit_load;
3376
3377 $status
3378}
3379
2787sub reload_regions { 3380sub reload_regions {
3381 # HACK to clear player env face cache, we need some signal framework
3382 # for this (global event?)
3383 %ext::player_env::MUSIC_FACE_CACHE = ();
3384
2788 load_resource_file "$MAPDIR/regions" 3385 load_resource_file "$MAPDIR/regions"
2789 or die "unable to load regions file\n"; 3386 or die "unable to load regions file\n";
2790 3387
2791 for (cf::region::list) { 3388 for (cf::region::list) {
2792 $_->{match} = qr/$_->{match}/ 3389 $_->{match} = qr/$_->{match}/
2800} 3397}
2801 3398
2802sub reload_archetypes { 3399sub reload_archetypes {
2803 load_resource_file "$DATADIR/archetypes" 3400 load_resource_file "$DATADIR/archetypes"
2804 or die "unable to load archetypes\n"; 3401 or die "unable to load archetypes\n";
2805 #d# NEED to laod twice to resolve forward references
2806 # this really needs to be done in an extra post-pass
2807 # (which needs to be synchronous, so solve it differently)
2808 load_resource_file "$DATADIR/archetypes"
2809 or die "unable to load archetypes\n";
2810} 3402}
2811 3403
2812sub reload_treasures { 3404sub reload_treasures {
2813 load_resource_file "$DATADIR/treasures" 3405 load_resource_file "$DATADIR/treasures"
2814 or die "unable to load treasurelists\n"; 3406 or die "unable to load treasurelists\n";
2815} 3407}
2816 3408
2817sub reload_resources { 3409sub reload_resources {
2818 warn "reloading resource files...\n"; 3410 warn "reloading resource files...\n";
2819 3411
3412 reload_facedata;
3413 reload_archetypes;
2820 reload_regions; 3414 reload_regions;
2821 reload_facedata;
2822 #reload_archetypes;#d#
2823 reload_archetypes;
2824 reload_treasures; 3415 reload_treasures;
2825 3416
2826 warn "finished reloading resource files\n"; 3417 warn "finished reloading resource files\n";
2827} 3418}
2828 3419
2829sub init { 3420sub init {
3421 my $guard = freeze_mainloop;
3422
3423 evthread_start IO::AIO::poll_fileno;
3424
2830 reload_resources; 3425 reload_resources;
2831} 3426}
2832 3427
2833sub cfg_load { 3428sub reload_config {
2834 open my $fh, "<:utf8", "$CONFDIR/config" 3429 open my $fh, "<:utf8", "$CONFDIR/config"
2835 or return; 3430 or return;
2836 3431
2837 local $/; 3432 local $/;
2838 *CFG = YAML::Syck::Load <$fh>; 3433 *CFG = YAML::Load <$fh>;
2839 3434
2840 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3435 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2841 3436
2842 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3437 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2843 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3438 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2854sub main { 3449sub main {
2855 # we must not ever block the main coroutine 3450 # we must not ever block the main coroutine
2856 local $Coro::idle = sub { 3451 local $Coro::idle = sub {
2857 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3452 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2858 (async { 3453 (async {
2859 Event::one_event; 3454 $Coro::current->{desc} = "IDLE BUG HANDLER";
3455 EV::loop EV::LOOP_ONESHOT;
2860 })->prio (Coro::PRIO_MAX); 3456 })->prio (Coro::PRIO_MAX);
2861 }; 3457 };
2862 3458
2863 cfg_load; 3459 {
3460 my $guard = freeze_mainloop;
3461 reload_config;
2864 db_init; 3462 db_init;
2865 load_extensions; 3463 load_extensions;
2866 3464
2867 $TICK_WATCHER->start; 3465 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3466 }
3467
2868 Event::loop; 3468 EV::loop;
2869} 3469}
2870 3470
2871############################################################################# 3471#############################################################################
2872# initialisation and cleanup 3472# initialisation and cleanup
2873 3473
2874# install some emergency cleanup handlers 3474# install some emergency cleanup handlers
2875BEGIN { 3475BEGIN {
3476 our %SIGWATCHER = ();
2876 for my $signal (qw(INT HUP TERM)) { 3477 for my $signal (qw(INT HUP TERM)) {
2877 Event->signal ( 3478 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2878 reentrant => 0,
2879 data => WF_AUTOCANCEL,
2880 signal => $signal,
2881 prio => 0,
2882 cb => sub {
2883 cf::cleanup "SIG$signal"; 3479 cf::cleanup "SIG$signal";
2884 },
2885 ); 3480 };
2886 } 3481 }
2887} 3482}
2888 3483
2889sub write_runtime { 3484sub write_runtime_sync {
2890 my $runtime = "$LOCALDIR/runtime"; 3485 my $runtime = "$LOCALDIR/runtime";
2891 3486
2892 # first touch the runtime file to show we are still running: 3487 # first touch the runtime file to show we are still running:
2893 # the fsync below can take a very very long time. 3488 # the fsync below can take a very very long time.
2894 3489
2920 and return; 3515 and return;
2921 3516
2922 warn "runtime file written.\n"; 3517 warn "runtime file written.\n";
2923 3518
2924 1 3519 1
3520}
3521
3522our $uuid_lock;
3523our $uuid_skip;
3524
3525sub write_uuid_sync($) {
3526 $uuid_skip ||= $_[0];
3527
3528 return if $uuid_lock;
3529 local $uuid_lock = 1;
3530
3531 my $uuid = "$LOCALDIR/uuid";
3532
3533 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3534 or return;
3535
3536 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3537 $uuid_skip = 0;
3538
3539 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3540 and return;
3541
3542 # always fsync - this file is important
3543 aio_fsync $fh
3544 and return;
3545
3546 close $fh
3547 or return;
3548
3549 aio_rename "$uuid~", $uuid
3550 and return;
3551
3552 warn "uuid file written ($value).\n";
3553
3554 1
3555
3556}
3557
3558sub write_uuid($$) {
3559 my ($skip, $sync) = @_;
3560
3561 $sync ? write_uuid_sync $skip
3562 : async { write_uuid_sync $skip };
2925} 3563}
2926 3564
2927sub emergency_save() { 3565sub emergency_save() {
2928 my $freeze_guard = cf::freeze_mainloop; 3566 my $freeze_guard = cf::freeze_mainloop;
2929 3567
2935 # and maps saved/destroyed asynchronously. 3573 # and maps saved/destroyed asynchronously.
2936 warn "begin emergency player save\n"; 3574 warn "begin emergency player save\n";
2937 for my $login (keys %cf::PLAYER) { 3575 for my $login (keys %cf::PLAYER) {
2938 my $pl = $cf::PLAYER{$login} or next; 3576 my $pl = $cf::PLAYER{$login} or next;
2939 $pl->valid or next; 3577 $pl->valid or next;
3578 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2940 $pl->save; 3579 $pl->save;
2941 } 3580 }
2942 warn "end emergency player save\n"; 3581 warn "end emergency player save\n";
2943 3582
2944 warn "begin emergency map save\n"; 3583 warn "begin emergency map save\n";
2950 warn "end emergency map save\n"; 3589 warn "end emergency map save\n";
2951 3590
2952 warn "begin emergency database checkpoint\n"; 3591 warn "begin emergency database checkpoint\n";
2953 BDB::db_env_txn_checkpoint $DB_ENV; 3592 BDB::db_env_txn_checkpoint $DB_ENV;
2954 warn "end emergency database checkpoint\n"; 3593 warn "end emergency database checkpoint\n";
3594
3595 warn "begin write uuid\n";
3596 write_uuid_sync 1;
3597 warn "end write uuid\n";
2955 }; 3598 };
2956 3599
2957 warn "leave emergency perl save\n"; 3600 warn "leave emergency perl save\n";
2958} 3601}
2959 3602
2961 my ($make_core) = @_; 3604 my ($make_core) = @_;
2962 3605
2963 warn Carp::longmess "post_cleanup backtrace" 3606 warn Carp::longmess "post_cleanup backtrace"
2964 if $make_core; 3607 if $make_core;
2965} 3608}
3609
3610# a safer delete_package, copied from Symbol
3611sub clear_package($) {
3612 my $pkg = shift;
3613
3614 # expand to full symbol table name if needed
3615 unless ($pkg =~ /^main::.*::$/) {
3616 $pkg = "main$pkg" if $pkg =~ /^::/;
3617 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3618 $pkg .= '::' unless $pkg =~ /::$/;
3619 }
3620
3621 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3622 my $stem_symtab = *{$stem}{HASH};
3623
3624 defined $stem_symtab and exists $stem_symtab->{$leaf}
3625 or return;
3626
3627 # clear all symbols
3628 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3629 for my $name (keys %$leaf_symtab) {
3630 _gv_clear *{"$pkg$name"};
3631# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3632 }
3633 warn "cleared package #$pkg\n";#d#
3634}
3635
3636our $RELOAD; # how many times to reload
2966 3637
2967sub do_reload_perl() { 3638sub do_reload_perl() {
2968 # can/must only be called in main 3639 # can/must only be called in main
2969 if ($Coro::current != $Coro::main) { 3640 if ($Coro::current != $Coro::main) {
2970 warn "can only reload from main coroutine"; 3641 warn "can only reload from main coroutine";
2971 return; 3642 return;
2972 } 3643 }
2973 3644
3645 return if $RELOAD++;
3646
3647 while ($RELOAD) {
2974 warn "reloading..."; 3648 warn "reloading...";
2975 3649
2976 warn "entering sync_job"; 3650 warn "entering sync_job";
2977 3651
2978 cf::sync_job { 3652 cf::sync_job {
2979 cf::write_runtime; # external watchdog should not bark 3653 cf::write_runtime_sync; # external watchdog should not bark
2980 cf::emergency_save; 3654 cf::emergency_save;
2981 cf::write_runtime; # external watchdog should not bark 3655 cf::write_runtime_sync; # external watchdog should not bark
2982 3656
2983 warn "syncing database to disk"; 3657 warn "syncing database to disk";
2984 BDB::db_env_txn_checkpoint $DB_ENV; 3658 BDB::db_env_txn_checkpoint $DB_ENV;
2985 3659
2986 # if anything goes wrong in here, we should simply crash as we already saved 3660 # if anything goes wrong in here, we should simply crash as we already saved
2987 3661
2988 warn "cancelling all WF_AUTOCANCEL watchers";
2989 for (Event::all_watchers) {
2990 $_->cancel if $_->data & WF_AUTOCANCEL;
2991 }
2992
2993 warn "flushing outstanding aio requests"; 3662 warn "flushing outstanding aio requests";
2994 for (;;) {
2995 BDB::flush;
2996 IO::AIO::flush;
2997 Coro::cede;
2998 last unless IO::AIO::nreqs || BDB::nreqs; 3663 while (IO::AIO::nreqs || BDB::nreqs) {
2999 warn "iterate..."; 3664 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3000 }
3001
3002 ++$RELOAD;
3003
3004 warn "cancelling all extension coros";
3005 $_->cancel for values %EXT_CORO;
3006 %EXT_CORO = ();
3007
3008 warn "removing commands";
3009 %COMMAND = ();
3010
3011 warn "removing ext/exti commands";
3012 %EXTCMD = ();
3013 %EXTICMD = ();
3014
3015 warn "unloading/nuking all extensions";
3016 for my $pkg (@EXTS) {
3017 warn "... unloading $pkg";
3018
3019 if (my $cb = $pkg->can ("unload")) {
3020 eval {
3021 $cb->($pkg);
3022 1
3023 } or warn "$pkg unloaded, but with errors: $@";
3024 } 3665 }
3025 3666
3026 warn "... nuking $pkg"; 3667 warn "cancelling all extension coros";
3027 Symbol::delete_package $pkg; 3668 $_->cancel for values %EXT_CORO;
3028 } 3669 %EXT_CORO = ();
3029 3670
3030 warn "unloading all perl modules loaded from $LIBDIR"; 3671 warn "removing commands";
3031 while (my ($k, $v) = each %INC) { 3672 %COMMAND = ();
3032 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3033 3673
3674 warn "removing ext/exti commands";
3675 %EXTCMD = ();
3676 %EXTICMD = ();
3677
3678 warn "unloading/nuking all extensions";
3679 for my $pkg (@EXTS) {
3034 warn "... unloading $k"; 3680 warn "... unloading $pkg";
3035 delete $INC{$k};
3036 3681
3037 $k =~ s/\.pm$//;
3038 $k =~ s/\//::/g;
3039
3040 if (my $cb = $k->can ("unload_module")) { 3682 if (my $cb = $pkg->can ("unload")) {
3683 eval {
3041 $cb->(); 3684 $cb->($pkg);
3685 1
3686 } or warn "$pkg unloaded, but with errors: $@";
3687 }
3688
3689 warn "... clearing $pkg";
3690 clear_package $pkg;
3042 } 3691 }
3043 3692
3044 Symbol::delete_package $k; 3693 warn "unloading all perl modules loaded from $LIBDIR";
3694 while (my ($k, $v) = each %INC) {
3695 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3696
3697 warn "... unloading $k";
3698 delete $INC{$k};
3699
3700 $k =~ s/\.pm$//;
3701 $k =~ s/\//::/g;
3702
3703 if (my $cb = $k->can ("unload_module")) {
3704 $cb->();
3705 }
3706
3707 clear_package $k;
3045 } 3708 }
3046 3709
3047 warn "getting rid of safe::, as good as possible"; 3710 warn "getting rid of safe::, as good as possible";
3048 Symbol::delete_package "safe::$_" 3711 clear_package "safe::$_"
3049 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3712 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3050 3713
3051 warn "unloading cf.pm \"a bit\""; 3714 warn "unloading cf.pm \"a bit\"";
3052 delete $INC{"cf.pm"}; 3715 delete $INC{"cf.pm"};
3053 delete $INC{"cf/pod.pm"}; 3716 delete $INC{"cf/pod.pm"};
3054 3717
3055 # don't, removes xs symbols, too, 3718 # don't, removes xs symbols, too,
3056 # and global variables created in xs 3719 # and global variables created in xs
3057 #Symbol::delete_package __PACKAGE__; 3720 #clear_package __PACKAGE__;
3058 3721
3059 warn "unload completed, starting to reload now"; 3722 warn "unload completed, starting to reload now";
3060 3723
3061 warn "reloading cf.pm"; 3724 warn "reloading cf.pm";
3062 require cf; 3725 require cf;
3063 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3726 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3064 3727
3065 warn "loading config and database again"; 3728 warn "loading config and database again";
3066 cf::cfg_load; 3729 cf::reload_config;
3067 3730
3068 warn "loading extensions"; 3731 warn "loading extensions";
3069 cf::load_extensions; 3732 cf::load_extensions;
3070 3733
3071 warn "reattaching attachments to objects/players"; 3734 warn "reattaching attachments to objects/players";
3072 _global_reattach; # objects, sockets 3735 _global_reattach; # objects, sockets
3073 warn "reattaching attachments to maps"; 3736 warn "reattaching attachments to maps";
3074 reattach $_ for values %MAP; 3737 reattach $_ for values %MAP;
3075 warn "reattaching attachments to players"; 3738 warn "reattaching attachments to players";
3076 reattach $_ for values %PLAYER; 3739 reattach $_ for values %PLAYER;
3077 3740
3078 warn "leaving sync_job"; 3741 warn "leaving sync_job";
3079 3742
3080 1 3743 1
3081 } or do { 3744 } or do {
3082 warn $@; 3745 warn $@;
3083 warn "error while reloading, exiting."; 3746 cf::cleanup "error while reloading, exiting.";
3084 exit 1;
3085 }; 3747 };
3086 3748
3087 warn "reloaded"; 3749 warn "reloaded";
3750 --$RELOAD;
3751 }
3088}; 3752};
3089 3753
3090our $RELOAD_WATCHER; # used only during reload 3754our $RELOAD_WATCHER; # used only during reload
3091 3755
3092sub reload_perl() { 3756sub reload_perl() {
3093 # doing reload synchronously and two reloads happen back-to-back, 3757 # doing reload synchronously and two reloads happen back-to-back,
3094 # coro crashes during coro_state_free->destroy here. 3758 # coro crashes during coro_state_free->destroy here.
3095 3759
3096 $RELOAD_WATCHER ||= Event->timer ( 3760 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3097 reentrant => 0,
3098 after => 0,
3099 data => WF_AUTOCANCEL,
3100 cb => sub {
3101 do_reload_perl; 3761 do_reload_perl;
3102 undef $RELOAD_WATCHER; 3762 undef $RELOAD_WATCHER;
3103 },
3104 ); 3763 };
3105} 3764}
3106 3765
3107register_command "reload" => sub { 3766register_command "reload" => sub {
3108 my ($who, $arg) = @_; 3767 my ($who, $arg) = @_;
3109 3768
3110 if ($who->flag (FLAG_WIZ)) { 3769 if ($who->flag (FLAG_WIZ)) {
3111 $who->message ("reloading server."); 3770 $who->message ("reloading server.");
3771 async {
3772 $Coro::current->{desc} = "perl_reload";
3112 async { reload_perl }; 3773 reload_perl;
3774 };
3113 } 3775 }
3114}; 3776};
3115 3777
3116unshift @INC, $LIBDIR; 3778unshift @INC, $LIBDIR;
3117 3779
3119 3781
3120our @WAIT_FOR_TICK; 3782our @WAIT_FOR_TICK;
3121our @WAIT_FOR_TICK_BEGIN; 3783our @WAIT_FOR_TICK_BEGIN;
3122 3784
3123sub wait_for_tick { 3785sub wait_for_tick {
3124 return unless $TICK_WATCHER->is_active;
3125 return if $Coro::current == $Coro::main; 3786 return if tick_inhibit || $Coro::current == $Coro::main;
3126 3787
3127 my $signal = new Coro::Signal; 3788 my $signal = new Coro::Signal;
3128 push @WAIT_FOR_TICK, $signal; 3789 push @WAIT_FOR_TICK, $signal;
3129 $signal->wait; 3790 $signal->wait;
3130} 3791}
3131 3792
3132sub wait_for_tick_begin { 3793sub wait_for_tick_begin {
3133 return unless $TICK_WATCHER->is_active;
3134 return if $Coro::current == $Coro::main; 3794 return if tick_inhibit || $Coro::current == $Coro::main;
3135 3795
3136 my $signal = new Coro::Signal; 3796 my $signal = new Coro::Signal;
3137 push @WAIT_FOR_TICK_BEGIN, $signal; 3797 push @WAIT_FOR_TICK_BEGIN, $signal;
3138 $signal->wait; 3798 $signal->wait;
3139} 3799}
3140 3800
3141 my $min = 1e6;#d# 3801sub tick {
3142 my $avg = 10;
3143$TICK_WATCHER = Event->timer (
3144 reentrant => 0,
3145 parked => 1,
3146 prio => 0,
3147 at => $NEXT_TICK || $TICK,
3148 data => WF_AUTOCANCEL,
3149 cb => sub {
3150 if ($Coro::current != $Coro::main) { 3802 if ($Coro::current != $Coro::main) {
3151 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3803 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3152 unless ++$bug_warning > 10; 3804 unless ++$bug_warning > 10;
3153 return; 3805 return;
3154 } 3806 }
3155 3807
3156 $NOW = $tick_start = Event::time;
3157
3158 cf::server_tick; # one server iteration 3808 cf::server_tick; # one server iteration
3159 3809
3160 0 && sync_job {#d# 3810 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3161 for(1..10) { 3811 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3162 my $t = Event::time; 3812 Coro::async_pool {
3163 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3813 $Coro::current->{desc} = "runtime saver";
3164 or die; 3814 write_runtime_sync
3165 3815 or warn "ERROR: unable to write runtime file: $!";
3166 $map->width (50);
3167 $map->height (50);
3168 $map->alloc;
3169 $map->_load_objects ("/tmp/x.map", 1);
3170 my $t = Event::time - $t;
3171
3172 #next unless $t < 0.0013;#d#
3173 if ($t < $min) {
3174 $min = $t;
3175 }
3176 $avg = $avg * 0.99 + $t * 0.01;
3177 }
3178 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3179 exit 0;
3180 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3181 }; 3816 };
3817 }
3182 3818
3183 $RUNTIME += $TICK;
3184 $NEXT_TICK += $TICK;
3185
3186 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3187 $NEXT_RUNTIME_WRITE = $NOW + 10;
3188 Coro::async_pool {
3189 write_runtime
3190 or warn "ERROR: unable to write runtime file: $!";
3191 };
3192 }
3193
3194# my $AFTER = Event::time;
3195# warn $AFTER - $NOW;#d#
3196
3197 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3819 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3198 $sig->send; 3820 $sig->send;
3199 } 3821 }
3200 while (my $sig = shift @WAIT_FOR_TICK) { 3822 while (my $sig = shift @WAIT_FOR_TICK) {
3201 $sig->send; 3823 $sig->send;
3202 } 3824 }
3203 3825
3204 $NOW = Event::time; 3826 $LOAD = ($NOW - $TICK_START) / $TICK;
3205
3206 # if we are delayed by four ticks or more, skip them all
3207 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3208
3209 $TICK_WATCHER->at ($NEXT_TICK);
3210 $TICK_WATCHER->start;
3211
3212 $LOAD = ($NOW - $tick_start) / $TICK;
3213 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3827 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3214 3828
3215 _post_tick; 3829 if (0) {
3216 3830 if ($NEXT_TICK) {
3217 3831 my $jitter = $TICK_START - $NEXT_TICK;
3832 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3833 warn "jitter $JITTER\n";#d#
3834 }
3218 }, 3835 }
3219); 3836}
3220 3837
3221{ 3838{
3222 BDB::max_poll_time $TICK * 0.1; 3839 # configure BDB
3223 $BDB_POLL_WATCHER = Event->io ( 3840
3224 reentrant => 0,
3225 fd => BDB::poll_fileno,
3226 poll => 'r',
3227 prio => 0,
3228 data => WF_AUTOCANCEL,
3229 cb => \&BDB::poll_cb,
3230 );
3231 BDB::min_parallel 8; 3841 BDB::min_parallel 8;
3232 3842 BDB::max_poll_reqs $TICK * 0.1;
3233 BDB::set_sync_prepare { 3843 $AnyEvent::BDB::WATCHER->priority (1);
3234 my $status;
3235 my $current = $Coro::current;
3236 (
3237 sub {
3238 $status = $!;
3239 $current->ready; undef $current;
3240 },
3241 sub {
3242 Coro::schedule while defined $current;
3243 $! = $status;
3244 },
3245 )
3246 };
3247 3844
3248 unless ($DB_ENV) { 3845 unless ($DB_ENV) {
3249 $DB_ENV = BDB::db_env_create; 3846 $DB_ENV = BDB::db_env_create;
3847 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3848 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3849 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3850 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3851 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3250 3852
3251 cf::sync_job { 3853 cf::sync_job {
3252 eval { 3854 eval {
3253 BDB::db_env_open 3855 BDB::db_env_open
3254 $DB_ENV, 3856 $DB_ENV,
3256 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3858 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3257 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3859 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3258 0666; 3860 0666;
3259 3861
3260 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3862 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3261
3262 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3263 $DB_ENV->set_lk_detect;
3264 }; 3863 };
3265 3864
3266 cf::cleanup "db_env_open(db): $@" if $@; 3865 cf::cleanup "db_env_open(db): $@" if $@;
3267 }; 3866 };
3268 } 3867 }
3868
3869 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3870 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3871 };
3872 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3873 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3874 };
3875 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3876 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3877 };
3269} 3878}
3270 3879
3271{ 3880{
3881 # configure IO::AIO
3882
3272 IO::AIO::min_parallel 8; 3883 IO::AIO::min_parallel 8;
3273
3274 undef $Coro::AIO::WATCHER;
3275 IO::AIO::max_poll_time $TICK * 0.1; 3884 IO::AIO::max_poll_time $TICK * 0.1;
3276 $AIO_POLL_WATCHER = Event->io ( 3885 undef $AnyEvent::AIO::WATCHER;
3277 reentrant => 0,
3278 data => WF_AUTOCANCEL,
3279 fd => IO::AIO::poll_fileno,
3280 poll => 'r',
3281 prio => 6,
3282 cb => \&IO::AIO::poll_cb,
3283 );
3284} 3886}
3285 3887
3286my $_log_backtrace; 3888my $_log_backtrace;
3287 3889
3288sub _log_backtrace { 3890sub _log_backtrace {
3292 3894
3293 # limit the # of concurrent backtraces 3895 # limit the # of concurrent backtraces
3294 if ($_log_backtrace < 2) { 3896 if ($_log_backtrace < 2) {
3295 ++$_log_backtrace; 3897 ++$_log_backtrace;
3296 async { 3898 async {
3899 $Coro::current->{desc} = "abt $msg";
3900
3297 my @bt = fork_call { 3901 my @bt = fork_call {
3298 @addr = map { sprintf "%x", $_ } @addr; 3902 @addr = map { sprintf "%x", $_ } @addr;
3299 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3903 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3300 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3904 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3301 or die "addr2line: $!"; 3905 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines