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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines