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.314 by root, Mon Jul 23 16:53:15 2007 UTC vs.
Revision 1.455 by root, Sat Sep 27 08:17:40 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
68
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
40Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 73Compress::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
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 74
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 76
51our %COMMAND = (); 77our %COMMAND = ();
52our %COMMAND_TIME = (); 78our %COMMAND_TIME = ();
55our %EXTCMD = (); 81our %EXTCMD = ();
56our %EXTICMD = (); 82our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 83our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 84our %EXT_MAP = (); # pluggable maps
59 85
60our $RELOAD; # number of reloads so far 86our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 87our @EVENT;
62 88
63our $CONFDIR = confdir; 89our $CONFDIR = confdir;
64our $DATADIR = datadir; 90our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 91our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 92our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 93our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 94our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 95our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 97our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 98our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 99our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime";
102
103our %RESOURCE;
74 104
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 105our $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 106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 107our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 108our $USE_FSYNC = 1; # use fsync to write maps - default off
82 109
110our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER;
83our $BDB_POLL_WATCHER; 112our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 113our $DB_ENV;
85 114
86our %CFG; 115our %CFG;
87 116
88our $UPTIME; $UPTIME ||= time; 117our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 118our $RUNTIME;
119our $NOW;
90 120
91our %PLAYER; # all users 121our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 122our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 123our $LINK_MAP; # the special {link} map, which is always available
94 124
95# used to convert map paths into valid unix filenames by replacing / by ∕ 125# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 126our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 127
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 128our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 129our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 131our $TICK_START; # for load detecting purposes
132
133our @POST_INIT;
101 134
102binmode STDOUT; 135binmode STDOUT;
103binmode STDERR; 136binmode STDERR;
104 137
105# read virtual server time, if available 138# read virtual server time, if available
106unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 139unless ($RUNTIME || !-e $RUNTIMEFILE) {
107 open my $fh, "<", "$LOCALDIR/runtime" 140 open my $fh, "<", $RUNTIMEFILE
108 or die "unable to read runtime file: $!"; 141 or die "unable to read $RUNTIMEFILE file: $!";
109 $RUNTIME = <$fh> + 0.; 142 $RUNTIME = <$fh> + 0.;
110} 143}
111 144
112mkdir $_ 145mkdir $_
113 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
158 191
159The raw value load value from the last tick. 192The raw value load value from the last tick.
160 193
161=item %cf::CFG 194=item %cf::CFG
162 195
163Configuration for the server, loaded from C</etc/crossfire/config>, or 196Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 197from wherever your confdir points to.
165 198
166=item cf::wait_for_tick, cf::wait_for_tick_begin 199=item cf::wait_for_tick, cf::wait_for_tick_begin
167 200
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 201These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
186 $msg .= "\n" 219 $msg .= "\n"
187 unless $msg =~ /\n$/; 220 unless $msg =~ /\n$/;
188 221
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 222 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 223
191 utf8::encode $msg;
192 LOG llevError, $msg; 224 LOG llevError, $msg;
193 }; 225 };
194} 226}
227
228$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "=="
230
231 if ($Coro::current == $Coro::main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d#
234 }#d#
235
236 # kill coroutine otherwise
237 warn Carp::longmess $_[0];
238 Coro::terminate
239};
240
241$SIG{__DIE__} = sub { }; #d#?
195 242
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
206for my $pkg (qw( 253for my $pkg (qw(
207 cf::global cf::attachable 254 cf::global cf::attachable
208 cf::object cf::object::player 255 cf::object cf::object::player
209 cf::client cf::player 256 cf::client cf::player
210 cf::arch cf::living 257 cf::arch cf::living
258 cf::map cf::mapspace
211 cf::map cf::party cf::region 259 cf::party cf::region
212)) { 260)) {
213 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 262}
216 263
217$Event::DIED = sub { 264$EV::DIED = sub {
218 warn "error in event callback: @_"; 265 warn "error in event callback: @_";
219}; 266};
220 267
221############################################################################# 268#############################################################################
222 269
245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 292 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246 $d 293 $d
247 } || "[unable to dump $_[0]: '$@']"; 294 } || "[unable to dump $_[0]: '$@']";
248} 295}
249 296
250=item $ref = cf::from_json $json 297=item $ref = cf::decode_json $json
251 298
252Converts a JSON string into the corresponding perl data structure. 299Converts a JSON string into the corresponding perl data structure.
253 300
254=item $json = cf::to_json $ref 301=item $json = cf::encode_json $ref
255 302
256Converts a perl data structure into its JSON representation. 303Converts a perl data structure into its JSON representation.
257 304
258=cut 305=cut
259 306
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 307our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 308
262sub to_json ($) { $json_coder->encode ($_[0]) } 309sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 310sub decode_json($) { $json_coder->decode ($_[0]) }
311
312=item cf::post_init { BLOCK }
313
314Execute the given codeblock, I<after> all extensions have been (re-)loaded,
315but I<before> the server starts ticking again.
316
317The cdoeblock will have a single boolean argument to indicate whether this
318is a reload or not.
319
320=cut
321
322sub post_init(&) {
323 push @POST_INIT, shift;
324}
264 325
265=item cf::lock_wait $string 326=item cf::lock_wait $string
266 327
267Wait until the given lock is available. See cf::lock_acquire. 328Wait until the given lock is available. See cf::lock_acquire.
268 329
271Wait until the given lock is available and then acquires it and returns 332Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 333a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 334for example when the coroutine gets canceled), the lock is automatically
274returned. 335returned.
275 336
337Locks are *not* recursive, locking from the same coro twice results in a
338deadlocked coro.
339
276Lock names should begin with a unique identifier (for example, cf::map::find 340Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 341uses map_find and cf::map::load uses map_load).
278 342
279=item $locked = cf::lock_active $string 343=item $locked = cf::lock_active $string
280 344
281Return true if the lock is currently active, i.e. somebody has locked it. 345Return true if the lock is currently active, i.e. somebody has locked it.
282 346
283=cut 347=cut
284 348
285our %LOCK; 349our %LOCK;
350our %LOCKER;#d#
286 351
287sub lock_wait($) { 352sub lock_wait($) {
288 my ($key) = @_; 353 my ($key) = @_;
289 354
355 if ($LOCKER{$key} == $Coro::current) {#d#
356 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
357 return;#d#
358 }#d#
359
290 # wait for lock, if any 360 # wait for lock, if any
291 while ($LOCK{$key}) { 361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
292 push @{ $LOCK{$key} }, $Coro::current; 363 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 364 Coro::schedule;
294 } 365 }
295} 366}
296 367
299 370
300 # wait, to be sure we are not locked 371 # wait, to be sure we are not locked
301 lock_wait $key; 372 lock_wait $key;
302 373
303 $LOCK{$key} = []; 374 $LOCK{$key} = [];
375 $LOCKER{$key} = $Coro::current;#d#
304 376
305 Coro::guard { 377 Coro::guard {
378 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 379 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 380 $_->ready for @{ delete $LOCK{$key} };
308 } 381 }
309} 382}
310 383
313 386
314 ! ! $LOCK{$key} 387 ! ! $LOCK{$key}
315} 388}
316 389
317sub freeze_mainloop { 390sub freeze_mainloop {
318 return unless $TICK_WATCHER->is_active; 391 tick_inhibit_inc;
319 392
320 my $guard = Coro::guard { 393 Coro::guard \&tick_inhibit_dec;
321 $TICK_WATCHER->start;
322 };
323 $TICK_WATCHER->stop;
324 $guard
325} 394}
326 395
396=item cf::periodic $interval, $cb
397
398Like EV::periodic, but randomly selects a starting point so that the actions
399get spread over timer.
400
401=cut
402
403sub periodic($$) {
404 my ($interval, $cb) = @_;
405
406 my $start = rand List::Util::min 180, $interval;
407
408 EV::periodic $start, $interval, 0, $cb
409}
410
327=item cf::get_slot $time[, $priority] 411=item cf::get_slot $time[, $priority[, $name]]
328 412
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 413Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds 414This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede. 415of cpu time till the next tick. The slot is only valid till the next cede.
332 416
417The optional C<$name> can be used to identify the job to run. It might be
418used for statistical purposes and should identify the same time-class.
419
333Useful for short background jobs. 420Useful for short background jobs.
334 421
335=cut 422=cut
336 423
337our @SLOT_QUEUE; 424our @SLOT_QUEUE;
338our $SLOT_QUEUE; 425our $SLOT_QUEUE;
339 426
340$SLOT_QUEUE->cancel if $SLOT_QUEUE; 427$SLOT_QUEUE->cancel if $SLOT_QUEUE;
341$SLOT_QUEUE = Coro::async { 428$SLOT_QUEUE = Coro::async {
429 $Coro::current->desc ("timeslot manager");
430
342 my $signal = new Coro::Signal; 431 my $signal = new Coro::Signal;
343 432
344 while () { 433 while () {
345 next_job: 434 next_job:
346 my $avail = cf::till_tick; 435 my $avail = cf::till_tick;
354 } 443 }
355 } 444 }
356 } 445 }
357 446
358 if (@SLOT_QUEUE) { 447 if (@SLOT_QUEUE) {
359 # we do not use wait_For_tick() as it returns immediately when tick is inactive 448 # we do not use wait_for_tick() as it returns immediately when tick is inactive
360 push @cf::WAIT_FOR_TICK, $signal; 449 push @cf::WAIT_FOR_TICK, $signal;
361 $signal->wait; 450 $signal->wait;
362 } else { 451 } else {
363 Coro::schedule; 452 Coro::schedule;
364 } 453 }
365 } 454 }
366}; 455};
367 456
368sub get_slot($;$) { 457sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main;
459
369 my ($time, $pri) = @_; 460 my ($time, $pri, $name) = @_;
370 461
462 $time = $TICK * .6 if $time > $TICK * .6;
463 my $sig = new Coro::Signal;
464
371 push @SLOT_QUEUE, [$time, $pri, my $sig = new Coro::Signal]; 465 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
372 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 466 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
373 $SLOT_QUEUE->ready; 467 $SLOT_QUEUE->ready;
374 $sig->wait; 468 $sig->wait;
375} 469}
376 470
384 478
385BEGIN { *async = \&Coro::async_pool } 479BEGIN { *async = \&Coro::async_pool }
386 480
387=item cf::sync_job { BLOCK } 481=item cf::sync_job { BLOCK }
388 482
389The design of Crossfire TRT requires that the main coroutine ($Coro::main) 483The design of Deliantra requires that the main coroutine ($Coro::main)
390is always able to handle events or runnable, as Crossfire TRT is only 484is always able to handle events or runnable, as Deliantra is only
391partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 485partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
392acceptable. 486acceptable.
393 487
394If it must be done, put the blocking parts into C<sync_job>. This will run 488If it must be done, put the blocking parts into C<sync_job>. This will run
395the given BLOCK in another coroutine while waiting for the result. The 489the given BLOCK in another coroutine while waiting for the result. The
400 494
401sub sync_job(&) { 495sub sync_job(&) {
402 my ($job) = @_; 496 my ($job) = @_;
403 497
404 if ($Coro::current == $Coro::main) { 498 if ($Coro::current == $Coro::main) {
405 my $time = Event::time; 499 my $time = EV::time;
406 500
407 # this is the main coro, too bad, we have to block 501 # this is the main coro, too bad, we have to block
408 # till the operation succeeds, freezing the server :/ 502 # till the operation succeeds, freezing the server :/
409 503
410 # TODO: use suspend/resume instead 504 LOG llevError, Carp::longmess "sync job";#d#
411 # (but this is cancel-safe) 505
412 my $freeze_guard = freeze_mainloop; 506 my $freeze_guard = freeze_mainloop;
413 507
414 my $busy = 1; 508 my $busy = 1;
415 my @res; 509 my @res;
416 510
417 (async { 511 (async {
512 $Coro::current->desc ("sync job coro");
418 @res = eval { $job->() }; 513 @res = eval { $job->() };
419 warn $@ if $@; 514 warn $@ if $@;
420 undef $busy; 515 undef $busy;
421 })->prio (Coro::PRIO_MAX); 516 })->prio (Coro::PRIO_MAX);
422 517
423 while ($busy) { 518 while ($busy) {
424 Coro::cede or Event::one_event; 519 if (Coro::nready) {
520 Coro::cede_notself;
521 } else {
522 EV::loop EV::LOOP_ONESHOT;
425 } 523 }
524 }
426 525
427 $time = Event::time - $time; 526 my $time = EV::time - $time;
428 527
429 LOG llevError | logBacktrace, Carp::longmess "long sync job"
430 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
431
432 $tick_start += $time; # do not account sync jobs to server load 528 $TICK_START += $time; # do not account sync jobs to server load
433 529
434 wantarray ? @res : $res[0] 530 wantarray ? @res : $res[0]
435 } else { 531 } else {
436 # we are in another coroutine, how wonderful, everything just works 532 # we are in another coroutine, how wonderful, everything just works
437 533
462=item fork_call { }, $args 558=item fork_call { }, $args
463 559
464Executes the given code block with the given arguments in a seperate 560Executes the given code block with the given arguments in a seperate
465process, returning the results. Everything must be serialisable with 561process, returning the results. Everything must be serialisable with
466Coro::Storable. May, of course, block. Note that the executed sub may 562Coro::Storable. May, of course, block. Note that the executed sub may
467never block itself or use any form of Event handling. 563never block itself or use any form of event handling.
468 564
469=cut 565=cut
470
471sub _store_scalar {
472 open my $fh, ">", \my $buf
473 or die "fork_call: cannot open fh-to-buf in child : $!";
474 Storable::store_fd $_[0], $fh;
475 close $fh;
476
477 $buf
478}
479 566
480sub fork_call(&@) { 567sub fork_call(&@) {
481 my ($cb, @args) = @_; 568 my ($cb, @args) = @_;
482 569
483# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 570 # we seemingly have to make a local copy of the whole thing,
484# or die "socketpair: $!"; 571 # otherwise perl prematurely frees the stuff :/
485 pipe my $fh1, my $fh2 572 # TODO: investigate and fix (likely this will be rather laborious)
486 or die "pipe: $!";
487 573
488 if (my $pid = fork) { 574 my @res = Coro::Util::fork_eval {
489 close $fh2;
490
491 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
492 warn "pst<$res>" unless $res =~ /^pst/;
493 $res = Coro::Storable::thaw $res;
494
495 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
496
497 Carp::confess $$res unless "ARRAY" eq ref $res;
498
499 return wantarray ? @$res : $res->[-1];
500 } else {
501 reset_signals; 575 reset_signals;
502 local $SIG{__WARN__}; 576 &$cb
503 local $SIG{__DIE__}; 577 }, @args;
504 # just in case, this hack effectively disables event
505 # in the child. cleaner and slower would be canceling all watchers,
506 # but this works for the time being.
507 local $Coro::idle;
508 $Coro::current->prio (Coro::PRIO_MAX);
509 578
510 eval { 579 wantarray ? @res : $res[-1]
511 close $fh1; 580}
512 581
513 my @res = eval { $cb->(@args) }; 582=item $coin = coin_from_name $name
514 583
515 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 584=cut
516 close $fh2;
517 };
518 585
519 warn $@ if $@; 586our %coin_alias = (
520 _exit 0; 587 "silver" => "silvercoin",
521 } 588 "silvercoin" => "silvercoin",
589 "silvercoins" => "silvercoin",
590 "gold" => "goldcoin",
591 "goldcoin" => "goldcoin",
592 "goldcoins" => "goldcoin",
593 "platinum" => "platinacoin",
594 "platinumcoin" => "platinacoin",
595 "platinumcoins" => "platinacoin",
596 "platina" => "platinacoin",
597 "platinacoin" => "platinacoin",
598 "platinacoins" => "platinacoin",
599 "royalty" => "royalty",
600 "royalties" => "royalty",
601);
602
603sub coin_from_name($) {
604 $coin_alias{$_[0]}
605 ? cf::arch::find $coin_alias{$_[0]}
606 : undef
522} 607}
523 608
524=item $value = cf::db_get $family => $key 609=item $value = cf::db_get $family => $key
525 610
526Returns a single value from the environment database. 611Returns a single value from the environment database.
528=item cf::db_put $family => $key => $value 613=item cf::db_put $family => $key => $value
529 614
530Stores the given C<$value> in the family. It can currently store binary 615Stores the given C<$value> in the family. It can currently store binary
531data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 616data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
532 617
618=item $db = cf::db_table "name"
619
620Create and/or open a new database table. The string must not be "db" and must be unique
621within each server.
622
533=cut 623=cut
624
625sub db_table($) {
626 my ($name) = @_;
627 my $db = BDB::db_create $DB_ENV;
628
629 eval {
630 $db->set_flags (BDB::CHKSUM);
631
632 utf8::encode $name;
633 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
634 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
635 cf::cleanup "db_open(db): $!" if $!;
636 };
637 cf::cleanup "db_open(db): $@" if $@;
638
639 $db
640}
534 641
535our $DB; 642our $DB;
536 643
537sub db_init { 644sub db_init {
538 unless ($DB) {
539 $DB = BDB::db_create $DB_ENV;
540
541 cf::sync_job { 645 cf::sync_job {
542 eval { 646 $DB ||= db_table "db";
543 $DB->set_flags (BDB::CHKSUM);
544
545 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
546 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
547 cf::cleanup "db_open(db): $!" if $!;
548 };
549 cf::cleanup "db_open(db): $@" if $@;
550 };
551 } 647 };
552} 648}
553 649
554sub db_get($$) { 650sub db_get($$) {
555 my $key = "$_[0]/$_[1]"; 651 my $key = "$_[0]/$_[1]";
556 652
606 if (1) { 702 if (1) {
607 $md5 = 703 $md5 =
608 join "\x00", 704 join "\x00",
609 $processversion, 705 $processversion,
610 map { 706 map {
611 Coro::cede; 707 cf::cede_to_tick;
612 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 708 ($src->[$_], Digest::MD5::md5_hex $data[$_])
613 } 0.. $#$src; 709 } 0.. $#$src;
614 710
615 711
616 my $dbmd5 = db_get cache => "$id/md5"; 712 my $dbmd5 = db_get cache => "$id/md5";
654 750
655############################################################################# 751#############################################################################
656 752
657=head2 ATTACHABLE OBJECTS 753=head2 ATTACHABLE OBJECTS
658 754
659Many objects in crossfire are so-called attachable objects. That means you can 755Many objects in deliantra are so-called attachable objects. That means you can
660attach callbacks/event handlers (a collection of which is called an "attachment") 756attach callbacks/event handlers (a collection of which is called an "attachment")
661to it. All such attachable objects support the following methods. 757to it. All such attachable objects support the following methods.
662 758
663In the following description, CLASS can be any of C<global>, C<object> 759In the following description, CLASS can be any of C<global>, C<object>
664C<player>, C<client> or C<map> (i.e. the attachable objects in 760C<player>, C<client> or C<map> (i.e. the attachable objects in
665Crossfire TRT). 761Deliantra).
666 762
667=over 4 763=over 4
668 764
669=item $attachable->attach ($attachment, key => $value...) 765=item $attachable->attach ($attachment, key => $value...)
670 766
714=item cf::CLASS::attachment $name, ... 810=item cf::CLASS::attachment $name, ...
715 811
716Register an attachment by C<$name> through which attachable objects of the 812Register an attachment by C<$name> through which attachable objects of the
717given CLASS can refer to this attachment. 813given CLASS can refer to this attachment.
718 814
719Some classes such as crossfire maps and objects can specify attachments 815Some classes such as deliantra maps and objects can specify attachments
720that are attached at load/instantiate time, thus the need for a name. 816that are attached at load/instantiate time, thus the need for a name.
721 817
722These calls expect any number of the following handler/hook descriptions: 818These calls expect any number of the following handler/hook descriptions:
723 819
724=over 4 820=over 4
952 } 1048 }
953 1049
954 0 1050 0
955} 1051}
956 1052
957=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1053=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
958 1054
959=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
960 1056
961Generate an object-specific event with the given arguments. 1057Generate an object-specific event with the given arguments.
962 1058
968 1064
969=cut 1065=cut
970 1066
971############################################################################# 1067#############################################################################
972# object support 1068# object support
973#
974 1069
1070sub _object_equal($$);
1071sub _object_equal($$) {
1072 my ($a, $b) = @_;
1073
1074 return 0 unless (ref $a) eq (ref $b);
1075
1076 if ("HASH" eq ref $a) {
1077 my @ka = keys %$a;
1078 my @kb = keys %$b;
1079
1080 return 0 if @ka != @kb;
1081
1082 for (0 .. $#ka) {
1083 return 0 unless $ka[$_] eq $kb[$_];
1084 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1085 }
1086
1087 } elsif ("ARRAY" eq ref $a) {
1088
1089 return 0 if @$a != @$b;
1090
1091 for (0 .. $#$a) {
1092 return 0 unless _object_equal $a->[$_], $b->[$_];
1093 }
1094
1095 } elsif ($a ne $b) {
1096 return 0;
1097 }
1098
1099 1
1100}
1101
1102our $SLOW_MERGES;#d#
975sub _can_merge { 1103sub _can_merge {
976 my ($ob1, $ob2) = @_; 1104 my ($ob1, $ob2) = @_;
977 1105
978 local $Storable::canonical = 1; 1106 ++$SLOW_MERGES;#d#
979 my $fob1 = Storable::freeze $ob1;
980 my $fob2 = Storable::freeze $ob2;
981 1107
982 $fob1 eq $fob2 1108 # we do the slow way here
1109 return _object_equal $ob1, $ob2
983} 1110}
984 1111
985sub reattach { 1112sub reattach {
986 # basically do the same as instantiate, without calling instantiate 1113 # basically do the same as instantiate, without calling instantiate
987 my ($obj) = @_; 1114 my ($obj) = @_;
988 1115
1116 # no longer needed after getting rid of delete_package?
989 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1117 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
990 1118
991 my $registry = $obj->registry; 1119 my $registry = $obj->registry;
992 1120
993 @$registry = (); 1121 @$registry = ();
994 1122
1009cf::attachable->attach ( 1137cf::attachable->attach (
1010 prio => -1000000, 1138 prio => -1000000,
1011 on_instantiate => sub { 1139 on_instantiate => sub {
1012 my ($obj, $data) = @_; 1140 my ($obj, $data) = @_;
1013 1141
1014 $data = from_json $data; 1142 $data = decode_json $data;
1015 1143
1016 for (@$data) { 1144 for (@$data) {
1017 my ($name, $args) = @$_; 1145 my ($name, $args) = @$_;
1018 1146
1019 $obj->attach ($name, %{$args || {} }); 1147 $obj->attach ($name, %{$args || {} });
1035sub object_freezer_save { 1163sub object_freezer_save {
1036 my ($filename, $rdata, $objs) = @_; 1164 my ($filename, $rdata, $objs) = @_;
1037 1165
1038 sync_job { 1166 sync_job {
1039 if (length $$rdata) { 1167 if (length $$rdata) {
1168 utf8::decode (my $decname = $filename);
1040 warn sprintf "saving %s (%d,%d)\n", 1169 warn sprintf "saving %s (%d,%d)\n",
1041 $filename, length $$rdata, scalar @$objs; 1170 $decname, length $$rdata, scalar @$objs;
1042 1171
1043 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1044 chmod SAVE_MODE, $fh; 1173 aio_chmod $fh, SAVE_MODE;
1045 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1046 aio_fsync $fh if $cf::USE_FSYNC; 1175 aio_fsync $fh if $cf::USE_FSYNC;
1047 close $fh; 1176 aio_close $fh;
1048 1177
1049 if (@$objs) { 1178 if (@$objs) {
1050 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1179 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1051 chmod SAVE_MODE, $fh; 1180 aio_chmod $fh, SAVE_MODE;
1052 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1053 aio_write $fh, 0, (length $data), $data, 0; 1182 aio_write $fh, 0, (length $data), $data, 0;
1054 aio_fsync $fh if $cf::USE_FSYNC; 1183 aio_fsync $fh if $cf::USE_FSYNC;
1055 close $fh; 1184 aio_close $fh;
1056 aio_rename "$filename.pst~", "$filename.pst"; 1185 aio_rename "$filename.pst~", "$filename.pst";
1057 } 1186 }
1058 } else { 1187 } else {
1059 aio_unlink "$filename.pst"; 1188 aio_unlink "$filename.pst";
1060 } 1189 }
1065 } 1194 }
1066 } else { 1195 } else {
1067 aio_unlink $filename; 1196 aio_unlink $filename;
1068 aio_unlink "$filename.pst"; 1197 aio_unlink "$filename.pst";
1069 } 1198 }
1070 } 1199 };
1071} 1200}
1072 1201
1073sub object_freezer_as_string { 1202sub object_freezer_as_string {
1074 my ($rdata, $objs) = @_; 1203 my ($rdata, $objs) = @_;
1075 1204
1087 or return; 1216 or return;
1088 1217
1089 unless (aio_stat "$filename.pst") { 1218 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1219 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1220 or return;
1221
1092 $av = eval { (Storable::thaw $av)->{objs} }; 1222 my $st = eval { Coro::Storable::thaw $av };
1223 $av = $st->{objs};
1093 } 1224 }
1094 1225
1226 utf8::decode (my $decname = $filename);
1095 warn sprintf "loading %s (%d)\n", 1227 warn sprintf "loading %s (%d,%d)\n",
1096 $filename, length $data, scalar @{$av || []}; 1228 $decname, length $data, scalar @{$av || []};
1229
1097 return ($data, $av); 1230 ($data, $av)
1098} 1231}
1099 1232
1100=head2 COMMAND CALLBACKS 1233=head2 COMMAND CALLBACKS
1101 1234
1102=over 4 1235=over 4
1175 my ($pl, $buf) = @_; 1308 my ($pl, $buf) = @_;
1176 1309
1177 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1310 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1178 1311
1179 if (ref $msg) { 1312 if (ref $msg) {
1313 my ($type, $reply, @payload) =
1314 "ARRAY" eq ref $msg
1315 ? @$msg
1316 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1317
1318 my @reply;
1319
1180 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1320 if (my $cb = $EXTCMD{$type}) {
1181 if (my %reply = $cb->($pl, $msg)) { 1321 @reply = $cb->($pl, @payload);
1182 $pl->ext_reply ($msg->{msgid}, %reply);
1183 }
1184 } 1322 }
1323
1324 $pl->ext_reply ($reply, @reply)
1325 if $reply;
1326
1185 } else { 1327 } else {
1186 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1328 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1187 } 1329 }
1188 1330
1189 cf::override; 1331 cf::override;
1216 1358
1217 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1359 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1218 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1360 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1219 1361
1220 $ext{source} = 1362 $ext{source} =
1221 "package $pkg; use strict; use utf8;\n" 1363 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1222 . "#line 1 \"$path\"\n{\n" 1364 . "#line 1 \"$path\"\n{\n"
1223 . $source 1365 . $source
1224 . "\n};\n1"; 1366 . "\n};\n1";
1225 1367
1226 $todo{$base} = \%ext; 1368 $todo{$base} = \%ext;
1242 my $msg = $@ ? "$v->{path}: $@\n" 1384 my $msg = $@ ? "$v->{path}: $@\n"
1243 : "$v->{base}: extension inactive.\n"; 1385 : "$v->{base}: extension inactive.\n";
1244 1386
1245 if (exists $v->{meta}{mandatory}) { 1387 if (exists $v->{meta}{mandatory}) {
1246 warn $msg; 1388 warn $msg;
1247 warn "mandatory extension failed to load, exiting.\n"; 1389 cf::cleanup "mandatory extension failed to load, exiting.";
1248 exit 1;
1249 } 1390 }
1250 1391
1251 warn $msg; 1392 warn $msg;
1252 } 1393 }
1253 1394
1267 1408
1268=back 1409=back
1269 1410
1270=head2 CORE EXTENSIONS 1411=head2 CORE EXTENSIONS
1271 1412
1272Functions and methods that extend core crossfire objects. 1413Functions and methods that extend core deliantra objects.
1273 1414
1274=cut 1415=cut
1275 1416
1276package cf::player; 1417package cf::player;
1277 1418
1278use Coro::AIO; 1419use Coro::AIO;
1279 1420
1280=head3 cf::player 1421=head3 cf::player
1281 1422
1282=over 4 1423=over 4
1424
1425=item cf::player::num_playing
1426
1427Returns the official number of playing players, as per the Crossfire metaserver rules.
1428
1429=cut
1430
1431sub num_playing {
1432 scalar grep
1433 $_->ob->map
1434 && !$_->hidden
1435 && !$_->ob->flag (cf::FLAG_WIZ),
1436 cf::player::list
1437}
1283 1438
1284=item cf::player::find $login 1439=item cf::player::find $login
1285 1440
1286Returns the given player object, loading it if necessary (might block). 1441Returns the given player object, loading it if necessary (might block).
1287 1442
1306 1461
1307sub exists($) { 1462sub exists($) {
1308 my ($login) = @_; 1463 my ($login) = @_;
1309 1464
1310 $cf::PLAYER{$login} 1465 $cf::PLAYER{$login}
1311 or cf::sync_job { !aio_stat path $login } 1466 or !aio_stat path $login
1312} 1467}
1313 1468
1314sub find($) { 1469sub find($) {
1315 return $cf::PLAYER{$_[0]} || do { 1470 return $cf::PLAYER{$_[0]} || do {
1316 my $login = $_[0]; 1471 my $login = $_[0];
1323 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1478 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1324 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1479 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1325 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1480 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1326 aio_unlink +(playerdir $login) . "/$login.pl"; 1481 aio_unlink +(playerdir $login) . "/$login.pl";
1327 1482
1328 my $pl = load_pl path $login 1483 my $f = new_from_file cf::object::thawer path $login
1329 or return; 1484 or return;
1485
1486 my $pl = cf::player::load_pl $f
1487 or return;
1488
1489 local $cf::PLAYER_LOADING{$login} = $pl;
1490 $f->resolve_delayed_derefs;
1330 $cf::PLAYER{$login} = $pl 1491 $cf::PLAYER{$login} = $pl
1331 } 1492 }
1332 } 1493 }
1333} 1494}
1334 1495
1343 return if $pl->{deny_save}; 1504 return if $pl->{deny_save};
1344 1505
1345 aio_mkdir playerdir $pl, 0770; 1506 aio_mkdir playerdir $pl, 0770;
1346 $pl->{last_save} = $cf::RUNTIME; 1507 $pl->{last_save} = $cf::RUNTIME;
1347 1508
1509 cf::get_slot 0.01;
1510
1348 $pl->save_pl ($path); 1511 $pl->save_pl ($path);
1349 Coro::cede; 1512 cf::cede_to_tick;
1350} 1513}
1351 1514
1352sub new($) { 1515sub new($) {
1353 my ($login) = @_; 1516 my ($login) = @_;
1354 1517
1360 $cf::PLAYER{$login} = $self; 1523 $cf::PLAYER{$login} = $self;
1361 1524
1362 $self 1525 $self
1363} 1526}
1364 1527
1528=item $player->send_msg ($channel, $msg, $color, [extra...])
1529
1530=cut
1531
1532sub send_msg {
1533 my $ns = shift->ns
1534 or return;
1535 $ns->send_msg (@_);
1536}
1537
1365=item $pl->quit_character 1538=item $pl->quit_character
1366 1539
1367Nukes the player without looking back. If logged in, the connection will 1540Nukes the player without looking back. If logged in, the connection will
1368be destroyed. May block for a long time. 1541be destroyed. May block for a long time.
1369 1542
1373 my ($pl) = @_; 1546 my ($pl) = @_;
1374 1547
1375 my $name = $pl->ob->name; 1548 my $name = $pl->ob->name;
1376 1549
1377 $pl->{deny_save} = 1; 1550 $pl->{deny_save} = 1;
1378 $pl->password ("*"); # this should lock out the player until we nuked the dir 1551 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1379 1552
1380 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1553 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1381 $pl->deactivate; 1554 $pl->deactivate;
1555 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1556 $pl->ob->check_score;
1382 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1557 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1383 $pl->ns->destroy if $pl->ns; 1558 $pl->ns->destroy if $pl->ns;
1384 1559
1385 my $path = playerdir $pl; 1560 my $path = playerdir $pl;
1386 my $temp = "$path~$cf::RUNTIME~deleting~"; 1561 my $temp = "$path~$cf::RUNTIME~deleting~";
1422 or return []; 1597 or return [];
1423 1598
1424 my @logins; 1599 my @logins;
1425 1600
1426 for my $login (@$dirs) { 1601 for my $login (@$dirs) {
1602 my $path = path $login;
1603
1604 # a .pst is a dead give-away for a valid player
1605 # if no pst file found, open and chekc for blocked users
1606 if (aio_stat "$path.pst") {
1427 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1607 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1428 aio_read $fh, 0, 512, my $buf, 0 or next; 1608 aio_read $fh, 0, 512, my $buf, 0 or next;
1429 $buf !~ /^password -------------$/m or next; # official not-valid tag 1609 $buf !~ /^password -------------$/m or next; # official not-valid tag
1610 }
1430 1611
1431 utf8::decode $login; 1612 utf8::decode $login;
1432 push @logins, $login; 1613 push @logins, $login;
1433 } 1614 }
1434 1615
1461 } 1642 }
1462 1643
1463 \@paths 1644 \@paths
1464} 1645}
1465 1646
1466=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1647=item $protocol_xml = $player->expand_cfpod ($cfpod)
1467 1648
1468Expand crossfire pod fragments into protocol xml. 1649Expand deliantra pod fragments into protocol xml.
1469 1650
1470=cut
1471
1472sub expand_cfpod {
1473 ((my $self), (local $_)) = @_;
1474
1475 # escape & and <
1476 s/&/&amp;/g;
1477 s/(?<![BIUGH])</&lt;/g;
1478
1479 # this is buggy, it needs to properly take care of nested <'s
1480
1481 1 while
1482 # replace B<>, I<>, U<> etc.
1483 s/B<([^\>]*)>/<b>$1<\/b>/
1484 || s/I<([^\>]*)>/<i>$1<\/i>/
1485 || s/U<([^\>]*)>/<u>$1<\/u>/
1486 # replace G<male|female> tags
1487 || s{G<([^>|]*)\|([^>]*)>}{
1488 $self->gender ? $2 : $1
1489 }ge
1490 # replace H<hint text>
1491 || s{H<([^\>]*)>}
1492 {
1493 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1494 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1495 "")
1496 [$self->{hintmode}]
1497 }ge;
1498
1499 # create single paragraphs (very hackish)
1500 s/(?<=\S)\n(?=\w)/ /g;
1501
1502 # compress some whitespace
1503 s/\s+\n/\n/g; # ws line-ends
1504 s/\n\n+/\n/g; # double lines
1505 s/^\n+//; # beginning lines
1506 s/\n+$//; # ending lines
1507
1508 $_
1509}
1510
1511sub hintmode {
1512 $_[0]{hintmode} = $_[1] if @_ > 1;
1513 $_[0]{hintmode}
1514}
1515
1516=item $player->ext_reply ($msgid, %msg) 1651=item $player->ext_reply ($msgid, @msg)
1517 1652
1518Sends an ext reply to the player. 1653Sends an ext reply to the player.
1519 1654
1520=cut 1655=cut
1521 1656
1522sub ext_reply($$%) { 1657sub ext_reply($$@) {
1523 my ($self, $id, %msg) = @_; 1658 my ($self, $id, @msg) = @_;
1524 1659
1525 $msg{msgid} = $id; 1660 $self->ns->ext_reply ($id, @msg)
1526 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1527} 1661}
1528 1662
1529=item $player->ext_event ($type, %msg) 1663=item $player->ext_msg ($type, @msg)
1530 1664
1531Sends an ext event to the client. 1665Sends an ext event to the client.
1532 1666
1533=cut 1667=cut
1534 1668
1535sub ext_event($$%) { 1669sub ext_msg($$@) {
1536 my ($self, $type, %msg) = @_; 1670 my ($self, $type, @msg) = @_;
1537 1671
1538 $self->ns->ext_event ($type, %msg); 1672 $self->ns->ext_msg ($type, @msg);
1539} 1673}
1540 1674
1541=head3 cf::region 1675=head3 cf::region
1542 1676
1543=over 4 1677=over 4
1587our $MAX_RESET = 3600; 1721our $MAX_RESET = 3600;
1588our $DEFAULT_RESET = 3000; 1722our $DEFAULT_RESET = 3000;
1589 1723
1590sub generate_random_map { 1724sub generate_random_map {
1591 my ($self, $rmp) = @_; 1725 my ($self, $rmp) = @_;
1726
1727 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1728
1592 # mit "rum" bekleckern, nicht 1729 # mit "rum" bekleckern, nicht
1593 $self->_create_random_map ( 1730 $self->_create_random_map (
1594 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1595 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1596 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1718 1855
1719# the temporary/swap location 1856# the temporary/swap location
1720sub save_path { 1857sub save_path {
1721 my ($self) = @_; 1858 my ($self) = @_;
1722 1859
1723 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1860 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1724 "$TMPDIR/$path.map" 1861 "$TMPDIR/$path.map"
1725} 1862}
1726 1863
1727# the unique path, undef == no special unique path 1864# the unique path, undef == no special unique path
1728sub uniq_path { 1865sub uniq_path {
1729 my ($self) = @_; 1866 my ($self) = @_;
1730 1867
1731 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1732 "$UNIQUEDIR/$path" 1869 "$UNIQUEDIR/$path"
1733} 1870}
1734 1871
1735# and all this just because we cannot iterate over 1872# and all this just because we cannot iterate over
1736# all maps in C++... 1873# all maps in C++...
1759 1896
1760sub load_header_from($) { 1897sub load_header_from($) {
1761 my ($self, $path) = @_; 1898 my ($self, $path) = @_;
1762 1899
1763 utf8::encode $path; 1900 utf8::encode $path;
1764 #aio_open $path, O_RDONLY, 0 1901 my $f = new_from_file cf::object::thawer $path
1765 # or return;
1766
1767 $self->_load_header ($path)
1768 or return; 1902 or return;
1903
1904 $self->_load_header ($f)
1905 or return;
1906
1907 local $MAP_LOADING{$self->{path}} = $self;
1908 $f->resolve_delayed_derefs;
1769 1909
1770 $self->{load_path} = $path; 1910 $self->{load_path} = $path;
1771 1911
1772 1 1912 1
1773} 1913}
1827sub find { 1967sub find {
1828 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
1829 1969
1830 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
1831 1971
1972 cf::lock_wait "map_data:$path";#d#remove
1832 cf::lock_wait "map_find:$path"; 1973 cf::lock_wait "map_find:$path";
1833 1974
1834 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1835 my $guard = cf::lock_acquire "map_find:$path"; 1977 my $guard2 = cf::lock_acquire "map_find:$path";
1978
1836 my $map = new_from_path cf::map $path 1979 my $map = new_from_path cf::map $path
1837 or return; 1980 or return;
1838 1981
1839 $map->{last_save} = $cf::RUNTIME; 1982 $map->{last_save} = $cf::RUNTIME;
1840 1983
1842 or return; 1985 or return;
1843 1986
1844 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1845 # doing this can freeze the server in a sync job, obviously 1988 # doing this can freeze the server in a sync job, obviously
1846 #$cf::WAIT_FOR_TICK->wait; 1989 #$cf::WAIT_FOR_TICK->wait;
1990 undef $guard2;
1991 undef $guard1;
1847 $map->reset; 1992 $map->reset;
1848 undef $guard;
1849 return find $path; 1993 return find $path;
1850 } 1994 }
1851 1995
1852 $cf::MAP{$path} = $map 1996 $cf::MAP{$path} = $map
1853 } 1997 }
1862 local $self->{deny_reset} = 1; # loading can take a long time 2006 local $self->{deny_reset} = 1; # loading can take a long time
1863 2007
1864 my $path = $self->{path}; 2008 my $path = $self->{path};
1865 2009
1866 { 2010 {
1867 my $guard = cf::lock_acquire "map_load:$path"; 2011 my $guard = cf::lock_acquire "map_data:$path";
1868 2012
2013 return unless $self->valid;
1869 return if $self->in_memory != cf::MAP_SWAPPED; 2014 return unless $self->in_memory == cf::MAP_SWAPPED;
1870 2015
1871 $self->in_memory (cf::MAP_LOADING); 2016 $self->in_memory (cf::MAP_LOADING);
1872 2017
1873 $self->alloc; 2018 $self->alloc;
1874 2019
1875 $self->pre_load; 2020 $self->pre_load;
1876 Coro::cede; 2021 cf::cede_to_tick;
1877 2022
2023 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block;
1878 $self->_load_objects ($self->{load_path}, 1) 2025 $self->_load_objects ($f)
1879 or return; 2026 or return;
1880 2027
1881 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2028 $self->post_load_original
1882 if delete $self->{load_original}; 2029 if delete $self->{load_original};
1883 2030
1884 if (my $uniq = $self->uniq_path) { 2031 if (my $uniq = $self->uniq_path) {
1885 utf8::encode $uniq; 2032 utf8::encode $uniq;
1886 if (aio_open $uniq, O_RDONLY, 0) { 2033 unless (aio_stat $uniq) {
2034 if (my $f = new_from_file cf::object::thawer $uniq) {
1887 $self->clear_unique_items; 2035 $self->clear_unique_items;
1888 $self->_load_objects ($uniq, 0); 2036 $self->_load_objects ($f);
2037 $f->resolve_delayed_derefs;
2038 }
1889 } 2039 }
1890 } 2040 }
1891 2041
1892 Coro::cede; 2042 $f->resolve_delayed_derefs;
2043
2044 cf::cede_to_tick;
1893 # now do the right thing for maps 2045 # now do the right thing for maps
1894 $self->link_multipart_objects; 2046 $self->link_multipart_objects;
1895 $self->difficulty ($self->estimate_difficulty) 2047 $self->difficulty ($self->estimate_difficulty)
1896 unless $self->difficulty; 2048 unless $self->difficulty;
1897 Coro::cede; 2049 cf::cede_to_tick;
1898 2050
1899 unless ($self->{deny_activate}) { 2051 unless ($self->{deny_activate}) {
1900 $self->decay_objects; 2052 $self->decay_objects;
1901 $self->fix_auto_apply; 2053 $self->fix_auto_apply;
1902 $self->update_buttons; 2054 $self->update_buttons;
1903 Coro::cede; 2055 cf::cede_to_tick;
1904 $self->set_darkness_map; 2056 $self->set_darkness_map;
1905 Coro::cede; 2057 cf::cede_to_tick;
1906 $self->activate; 2058 $self->activate;
1907 } 2059 }
1908 2060
2061 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME);
2063
1909 $self->in_memory (cf::MAP_IN_MEMORY); 2064 $self->in_memory (cf::MAP_ACTIVE);
1910 } 2065 }
1911 2066
1912 $self->post_load; 2067 $self->post_load;
1913} 2068}
1914 2069
1923 2078
1924 $self 2079 $self
1925} 2080}
1926 2081
1927# find and load all maps in the 3x3 area around a map 2082# find and load all maps in the 3x3 area around a map
1928sub load_diag { 2083sub load_neighbours {
1929 my ($map) = @_; 2084 my ($map) = @_;
1930 2085
1931 my @diag; # diagonal neighbours 2086 my @neigh; # diagonal neighbours
1932 2087
1933 for (0 .. 3) { 2088 for (0 .. 3) {
1934 my $neigh = $map->tile_path ($_) 2089 my $neigh = $map->tile_path ($_)
1935 or next; 2090 or next;
1936 $neigh = find $neigh, $map 2091 $neigh = find $neigh, $map
1937 or next; 2092 or next;
1938 $neigh->load; 2093 $neigh->load;
1939 2094
2095 push @neigh,
1940 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2096 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1941 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2097 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1942 } 2098 }
1943 2099
1944 for (@diag) { 2100 for (grep defined $_->[0], @neigh) {
2101 my ($path, $origin) = @$_;
1945 my $neigh = find @$_ 2102 my $neigh = find $path, $origin
1946 or next; 2103 or next;
1947 $neigh->load; 2104 $neigh->load;
1948 } 2105 }
1949} 2106}
1950 2107
1955} 2112}
1956 2113
1957sub do_load_sync { 2114sub do_load_sync {
1958 my ($map) = @_; 2115 my ($map) = @_;
1959 2116
2117 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2118 if $Coro::current == $Coro::main;
2119
1960 cf::sync_job { $map->load }; 2120 cf::sync_job { $map->load };
1961} 2121}
1962 2122
1963our %MAP_PREFETCH; 2123our %MAP_PREFETCH;
1964our $MAP_PREFETCHER = undef; 2124our $MAP_PREFETCHER = undef;
1965 2125
1966sub find_async { 2126sub find_async {
1967 my ($path, $origin) = @_; 2127 my ($path, $origin, $load) = @_;
1968 2128
1969 $path = normalise $path, $origin && $origin->{path}; 2129 $path = normalise $path, $origin && $origin->{path};
1970 2130
1971 if (my $map = $cf::MAP{$path}) { 2131 if (my $map = $cf::MAP{$path}) {
1972 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2132 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1973 } 2133 }
1974 2134
1975 undef $MAP_PREFETCH{$path}; 2135 $MAP_PREFETCH{$path} |= $load;
2136
1976 $MAP_PREFETCHER ||= cf::async { 2137 $MAP_PREFETCHER ||= cf::async {
2138 $Coro::current->{desc} = "map prefetcher";
2139
1977 while (%MAP_PREFETCH) { 2140 while (%MAP_PREFETCH) {
1978 for my $path (keys %MAP_PREFETCH) { 2141 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $path) { 2142 if (my $map = find $k) {
1980 $map->load; 2143 $map->load if $v;
1981 } 2144 }
1982 2145
1983 delete $MAP_PREFETCH{$path}; 2146 delete $MAP_PREFETCH{$k};
1984 } 2147 }
1985 } 2148 }
1986 undef $MAP_PREFETCHER; 2149 undef $MAP_PREFETCHER;
1987 }; 2150 };
1988 $MAP_PREFETCHER->prio (6); 2151 $MAP_PREFETCHER->prio (6);
1991} 2154}
1992 2155
1993sub save { 2156sub save {
1994 my ($self) = @_; 2157 my ($self) = @_;
1995 2158
1996 my $lock = cf::lock_acquire "map_data:" . $self->path; 2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
1997 2160
1998 $self->{last_save} = $cf::RUNTIME; 2161 $self->{last_save} = $cf::RUNTIME;
1999 2162
2000 return unless $self->dirty; 2163 return unless $self->dirty;
2001 2164
2007 return if $self->{deny_save}; 2170 return if $self->{deny_save};
2008 2171
2009 local $self->{last_access} = $self->last_access;#d# 2172 local $self->{last_access} = $self->last_access;#d#
2010 2173
2011 cf::async { 2174 cf::async {
2175 $Coro::current->{desc} = "map player save";
2012 $_->contr->save for $self->players; 2176 $_->contr->save for $self->players;
2013 }; 2177 };
2178
2179 cf::get_slot 0.02;
2014 2180
2015 if ($uniq) { 2181 if ($uniq) {
2016 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2182 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2017 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2183 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2018 } else { 2184 } else {
2024 my ($self) = @_; 2190 my ($self) = @_;
2025 2191
2026 # save first because save cedes 2192 # save first because save cedes
2027 $self->save; 2193 $self->save;
2028 2194
2029 my $lock = cf::lock_acquire "map_data:" . $self->path; 2195 my $lock = cf::lock_acquire "map_data:$self->{path}";
2030 2196
2031 return if $self->players; 2197 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2198 return if $self->in_memory != cf::MAP_ACTIVE;
2033 return if $self->{deny_save}; 2199 return if $self->{deny_save};
2034 2200
2201 $self->in_memory (cf::MAP_SWAPPED);
2202
2203 $self->deactivate;
2204 $_->clear_links_to ($self) for values %cf::MAP;
2035 $self->clear; 2205 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2206}
2038 2207
2039sub reset_at { 2208sub reset_at {
2040 my ($self) = @_; 2209 my ($self) = @_;
2041 2210
2073 if $uniq; 2242 if $uniq;
2074 } 2243 }
2075 2244
2076 delete $cf::MAP{$self->path}; 2245 delete $cf::MAP{$self->path};
2077 2246
2247 $self->deactivate;
2248 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2249 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2250
2082 $self->unlink_save; 2251 $self->unlink_save;
2083 $self->destroy; 2252 $self->destroy;
2084} 2253}
2085 2254
2086my $nuke_counter = "aaaa"; 2255my $nuke_counter = "aaaa";
2087 2256
2088sub nuke { 2257sub nuke {
2089 my ($self) = @_; 2258 my ($self) = @_;
2090 2259
2260 {
2261 my $lock = cf::lock_acquire "map_data:$self->{path}";
2262
2091 delete $cf::MAP{$self->path}; 2263 delete $cf::MAP{$self->path};
2092 2264
2093 $self->unlink_save; 2265 $self->unlink_save;
2094 2266
2095 bless $self, "cf::map"; 2267 bless $self, "cf::map";
2096 delete $self->{deny_reset}; 2268 delete $self->{deny_reset};
2097 $self->{deny_save} = 1; 2269 $self->{deny_save} = 1;
2098 $self->reset_timeout (1); 2270 $self->reset_timeout (1);
2099 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2271 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100 2272
2101 $cf::MAP{$self->path} = $self; 2273 $cf::MAP{$self->path} = $self;
2274 }
2102 2275
2103 $self->reset; # polite request, might not happen 2276 $self->reset; # polite request, might not happen
2104} 2277}
2105 2278
2106=item $maps = cf::map::tmp_maps 2279=item $maps = cf::map::tmp_maps
2148 2321
2149sub unique_maps() { 2322sub unique_maps() {
2150 [ 2323 [
2151 map { 2324 map {
2152 utf8::decode $_; 2325 utf8::decode $_;
2153 /\.map$/ 2326 s/\.map$//; # TODO future compatibility hack
2327 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2328 ? ()
2154 ? normalise $_ 2329 : normalise $_
2155 : ()
2156 } @{ aio_readdir $UNIQUEDIR or [] } 2330 } @{ aio_readdir $UNIQUEDIR or [] }
2157 ] 2331 ]
2158} 2332}
2159 2333
2160package cf;
2161
2162=back 2334=back
2163 2335
2164=head3 cf::object 2336=head3 cf::object
2165 2337
2166=cut 2338=cut
2169 2341
2170=over 4 2342=over 4
2171 2343
2172=item $ob->inv_recursive 2344=item $ob->inv_recursive
2173 2345
2174Returns the inventory of the object _and_ their inventories, recursively. 2346Returns the inventory of the object I<and> their inventories, recursively,
2347but I<not> the object itself.
2175 2348
2176=cut 2349=cut
2177 2350
2178sub inv_recursive_; 2351sub inv_recursive_;
2179sub inv_recursive_ { 2352sub inv_recursive_ {
2182 2355
2183sub inv_recursive { 2356sub inv_recursive {
2184 inv_recursive_ inv $_[0] 2357 inv_recursive_ inv $_[0]
2185} 2358}
2186 2359
2360=item $ref = $ob->ref
2361
2362Creates and returns a persistent reference to an object that can be stored as a string.
2363
2364=item $ob = cf::object::deref ($refstring)
2365
2366returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2367even if the object actually exists. May block.
2368
2369=cut
2370
2371sub deref {
2372 my ($ref) = @_;
2373
2374 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2375 my ($uuid, $name) = ($1, $2);
2376 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2377 or return;
2378 $pl->ob->uuid eq $uuid
2379 or return;
2380
2381 $pl->ob
2382 } else {
2383 warn "$ref: cannot resolve object reference\n";
2384 undef
2385 }
2386}
2387
2187package cf; 2388package cf;
2188 2389
2189=back 2390=back
2190 2391
2191=head3 cf::object::player 2392=head3 cf::object::player
2197Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2398Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2198can be C<undef>. Does the right thing when the player is currently in a 2399can be C<undef>. Does the right thing when the player is currently in a
2199dialogue with the given NPC character. 2400dialogue with the given NPC character.
2200 2401
2201=cut 2402=cut
2403
2404our $SAY_CHANNEL = {
2405 id => "say",
2406 title => "Map",
2407 reply => "say ",
2408 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2409};
2410
2411our $CHAT_CHANNEL = {
2412 id => "chat",
2413 title => "Chat",
2414 reply => "chat ",
2415 tooltip => "Player chat and shouts, global to the server.",
2416};
2202 2417
2203# rough implementation of a future "reply" method that works 2418# rough implementation of a future "reply" method that works
2204# with dialog boxes. 2419# with dialog boxes.
2205#TODO: the first argument must go, split into a $npc->reply_to ( method 2420#TODO: the first argument must go, split into a $npc->reply_to ( method
2206sub cf::object::player::reply($$$;$) { 2421sub cf::object::player::reply($$$;$) {
2213 2428
2214 } else { 2429 } else {
2215 my $pl = $self->contr; 2430 my $pl = $self->contr;
2216 2431
2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2432 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2218 my $diag = $pl->{npc_dialog}; 2433 my $dialog = $pl->{npc_dialog};
2219 $diag->{pl}->ext_reply ( 2434 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2220 $diag->{id},
2221 msgtype => "reply",
2222 msg => $diag->{pl}->expand_cfpod ($msg),
2223 add_topics => []
2224 );
2225 2435
2226 } else { 2436 } else {
2227 $msg = $npc->name . " says: $msg" if $npc; 2437 $msg = $npc->name . " says: $msg" if $npc;
2228 $self->message ($msg, $flags); 2438 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2229 } 2439 }
2230 } 2440 }
2441}
2442
2443=item $object->send_msg ($channel, $msg, $color, [extra...])
2444
2445=cut
2446
2447sub cf::object::send_msg {
2448 my $pl = shift->contr
2449 or return;
2450 $pl->send_msg (@_);
2231} 2451}
2232 2452
2233=item $player_object->may ("access") 2453=item $player_object->may ("access")
2234 2454
2235Returns wether the given player is authorized to access resource "access" 2455Returns wether the given player is authorized to access resource "access"
2248 2468
2249=item $player_object->enter_link 2469=item $player_object->enter_link
2250 2470
2251Freezes the player and moves him/her to a special map (C<{link}>). 2471Freezes the player and moves him/her to a special map (C<{link}>).
2252 2472
2253The player should be reasonably safe there for short amounts of time. You 2473The player should be reasonably safe there for short amounts of time (e.g.
2254I<MUST> call C<leave_link> as soon as possible, though. 2474for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2475though, as the palyer cannot control the character while it is on the link
2476map.
2255 2477
2256Will never block. 2478Will never block.
2257 2479
2258=item $player_object->leave_link ($map, $x, $y) 2480=item $player_object->leave_link ($map, $x, $y)
2259 2481
2314 # use -1 or undef as default coordinates, not 0, 0 2536 # use -1 or undef as default coordinates, not 0, 0
2315 ($x, $y) = ($map->enter_x, $map->enter_y) 2537 ($x, $y) = ($map->enter_x, $map->enter_y)
2316 if $x <=0 && $y <= 0; 2538 if $x <=0 && $y <= 0;
2317 2539
2318 $map->load; 2540 $map->load;
2319 $map->load_diag; 2541 $map->load_neighbours;
2320 2542
2321 return unless $self->contr->active; 2543 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2322 $self->activate_recursive; 2545 $self->activate_recursive;
2323 2546
2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2325 $self->enter_map ($map, $x, $y); 2548 $self->enter_map ($map, $x, $y);
2326} 2549}
2331her, loading and preparing them map, calling the provided $check callback 2554her, loading and preparing them map, calling the provided $check callback
2332that has to return the map if sucecssful, and then unfreezes the player on 2555that has to return the map if sucecssful, and then unfreezes the player on
2333the new (success) or old (failed) map position. In either case, $done will 2556the new (success) or old (failed) map position. In either case, $done will
2334be called at the end of this process. 2557be called at the end of this process.
2335 2558
2559Note that $check will be called with a potentially non-loaded map, so if
2560it needs a loaded map it has to call C<< ->load >>.
2561
2336=cut 2562=cut
2337 2563
2338our $GOTOGEN; 2564our $GOTOGEN;
2339 2565
2340sub cf::object::player::goto { 2566sub cf::object::player::goto {
2344 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2570 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2345 2571
2346 $self->enter_link; 2572 $self->enter_link;
2347 2573
2348 (async { 2574 (async {
2575 $Coro::current->{desc} = "player::goto $path $x $y";
2576
2577 # *tag paths override both path and x|y
2578 if ($path =~ /^\*(.*)$/) {
2579 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2580 my $ob = $obs[rand @obs];
2581
2582 # see if we actually can go there
2583 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2584 $ob = $obs[rand @obs];
2585 } else {
2586 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2587 }
2588 # else put us there anyways for now #d#
2589
2590 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2591 } else {
2592 ($path, $x, $y) = (undef, undef, undef);
2593 }
2594 }
2595
2349 my $map = eval { 2596 my $map = eval {
2350 my $map = cf::map::find $path; 2597 my $map = defined $path ? cf::map::find $path : undef;
2351 2598
2352 if ($map) { 2599 if ($map) {
2353 $map = $map->customise_for ($self); 2600 $map = $map->customise_for ($self);
2354 $map = $check->($map) if $check && $map; 2601 $map = $check->($map) if $check && $map;
2355 } else { 2602 } else {
2356 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2603 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2357 } 2604 }
2358 2605
2359 $map 2606 $map
2360 }; 2607 };
2361 2608
2397} 2644}
2398 2645
2399sub prepare_random_map { 2646sub prepare_random_map {
2400 my ($exit) = @_; 2647 my ($exit) = @_;
2401 2648
2402 my $guard = cf::lock_acquire "exit_prepare:$exit";
2403
2404 # all this does is basically replace the /! path by 2649 # all this does is basically replace the /! path by
2405 # a new random map path (?random/...) with a seed 2650 # a new random map path (?random/...) with a seed
2406 # that depends on the exit object 2651 # that depends on the exit object
2407 2652
2408 my $rmp = parse_random_map_params $exit->msg; 2653 my $rmp = parse_random_map_params $exit->msg;
2410 if ($exit->map) { 2655 if ($exit->map) {
2411 $rmp->{region} = $exit->region->name; 2656 $rmp->{region} = $exit->region->name;
2412 $rmp->{origin_map} = $exit->map->path; 2657 $rmp->{origin_map} = $exit->map->path;
2413 $rmp->{origin_x} = $exit->x; 2658 $rmp->{origin_x} = $exit->x;
2414 $rmp->{origin_y} = $exit->y; 2659 $rmp->{origin_y} = $exit->y;
2660
2661 $exit->map->touch;
2415 } 2662 }
2416 2663
2417 $rmp->{random_seed} ||= $exit->random_seed; 2664 $rmp->{random_seed} ||= $exit->random_seed;
2418 2665
2419 my $data = cf::to_json $rmp; 2666 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2420 my $md5 = Digest::MD5::md5_hex $data; 2667 my $md5 = Digest::MD5::md5_hex $data;
2421 my $meta = "$RANDOMDIR/$md5.meta"; 2668 my $meta = "$RANDOMDIR/$md5.meta";
2422 2669
2423 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2670 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2424 aio_write $fh, 0, (length $data), $data, 0; 2671 aio_write $fh, 0, (length $data), $data, 0;
2425 undef $fh; 2672 undef $fh;
2426 aio_rename "$meta~", $meta; 2673 aio_rename "$meta~", $meta;
2427 2674
2675 my $slaying = "?random/$md5";
2676
2677 if ($exit->valid) {
2428 $exit->slaying ("?random/$md5"); 2678 $exit->slaying ("?random/$md5");
2429 $exit->msg (undef); 2679 $exit->msg (undef);
2680 }
2430 } 2681 }
2431} 2682}
2432 2683
2433sub cf::object::player::enter_exit { 2684sub cf::object::player::enter_exit {
2434 my ($self, $exit) = @_; 2685 my ($self, $exit) = @_;
2435 2686
2436 return unless $self->type == cf::PLAYER; 2687 return unless $self->type == cf::PLAYER;
2437 2688
2438 if ($exit->slaying eq "/!") {
2439 #TODO: this should de-fi-ni-te-ly not be a sync-job
2440 # the problem is that $exit might not survive long enough
2441 # so it needs to be done right now, right here
2442 cf::sync_job { prepare_random_map $exit };
2443 }
2444
2445 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2446 my $hp = $exit->stats->hp;
2447 my $sp = $exit->stats->sp;
2448
2449 $self->enter_link; 2689 $self->enter_link;
2450 2690
2451 # if exit is damned, update players death & WoR home-position
2452 $self->contr->savebed ($slaying, $hp, $sp)
2453 if $exit->flag (FLAG_DAMNED);
2454
2455 (async { 2691 (async {
2456 $self->deactivate_recursive; # just to be sure 2692 $Coro::current->{desc} = "enter_exit";
2693
2457 unless (eval { 2694 unless (eval {
2695 $self->deactivate_recursive; # just to be sure
2696
2697 # random map handling
2698 {
2699 my $guard = cf::lock_acquire "exit_prepare:$exit";
2700
2701 prepare_random_map $exit
2702 if $exit->slaying eq "/!";
2703 }
2704
2705 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2706 my $x = $exit->stats->hp;
2707 my $y = $exit->stats->sp;
2708
2458 $self->goto ($slaying, $hp, $sp); 2709 $self->goto ($map, $x, $y);
2459 2710
2711 # if exit is damned, update players death & WoR home-position
2712 $self->contr->savebed ($map, $x, $y)
2713 if $exit->flag (cf::FLAG_DAMNED);
2714
2460 1; 2715 1
2461 }) { 2716 }) {
2462 $self->message ("Something went wrong deep within the crossfire server. " 2717 $self->message ("Something went wrong deep within the deliantra server. "
2463 . "I'll try to bring you back to the map you were before. " 2718 . "I'll try to bring you back to the map you were before. "
2464 . "Please report this to the dungeon master!", 2719 . "Please report this to the dungeon master!",
2465 cf::NDI_UNIQUE | cf::NDI_RED); 2720 cf::NDI_UNIQUE | cf::NDI_RED);
2466 2721
2467 warn "ERROR in enter_exit: $@"; 2722 warn "ERROR in enter_exit: $@";
2495the message, with C<log> being the default. If C<$color> is negative, suppress 2750the message, with C<log> being the default. If C<$color> is negative, suppress
2496the message unless the client supports the msg packet. 2751the message unless the client supports the msg packet.
2497 2752
2498=cut 2753=cut
2499 2754
2755# non-persistent channels (usually the info channel)
2756our %CHANNEL = (
2757 "c/identify" => {
2758 id => "infobox",
2759 title => "Identify",
2760 reply => undef,
2761 tooltip => "Items recently identified",
2762 },
2763 "c/examine" => {
2764 id => "infobox",
2765 title => "Examine",
2766 reply => undef,
2767 tooltip => "Signs and other items you examined",
2768 },
2769 "c/book" => {
2770 id => "infobox",
2771 title => "Book",
2772 reply => undef,
2773 tooltip => "The contents of a note or book",
2774 },
2775 "c/lookat" => {
2776 id => "infobox",
2777 title => "Look",
2778 reply => undef,
2779 tooltip => "What you saw there",
2780 },
2781 "c/who" => {
2782 id => "infobox",
2783 title => "Players",
2784 reply => undef,
2785 tooltip => "Shows players who are currently online",
2786 },
2787 "c/body" => {
2788 id => "infobox",
2789 title => "Body Parts",
2790 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available",
2792 },
2793 "c/skills" => {
2794 id => "infobox",
2795 title => "Skills",
2796 reply => undef,
2797 tooltip => "Shows your experience per skill and item power",
2798 },
2799 "c/uptime" => {
2800 id => "infobox",
2801 title => "Uptime",
2802 reply => undef,
2803 tooltip => "How long the server has been running since last restart",
2804 },
2805 "c/mapinfo" => {
2806 id => "infobox",
2807 title => "Map Info",
2808 reply => undef,
2809 tooltip => "Information related to the maps",
2810 },
2811 "c/party" => {
2812 id => "party",
2813 title => "Party",
2814 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party",
2816 },
2817);
2818
2500sub cf::client::send_msg { 2819sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_; 2820 my ($self, $channel, $msg, $color, @extra) = @_;
2502 2821
2503 $msg = $self->pl->expand_cfpod ($msg); 2822 $msg = $self->pl->expand_cfpod ($msg)
2823 unless $color & cf::NDI_VERBATIM;
2504 2824
2505 $color &= ~cf::NDI_UNIQUE; # just in case... 2825 $color &= cf::NDI_CLIENT_MASK; # just in case...
2506 2826
2827 # check predefined channels, for the benefit of C
2828 if ($CHANNEL{$channel}) {
2829 $channel = $CHANNEL{$channel};
2830
2831 $self->ext_msg (channel_info => $channel)
2832 if $self->can_msg;
2833
2834 $channel = $channel->{id};
2835
2507 if (ref $channel) { 2836 } elsif (ref $channel) {
2508 # send meta info to client, if not yet sent 2837 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) { 2838 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel; 2839 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_event (channel_info => %$channel); 2840 $self->ext_msg (channel_info => $channel)
2841 if $self->can_msg;
2512 } 2842 }
2513 2843
2514 $channel = $channel->{id}; 2844 $channel = $channel->{id};
2515 } 2845 }
2516 2846
2517 return unless @extra || length $msg; 2847 return unless @extra || length $msg;
2518 2848
2519 if ($self->can_msg) { 2849 if ($self->can_msg) {
2520 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2850 # default colour, mask it out
2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2852 if $color & cf::NDI_DEF;
2853
2854 my $pkt = "msg "
2855 . $self->{json_coder}->encode (
2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 );
2858
2859 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf};
2862
2863 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag";
2867 }
2868
2869 $self->send_packet ($pkt);
2521 } else { 2870 } else {
2522 # replace some tags by gcfclient-compatible ones
2523 for ($msg) {
2524 1 while
2525 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2526 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2527 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2528 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2529 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2530 }
2531
2532 if ($color >= 0) { 2871 if ($color >= 0) {
2872 # replace some tags by gcfclient-compatible ones
2873 for ($msg) {
2874 1 while
2875 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2876 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2877 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2878 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2879 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2880 }
2881
2882 $color &= cf::NDI_COLOR_MASK;
2883
2884 utf8::encode $msg;
2885
2533 if (0 && $msg =~ /\[/) { 2886 if (0 && $msg =~ /\[/) {
2887 # COMMAND/INFO
2534 $self->send_packet ("drawextinfo $color 4 0 $msg") 2888 $self->send_packet ("drawextinfo $color 10 8 $msg")
2535 } else { 2889 } else {
2536 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2890 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2537 $self->send_packet ("drawinfo $color $msg") 2891 $self->send_packet ("drawinfo $color $msg")
2538 } 2892 }
2539 } 2893 }
2540 } 2894 }
2541} 2895}
2542 2896
2543=item $client->ext_event ($type, %msg) 2897=item $client->ext_msg ($type, @msg)
2544 2898
2545Sends an ext event to the client. 2899Sends an ext event to the client.
2546 2900
2547=cut 2901=cut
2548 2902
2549sub cf::client::ext_event($$%) { 2903sub cf::client::ext_msg($$@) {
2550 my ($self, $type, %msg) = @_; 2904 my ($self, $type, @msg) = @_;
2551 2905
2552 return unless $self->extcmd; 2906 if ($self->extcmd == 2) {
2553 2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove
2554 $msg{msgtype} = "event_$type"; 2909 push @msg, msgtype => "event_$type";
2555 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 }
2912}
2913
2914=item $client->ext_reply ($msgid, @msg)
2915
2916Sends an ext reply to the client.
2917
2918=cut
2919
2920sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_;
2922
2923 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 }
2556} 2930}
2557 2931
2558=item $success = $client->query ($flags, "text", \&cb) 2932=item $success = $client->query ($flags, "text", \&cb)
2559 2933
2560Queues a query to the client, calling the given callback with 2934Queues a query to the client, calling the given callback with
2615 my ($ns, $buf) = @_; 2989 my ($ns, $buf) = @_;
2616 2990
2617 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2991 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2618 2992
2619 if (ref $msg) { 2993 if (ref $msg) {
2994 my ($type, $reply, @payload) =
2995 "ARRAY" eq ref $msg
2996 ? @$msg
2997 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2998
2999 my @reply;
3000
2620 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3001 if (my $cb = $EXTICMD{$type}) {
2621 if (my %reply = $cb->($ns, $msg)) { 3002 @reply = $cb->($ns, @payload);
2622 $reply{msgid} = $msg->{msgid};
2623 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2624 }
2625 } 3003 }
3004
3005 $ns->ext_reply ($reply, @reply)
3006 if $reply;
3007
2626 } else { 3008 } else {
2627 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3009 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2628 } 3010 }
2629 3011
2630 cf::override; 3012 cf::override;
2677our $safe = new Safe "safe"; 3059our $safe = new Safe "safe";
2678our $safe_hole = new Safe::Hole; 3060our $safe_hole = new Safe::Hole;
2679 3061
2680$SIG{FPE} = 'IGNORE'; 3062$SIG{FPE} = 'IGNORE';
2681 3063
2682$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3064$safe->permit_only (Opcode::opset qw(
3065 :base_core :base_mem :base_orig :base_math
3066 grepstart grepwhile mapstart mapwhile
3067 sort time
3068));
2683 3069
2684# here we export the classes and methods available to script code 3070# here we export the classes and methods available to script code
2685 3071
2686=pod 3072=pod
2687 3073
2688The following functions and methods are available within a safe environment: 3074The following functions and methods are available within a safe environment:
2689 3075
2690 cf::object 3076 cf::object
2691 contr pay_amount pay_player map x y force_find force_add 3077 contr pay_amount pay_player map x y force_find force_add destroy
2692 insert remove 3078 insert remove name archname title slaying race decrease split
2693 3079
2694 cf::object::player 3080 cf::object::player
2695 player 3081 player
2696 3082
2697 cf::player 3083 cf::player
2702 3088
2703=cut 3089=cut
2704 3090
2705for ( 3091for (
2706 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3092 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2707 insert remove)], 3093 insert remove inv nrof name archname title slaying race
3094 decrease split destroy change_exp)],
2708 ["cf::object::player" => qw(player)], 3095 ["cf::object::player" => qw(player)],
2709 ["cf::player" => qw(peaceful)], 3096 ["cf::player" => qw(peaceful)],
2710 ["cf::map" => qw(trigger)], 3097 ["cf::map" => qw(trigger)],
2711) { 3098) {
2712 no strict 'refs'; 3099 no strict 'refs';
2788# the server's init and main functions 3175# the server's init and main functions
2789 3176
2790sub load_facedata($) { 3177sub load_facedata($) {
2791 my ($path) = @_; 3178 my ($path) = @_;
2792 3179
3180 # HACK to clear player env face cache, we need some signal framework
3181 # for this (global event?)
3182 %ext::player_env::MUSIC_FACE_CACHE = ();
3183
3184 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3185
2793 warn "loading facedata from $path\n"; 3186 warn "loading facedata from $path\n";
2794 3187
2795 my $facedata; 3188 my $facedata;
2796 0 < aio_load $path, $facedata 3189 0 < aio_load $path, $facedata
2797 or die "$path: $!"; 3190 or die "$path: $!";
2799 $facedata = Coro::Storable::thaw $facedata; 3192 $facedata = Coro::Storable::thaw $facedata;
2800 3193
2801 $facedata->{version} == 2 3194 $facedata->{version} == 2
2802 or cf::cleanup "$path: version mismatch, cannot proceed."; 3195 or cf::cleanup "$path: version mismatch, cannot proceed.";
2803 3196
3197 # patch in the exptable
3198 $facedata->{resource}{"res/exp_table"} = {
3199 type => FT_RSRC,
3200 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3201 };
3202 cf::cede_to_tick;
3203
2804 { 3204 {
2805 my $faces = $facedata->{faceinfo}; 3205 my $faces = $facedata->{faceinfo};
2806 3206
2807 while (my ($face, $info) = each %$faces) { 3207 while (my ($face, $info) = each %$faces) {
2808 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3208 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3209
2809 cf::face::set_visibility $idx, $info->{visibility}; 3210 cf::face::set_visibility $idx, $info->{visibility};
2810 cf::face::set_magicmap $idx, $info->{magicmap}; 3211 cf::face::set_magicmap $idx, $info->{magicmap};
2811 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3212 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2812 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3213 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2813 3214
2814 cf::cede_to_tick; 3215 cf::cede_to_tick;
2815 } 3216 }
2816 3217
2817 while (my ($face, $info) = each %$faces) { 3218 while (my ($face, $info) = each %$faces) {
2818 next unless $info->{smooth}; 3219 next unless $info->{smooth};
3220
2819 my $idx = cf::face::find $face 3221 my $idx = cf::face::find $face
2820 or next; 3222 or next;
3223
2821 if (my $smooth = cf::face::find $info->{smooth}) { 3224 if (my $smooth = cf::face::find $info->{smooth}) {
2822 cf::face::set_smooth $idx, $smooth; 3225 cf::face::set_smooth $idx, $smooth;
2823 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3226 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2824 } else { 3227 } else {
2825 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3228 warn "smooth face '$info->{smooth}' not found for face '$face'";
2842 3245
2843 { 3246 {
2844 # TODO: for gcfclient pleasure, we should give resources 3247 # TODO: for gcfclient pleasure, we should give resources
2845 # that gcfclient doesn't grok a >10000 face index. 3248 # that gcfclient doesn't grok a >10000 face index.
2846 my $res = $facedata->{resource}; 3249 my $res = $facedata->{resource};
2847 my $enc = JSON::XS->new->utf8->canonical;
2848 3250
2849 while (my ($name, $info) = each %$res) { 3251 while (my ($name, $info) = each %$res) {
2850 my $meta = $enc->encode ({ 3252 if (defined $info->{type}) {
2851 name => $name,
2852 type => $info->{type},
2853 copyright => $info->{copyright}, #TODO#
2854 });
2855
2856 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3253 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3254 my $data;
2857 3255
2858 if ($name =~ /\.jpg$/) { 3256 if ($info->{type} & 1) {
2859 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3257 # prepend meta info
2860 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3258
3259 my $meta = $enc->encode ({
3260 name => $name,
3261 %{ $info->{meta} || {} },
3262 });
3263
3264 $data = pack "(w/a*)*", $meta, $info->{data};
3265 } else {
3266 $data = $info->{data};
3267 }
3268
3269 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3270 cf::face::set_type $idx, $info->{type};
2861 } else { 3271 } else {
2862 my $data = pack "(w/a*)*", $meta, $info->{data}; 3272 $RESOURCE{$name} = $info;
2863 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2864
2865 cf::face::set_type $idx, 1;
2866 cf::face::set_data $idx, 0, $data, $chk;
2867 } 3273 }
2868 3274
2869 cf::cede_to_tick; 3275 cf::cede_to_tick;
2870 } 3276 }
2871 } 3277 }
2872 3278
3279 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3280
2873 1 3281 1
2874} 3282}
2875 3283
3284cf::global->attach (on_resource_update => sub {
3285 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3286 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3287
3288 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3289 my $sound = $soundconf->{compat}[$_]
3290 or next;
3291
3292 my $face = cf::face::find "sound/$sound->[1]";
3293 cf::sound::set $sound->[0] => $face;
3294 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3295 }
3296
3297 while (my ($k, $v) = each %{$soundconf->{event}}) {
3298 my $face = cf::face::find "sound/$v";
3299 cf::sound::set $k => $face;
3300 }
3301 }
3302});
3303
3304register_exticmd fx_want => sub {
3305 my ($ns, $want) = @_;
3306
3307 while (my ($k, $v) = each %$want) {
3308 $ns->fx_want ($k, $v);
3309 }
3310};
3311
3312sub load_resource_file($) {
3313 my $guard = lock_acquire "load_resource_file";
3314
3315 my $status = load_resource_file_ $_[0];
3316 get_slot 0.1, 100;
3317 cf::arch::commit_load;
3318
3319 $status
3320}
3321
2876sub reload_regions { 3322sub reload_regions {
3323 # HACK to clear player env face cache, we need some signal framework
3324 # for this (global event?)
3325 %ext::player_env::MUSIC_FACE_CACHE = ();
3326
2877 load_resource_file "$MAPDIR/regions" 3327 load_resource_file "$MAPDIR/regions"
2878 or die "unable to load regions file\n"; 3328 or die "unable to load regions file\n";
2879 3329
2880 for (cf::region::list) { 3330 for (cf::region::list) {
2881 $_->{match} = qr/$_->{match}/ 3331 $_->{match} = qr/$_->{match}/
2889} 3339}
2890 3340
2891sub reload_archetypes { 3341sub reload_archetypes {
2892 load_resource_file "$DATADIR/archetypes" 3342 load_resource_file "$DATADIR/archetypes"
2893 or die "unable to load archetypes\n"; 3343 or die "unable to load archetypes\n";
2894 #d# NEED to laod twice to resolve forward references
2895 # this really needs to be done in an extra post-pass
2896 # (which needs to be synchronous, so solve it differently)
2897 load_resource_file "$DATADIR/archetypes"
2898 or die "unable to load archetypes\n";
2899} 3344}
2900 3345
2901sub reload_treasures { 3346sub reload_treasures {
2902 load_resource_file "$DATADIR/treasures" 3347 load_resource_file "$DATADIR/treasures"
2903 or die "unable to load treasurelists\n"; 3348 or die "unable to load treasurelists\n";
2904} 3349}
2905 3350
2906sub reload_resources { 3351sub reload_resources {
2907 warn "reloading resource files...\n"; 3352 warn "reloading resource files...\n";
2908 3353
3354 reload_facedata;
3355 reload_archetypes;
2909 reload_regions; 3356 reload_regions;
2910 reload_facedata;
2911 #reload_archetypes;#d#
2912 reload_archetypes;
2913 reload_treasures; 3357 reload_treasures;
2914 3358
2915 warn "finished reloading resource files\n"; 3359 warn "finished reloading resource files\n";
2916} 3360}
2917 3361
2918sub init { 3362sub reload_config {
2919 reload_resources;
2920}
2921
2922sub cfg_load {
2923 open my $fh, "<:utf8", "$CONFDIR/config" 3363 open my $fh, "<:utf8", "$CONFDIR/config"
2924 or return; 3364 or return;
2925 3365
2926 local $/; 3366 local $/;
2927 *CFG = YAML::Syck::Load <$fh>; 3367 *CFG = YAML::Load <$fh>;
2928 3368
2929 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3369 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2930 3370
2931 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3371 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2932 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3372 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2938 }; 3378 };
2939 warn $@ if $@; 3379 warn $@ if $@;
2940 } 3380 }
2941} 3381}
2942 3382
3383sub pidfile() {
3384 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3385 or die "$PIDFILE: $!";
3386 flock $fh, &Fcntl::LOCK_EX
3387 or die "$PIDFILE: flock: $!";
3388 $fh
3389}
3390
3391# make sure only one server instance is running at any one time
3392sub atomic {
3393 my $fh = pidfile;
3394
3395 my $pid = <$fh>;
3396 kill 9, $pid if $pid > 0;
3397
3398 seek $fh, 0, 0;
3399 print $fh $$;
3400}
3401
2943sub main { 3402sub main {
3403 cf::init_globals; # initialise logging
3404
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3407 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3408 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3409
3410 cf::init_experience;
3411 cf::init_anim;
3412 cf::init_attackmess;
3413 cf::init_dynamic;
3414 cf::init_block;
3415
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417
2944 # we must not ever block the main coroutine 3418 # we must not ever block the main coroutine
2945 local $Coro::idle = sub { 3419 local $Coro::idle = sub {
2946 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3420 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2947 (async { 3421 (async {
2948 Event::one_event; 3422 $Coro::current->{desc} = "IDLE BUG HANDLER";
3423 EV::loop EV::LOOP_ONESHOT;
2949 })->prio (Coro::PRIO_MAX); 3424 })->prio (Coro::PRIO_MAX);
2950 }; 3425 };
2951 3426
2952 cfg_load; 3427 evthread_start IO::AIO::poll_fileno;
3428
3429 cf::sync_job {
3430 reload_resources;
3431 reload_config;
2953 db_init; 3432 db_init;
3433
3434 cf::load_settings;
3435 cf::load_materials;
3436 cf::init_uuid;
3437 cf::init_signals;
3438 cf::init_commands;
3439 cf::init_skills;
3440
3441 cf::init_beforeplay;
3442
3443 atomic;
3444
2954 load_extensions; 3445 load_extensions;
2955 3446
2956 $TICK_WATCHER->start; 3447 utime time, time, $RUNTIMEFILE;
3448
3449 # no (long-running) fork's whatsoever before this point(!)
3450 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3451
3452 (pop @POST_INIT)->(0) while @POST_INIT;
3453 };
3454
2957 Event::loop; 3455 EV::loop;
2958} 3456}
2959 3457
2960############################################################################# 3458#############################################################################
2961# initialisation and cleanup 3459# initialisation and cleanup
2962 3460
2963# install some emergency cleanup handlers 3461# install some emergency cleanup handlers
2964BEGIN { 3462BEGIN {
3463 our %SIGWATCHER = ();
2965 for my $signal (qw(INT HUP TERM)) { 3464 for my $signal (qw(INT HUP TERM)) {
2966 Event->signal ( 3465 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2967 reentrant => 0,
2968 data => WF_AUTOCANCEL,
2969 signal => $signal,
2970 prio => 0,
2971 cb => sub {
2972 cf::cleanup "SIG$signal"; 3466 cf::cleanup "SIG$signal";
2973 },
2974 ); 3467 };
2975 } 3468 }
2976} 3469}
2977 3470
2978sub write_runtime { 3471sub write_runtime_sync {
2979 my $runtime = "$LOCALDIR/runtime";
2980
2981 # first touch the runtime file to show we are still running: 3472 # first touch the runtime file to show we are still running:
2982 # the fsync below can take a very very long time. 3473 # the fsync below can take a very very long time.
2983 3474
2984 IO::AIO::aio_utime $runtime, undef, undef; 3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2985 3476
2986 my $guard = cf::lock_acquire "write_runtime"; 3477 my $guard = cf::lock_acquire "write_runtime";
2987 3478
2988 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2989 or return; 3480 or return;
2990 3481
2991 my $value = $cf::RUNTIME + 90 + 10; 3482 my $value = $cf::RUNTIME + 90 + 10;
2992 # 10 is the runtime save interval, for a monotonic clock 3483 # 10 is the runtime save interval, for a monotonic clock
2993 # 60 allows for the watchdog to kill the server. 3484 # 60 allows for the watchdog to kill the server.
3003 aio_utime $fh, undef, undef; 3494 aio_utime $fh, undef, undef;
3004 3495
3005 close $fh 3496 close $fh
3006 or return; 3497 or return;
3007 3498
3008 aio_rename "$runtime~", $runtime 3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3009 and return; 3500 and return;
3010 3501
3011 warn "runtime file written.\n"; 3502 warn "runtime file written.\n";
3012 3503
3013 1 3504 1
3505}
3506
3507our $uuid_lock;
3508our $uuid_skip;
3509
3510sub write_uuid_sync($) {
3511 $uuid_skip ||= $_[0];
3512
3513 return if $uuid_lock;
3514 local $uuid_lock = 1;
3515
3516 my $uuid = "$LOCALDIR/uuid";
3517
3518 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3519 or return;
3520
3521 my $value = uuid_seq uuid_cur;
3522
3523 unless ($value) {
3524 warn "cowardly refusing to write zero uuid value!\n";
3525 return;
3526 }
3527
3528 my $value = uuid_str $value + $uuid_skip;
3529 $uuid_skip = 0;
3530
3531 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3532 and return;
3533
3534 # always fsync - this file is important
3535 aio_fsync $fh
3536 and return;
3537
3538 close $fh
3539 or return;
3540
3541 aio_rename "$uuid~", $uuid
3542 and return;
3543
3544 warn "uuid file written ($value).\n";
3545
3546 1
3547
3548}
3549
3550sub write_uuid($$) {
3551 my ($skip, $sync) = @_;
3552
3553 $sync ? write_uuid_sync $skip
3554 : async { write_uuid_sync $skip };
3014} 3555}
3015 3556
3016sub emergency_save() { 3557sub emergency_save() {
3017 my $freeze_guard = cf::freeze_mainloop; 3558 my $freeze_guard = cf::freeze_mainloop;
3018 3559
3024 # and maps saved/destroyed asynchronously. 3565 # and maps saved/destroyed asynchronously.
3025 warn "begin emergency player save\n"; 3566 warn "begin emergency player save\n";
3026 for my $login (keys %cf::PLAYER) { 3567 for my $login (keys %cf::PLAYER) {
3027 my $pl = $cf::PLAYER{$login} or next; 3568 my $pl = $cf::PLAYER{$login} or next;
3028 $pl->valid or next; 3569 $pl->valid or next;
3570 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3029 $pl->save; 3571 $pl->save;
3030 } 3572 }
3031 warn "end emergency player save\n"; 3573 warn "end emergency player save\n";
3032 3574
3033 warn "begin emergency map save\n"; 3575 warn "begin emergency map save\n";
3039 warn "end emergency map save\n"; 3581 warn "end emergency map save\n";
3040 3582
3041 warn "begin emergency database checkpoint\n"; 3583 warn "begin emergency database checkpoint\n";
3042 BDB::db_env_txn_checkpoint $DB_ENV; 3584 BDB::db_env_txn_checkpoint $DB_ENV;
3043 warn "end emergency database checkpoint\n"; 3585 warn "end emergency database checkpoint\n";
3586
3587 warn "begin write uuid\n";
3588 write_uuid_sync 1;
3589 warn "end write uuid\n";
3044 }; 3590 };
3045 3591
3046 warn "leave emergency perl save\n"; 3592 warn "leave emergency perl save\n";
3047} 3593}
3048 3594
3049sub post_cleanup { 3595sub post_cleanup {
3050 my ($make_core) = @_; 3596 my ($make_core) = @_;
3051 3597
3052 warn Carp::longmess "post_cleanup backtrace" 3598 warn Carp::longmess "post_cleanup backtrace"
3053 if $make_core; 3599 if $make_core;
3600
3601 my $fh = pidfile;
3602 unlink $PIDFILE if <$fh> == $$;
3603}
3604
3605# a safer delete_package, copied from Symbol
3606sub clear_package($) {
3607 my $pkg = shift;
3608
3609 # expand to full symbol table name if needed
3610 unless ($pkg =~ /^main::.*::$/) {
3611 $pkg = "main$pkg" if $pkg =~ /^::/;
3612 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3613 $pkg .= '::' unless $pkg =~ /::$/;
3614 }
3615
3616 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3617 my $stem_symtab = *{$stem}{HASH};
3618
3619 defined $stem_symtab and exists $stem_symtab->{$leaf}
3620 or return;
3621
3622 # clear all symbols
3623 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3624 for my $name (keys %$leaf_symtab) {
3625 _gv_clear *{"$pkg$name"};
3626# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3627 }
3628 warn "cleared package $pkg\n";#d#
3054} 3629}
3055 3630
3056sub do_reload_perl() { 3631sub do_reload_perl() {
3057 # can/must only be called in main 3632 # can/must only be called in main
3058 if ($Coro::current != $Coro::main) { 3633 if ($Coro::current != $Coro::main) {
3059 warn "can only reload from main coroutine"; 3634 warn "can only reload from main coroutine";
3060 return; 3635 return;
3061 } 3636 }
3062 3637
3638 return if $RELOAD++;
3639
3640 while ($RELOAD) {
3063 warn "reloading..."; 3641 warn "reloading...";
3064 3642
3065 warn "entering sync_job"; 3643 warn "entering sync_job";
3066 3644
3067 cf::sync_job { 3645 cf::sync_job {
3068 cf::write_runtime; # external watchdog should not bark 3646 cf::write_runtime_sync; # external watchdog should not bark
3069 cf::emergency_save; 3647 cf::emergency_save;
3070 cf::write_runtime; # external watchdog should not bark 3648 cf::write_runtime_sync; # external watchdog should not bark
3071 3649
3072 warn "syncing database to disk"; 3650 warn "syncing database to disk";
3073 BDB::db_env_txn_checkpoint $DB_ENV; 3651 BDB::db_env_txn_checkpoint $DB_ENV;
3074 3652
3075 # if anything goes wrong in here, we should simply crash as we already saved 3653 # if anything goes wrong in here, we should simply crash as we already saved
3076 3654
3077 warn "cancelling all WF_AUTOCANCEL watchers";
3078 for (Event::all_watchers) {
3079 $_->cancel if $_->data & WF_AUTOCANCEL;
3080 }
3081
3082 warn "flushing outstanding aio requests"; 3655 warn "flushing outstanding aio requests";
3083 for (;;) {
3084 BDB::flush;
3085 IO::AIO::flush;
3086 Coro::cede;
3087 last unless IO::AIO::nreqs || BDB::nreqs; 3656 while (IO::AIO::nreqs || BDB::nreqs) {
3088 warn "iterate..."; 3657 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3089 }
3090
3091 ++$RELOAD;
3092
3093 warn "cancelling all extension coros";
3094 $_->cancel for values %EXT_CORO;
3095 %EXT_CORO = ();
3096
3097 warn "removing commands";
3098 %COMMAND = ();
3099
3100 warn "removing ext/exti commands";
3101 %EXTCMD = ();
3102 %EXTICMD = ();
3103
3104 warn "unloading/nuking all extensions";
3105 for my $pkg (@EXTS) {
3106 warn "... unloading $pkg";
3107
3108 if (my $cb = $pkg->can ("unload")) {
3109 eval {
3110 $cb->($pkg);
3111 1
3112 } or warn "$pkg unloaded, but with errors: $@";
3113 } 3658 }
3114 3659
3115 warn "... nuking $pkg"; 3660 warn "cancelling all extension coros";
3116 Symbol::delete_package $pkg; 3661 $_->cancel for values %EXT_CORO;
3117 } 3662 %EXT_CORO = ();
3118 3663
3119 warn "unloading all perl modules loaded from $LIBDIR"; 3664 warn "removing commands";
3120 while (my ($k, $v) = each %INC) { 3665 %COMMAND = ();
3121 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3122 3666
3667 warn "removing ext/exti commands";
3668 %EXTCMD = ();
3669 %EXTICMD = ();
3670
3671 warn "unloading/nuking all extensions";
3672 for my $pkg (@EXTS) {
3123 warn "... unloading $k"; 3673 warn "... unloading $pkg";
3124 delete $INC{$k};
3125 3674
3126 $k =~ s/\.pm$//;
3127 $k =~ s/\//::/g;
3128
3129 if (my $cb = $k->can ("unload_module")) { 3675 if (my $cb = $pkg->can ("unload")) {
3676 eval {
3130 $cb->(); 3677 $cb->($pkg);
3678 1
3679 } or warn "$pkg unloaded, but with errors: $@";
3680 }
3681
3682 warn "... clearing $pkg";
3683 clear_package $pkg;
3131 } 3684 }
3132 3685
3133 Symbol::delete_package $k; 3686 warn "unloading all perl modules loaded from $LIBDIR";
3687 while (my ($k, $v) = each %INC) {
3688 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3689
3690 warn "... unloading $k";
3691 delete $INC{$k};
3692
3693 $k =~ s/\.pm$//;
3694 $k =~ s/\//::/g;
3695
3696 if (my $cb = $k->can ("unload_module")) {
3697 $cb->();
3698 }
3699
3700 clear_package $k;
3134 } 3701 }
3135 3702
3136 warn "getting rid of safe::, as good as possible"; 3703 warn "getting rid of safe::, as good as possible";
3137 Symbol::delete_package "safe::$_" 3704 clear_package "safe::$_"
3138 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3705 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3139 3706
3140 warn "unloading cf.pm \"a bit\""; 3707 warn "unloading cf.pm \"a bit\"";
3141 delete $INC{"cf.pm"}; 3708 delete $INC{"cf.pm"};
3142 delete $INC{"cf/pod.pm"}; 3709 delete $INC{"cf/pod.pm"};
3143 3710
3144 # don't, removes xs symbols, too, 3711 # don't, removes xs symbols, too,
3145 # and global variables created in xs 3712 # and global variables created in xs
3146 #Symbol::delete_package __PACKAGE__; 3713 #clear_package __PACKAGE__;
3147 3714
3148 warn "unload completed, starting to reload now"; 3715 warn "unload completed, starting to reload now";
3149 3716
3150 warn "reloading cf.pm"; 3717 warn "reloading cf.pm";
3151 require cf; 3718 require cf;
3152 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3719 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3153 3720
3154 warn "loading config and database again"; 3721 warn "loading config and database again";
3155 cf::cfg_load; 3722 cf::reload_config;
3156 3723
3157 warn "loading extensions"; 3724 warn "loading extensions";
3158 cf::load_extensions; 3725 cf::load_extensions;
3159 3726
3160 warn "reattaching attachments to objects/players"; 3727 warn "reattaching attachments to objects/players";
3161 _global_reattach; # objects, sockets 3728 _global_reattach; # objects, sockets
3162 warn "reattaching attachments to maps"; 3729 warn "reattaching attachments to maps";
3163 reattach $_ for values %MAP; 3730 reattach $_ for values %MAP;
3164 warn "reattaching attachments to players"; 3731 warn "reattaching attachments to players";
3165 reattach $_ for values %PLAYER; 3732 reattach $_ for values %PLAYER;
3166 3733
3734 warn "running post_load";
3735 (pop @POST_INIT)->(1) while @POST_INIT;
3736
3167 warn "leaving sync_job"; 3737 warn "leaving sync_job";
3168 3738
3169 1 3739 1
3170 } or do { 3740 } or do {
3171 warn $@; 3741 warn $@;
3172 warn "error while reloading, exiting."; 3742 cf::cleanup "error while reloading, exiting.";
3173 exit 1;
3174 }; 3743 };
3175 3744
3176 warn "reloaded"; 3745 warn "reloaded";
3746 --$RELOAD;
3747 }
3177}; 3748};
3178 3749
3179our $RELOAD_WATCHER; # used only during reload 3750our $RELOAD_WATCHER; # used only during reload
3180 3751
3181sub reload_perl() { 3752sub reload_perl() {
3182 # doing reload synchronously and two reloads happen back-to-back, 3753 # doing reload synchronously and two reloads happen back-to-back,
3183 # coro crashes during coro_state_free->destroy here. 3754 # coro crashes during coro_state_free->destroy here.
3184 3755
3185 $RELOAD_WATCHER ||= Event->timer ( 3756 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
3186 reentrant => 0,
3187 after => 0,
3188 data => WF_AUTOCANCEL,
3189 cb => sub {
3190 do_reload_perl; 3757 do_reload_perl;
3191 undef $RELOAD_WATCHER; 3758 undef $RELOAD_WATCHER;
3192 },
3193 ); 3759 };
3194} 3760}
3195 3761
3196register_command "reload" => sub { 3762register_command "reload" => sub {
3197 my ($who, $arg) = @_; 3763 my ($who, $arg) = @_;
3198 3764
3199 if ($who->flag (FLAG_WIZ)) { 3765 if ($who->flag (FLAG_WIZ)) {
3200 $who->message ("reloading server."); 3766 $who->message ("reloading server.");
3767 async {
3768 $Coro::current->{desc} = "perl_reload";
3201 async { reload_perl }; 3769 reload_perl;
3770 };
3202 } 3771 }
3203}; 3772};
3204 3773
3205unshift @INC, $LIBDIR; 3774unshift @INC, $LIBDIR;
3206 3775
3208 3777
3209our @WAIT_FOR_TICK; 3778our @WAIT_FOR_TICK;
3210our @WAIT_FOR_TICK_BEGIN; 3779our @WAIT_FOR_TICK_BEGIN;
3211 3780
3212sub wait_for_tick { 3781sub wait_for_tick {
3213 return unless $TICK_WATCHER->is_active;
3214 return if $Coro::current == $Coro::main; 3782 return if tick_inhibit || $Coro::current == $Coro::main;
3215 3783
3216 my $signal = new Coro::Signal; 3784 my $signal = new Coro::Signal;
3217 push @WAIT_FOR_TICK, $signal; 3785 push @WAIT_FOR_TICK, $signal;
3218 $signal->wait; 3786 $signal->wait;
3219} 3787}
3220 3788
3221sub wait_for_tick_begin { 3789sub wait_for_tick_begin {
3222 return unless $TICK_WATCHER->is_active;
3223 return if $Coro::current == $Coro::main; 3790 return if tick_inhibit || $Coro::current == $Coro::main;
3224 3791
3225 my $signal = new Coro::Signal; 3792 my $signal = new Coro::Signal;
3226 push @WAIT_FOR_TICK_BEGIN, $signal; 3793 push @WAIT_FOR_TICK_BEGIN, $signal;
3227 $signal->wait; 3794 $signal->wait;
3228} 3795}
3229 3796
3230 my $min = 1e6;#d# 3797sub tick {
3231 my $avg = 10;
3232$TICK_WATCHER = Event->timer (
3233 reentrant => 0,
3234 parked => 1,
3235 prio => 0,
3236 at => $NEXT_TICK || $TICK,
3237 data => WF_AUTOCANCEL,
3238 cb => sub {
3239 if ($Coro::current != $Coro::main) { 3798 if ($Coro::current != $Coro::main) {
3240 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3799 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3241 unless ++$bug_warning > 10; 3800 unless ++$bug_warning > 10;
3242 return; 3801 return;
3243 } 3802 }
3244 3803
3245 $NOW = $tick_start = Event::time;
3246
3247 cf::server_tick; # one server iteration 3804 cf::server_tick; # one server iteration
3248 3805
3249 0 && sync_job {#d# 3806 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3250 for(1..10) { 3807 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3251 my $t = Event::time; 3808 Coro::async_pool {
3252 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3809 $Coro::current->{desc} = "runtime saver";
3253 or die; 3810 write_runtime_sync
3254 3811 or warn "ERROR: unable to write runtime file: $!";
3255 $map->width (50);
3256 $map->height (50);
3257 $map->alloc;
3258 $map->_load_objects ("/tmp/x.map", 1);
3259 my $t = Event::time - $t;
3260
3261 #next unless $t < 0.0013;#d#
3262 if ($t < $min) {
3263 $min = $t;
3264 }
3265 $avg = $avg * 0.99 + $t * 0.01;
3266 }
3267 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3268 exit 0;
3269 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3270 }; 3812 };
3813 }
3271 3814
3272 $RUNTIME += $TICK;
3273 $NEXT_TICK += $TICK;
3274
3275 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3276 $NEXT_RUNTIME_WRITE = $NOW + 10;
3277 Coro::async_pool {
3278 write_runtime
3279 or warn "ERROR: unable to write runtime file: $!";
3280 };
3281 }
3282
3283# my $AFTER = Event::time;
3284# warn $AFTER - $NOW;#d#
3285
3286 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3815 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3287 $sig->send; 3816 $sig->send;
3288 } 3817 }
3289 while (my $sig = shift @WAIT_FOR_TICK) { 3818 while (my $sig = shift @WAIT_FOR_TICK) {
3290 $sig->send; 3819 $sig->send;
3291 } 3820 }
3292 3821
3293 $NOW = Event::time; 3822 $LOAD = ($NOW - $TICK_START) / $TICK;
3294
3295 # if we are delayed by four ticks or more, skip them all
3296 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3297
3298 $TICK_WATCHER->at ($NEXT_TICK);
3299 $TICK_WATCHER->start;
3300
3301 $LOAD = ($NOW - $tick_start) / $TICK;
3302 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3823 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3303 3824
3304 _post_tick; 3825 if (0) {
3305 3826 if ($NEXT_TICK) {
3306 3827 my $jitter = $TICK_START - $NEXT_TICK;
3828 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3829 warn "jitter $JITTER\n";#d#
3830 }
3307 }, 3831 }
3308); 3832}
3309 3833
3310{ 3834{
3311 BDB::max_poll_time $TICK * 0.1; 3835 # configure BDB
3312 $BDB_POLL_WATCHER = Event->io ( 3836
3313 reentrant => 0,
3314 fd => BDB::poll_fileno,
3315 poll => 'r',
3316 prio => 0,
3317 data => WF_AUTOCANCEL,
3318 cb => \&BDB::poll_cb,
3319 );
3320 BDB::min_parallel 8; 3837 BDB::min_parallel 8;
3321 3838 BDB::max_poll_reqs $TICK * 0.1;
3322 BDB::set_sync_prepare { 3839 $AnyEvent::BDB::WATCHER->priority (1);
3323 my $status;
3324 my $current = $Coro::current;
3325 (
3326 sub {
3327 $status = $!;
3328 $current->ready; undef $current;
3329 },
3330 sub {
3331 Coro::schedule while defined $current;
3332 $! = $status;
3333 },
3334 )
3335 };
3336 3840
3337 unless ($DB_ENV) { 3841 unless ($DB_ENV) {
3338 $DB_ENV = BDB::db_env_create; 3842 $DB_ENV = BDB::db_env_create;
3843 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3844 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3845 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3846 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3847 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3339 3848
3340 cf::sync_job { 3849 cf::sync_job {
3341 eval { 3850 eval {
3342 BDB::db_env_open 3851 BDB::db_env_open
3343 $DB_ENV, 3852 $DB_ENV,
3345 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3854 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3346 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3855 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3347 0666; 3856 0666;
3348 3857
3349 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3858 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3350
3351 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3352 $DB_ENV->set_lk_detect;
3353 }; 3859 };
3354 3860
3355 cf::cleanup "db_env_open(db): $@" if $@; 3861 cf::cleanup "db_env_open(db): $@" if $@;
3356 }; 3862 };
3357 } 3863 }
3864
3865 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3866 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3867 };
3868 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3869 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3870 };
3871 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3872 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3873 };
3358} 3874}
3359 3875
3360{ 3876{
3877 # configure IO::AIO
3878
3361 IO::AIO::min_parallel 8; 3879 IO::AIO::min_parallel 8;
3362
3363 undef $Coro::AIO::WATCHER;
3364 IO::AIO::max_poll_time $TICK * 0.1; 3880 IO::AIO::max_poll_time $TICK * 0.1;
3365 $AIO_POLL_WATCHER = Event->io ( 3881 undef $AnyEvent::AIO::WATCHER;
3366 reentrant => 0,
3367 data => WF_AUTOCANCEL,
3368 fd => IO::AIO::poll_fileno,
3369 poll => 'r',
3370 prio => 6,
3371 cb => \&IO::AIO::poll_cb,
3372 );
3373} 3882}
3374 3883
3375my $_log_backtrace; 3884my $_log_backtrace;
3376 3885
3377sub _log_backtrace { 3886sub _log_backtrace {
3380 $msg =~ s/\n//; 3889 $msg =~ s/\n//;
3381 3890
3382 # limit the # of concurrent backtraces 3891 # limit the # of concurrent backtraces
3383 if ($_log_backtrace < 2) { 3892 if ($_log_backtrace < 2) {
3384 ++$_log_backtrace; 3893 ++$_log_backtrace;
3894 my $perl_bt = Carp::longmess $msg;
3385 async { 3895 async {
3896 $Coro::current->{desc} = "abt $msg";
3897
3386 my @bt = fork_call { 3898 my @bt = fork_call {
3387 @addr = map { sprintf "%x", $_ } @addr; 3899 @addr = map { sprintf "%x", $_ } @addr;
3388 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3900 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3389 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3901 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3390 or die "addr2line: $!"; 3902 or die "addr2line: $!";
3398 } 3910 }
3399 3911
3400 @funcs 3912 @funcs
3401 }; 3913 };
3402 3914
3403 LOG llevInfo, "[ABT] $msg\n"; 3915 LOG llevInfo, "[ABT] $perl_bt\n";
3916 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3404 LOG llevInfo, "[ABT] $_\n" for @bt; 3917 LOG llevInfo, "[ABT] $_\n" for @bt;
3405 --$_log_backtrace; 3918 --$_log_backtrace;
3406 }; 3919 };
3407 } else { 3920 } else {
3408 LOG llevInfo, "[ABT] $msg\n"; 3921 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines