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.282 by elmex, Tue Jun 19 18:15:34 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
51use JSON::XS 2.01 ();
25use BDB (); 52use BDB ();
26use Data::Dumper; 53use Data::Dumper;
27use Digest::MD5; 54use Digest::MD5;
28use Fcntl; 55use Fcntl;
29use YAML::Syck (); 56use YAML ();
30use IO::AIO 2.32 (); 57use IO::AIO ();
31use Time::HiRes; 58use Time::HiRes;
32use Compress::LZF; 59use Compress::LZF;
60use Digest::MD5 ();
61
62AnyEvent::detect;
33 63
34# configure various modules to our taste 64# configure various modules to our taste
35# 65#
36$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
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";
38Compress::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
39
40$Event::Eval = 1; # no idea why this is required, but it is
41
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1;
44
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 74
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
48 76
49our %COMMAND = (); 77our %COMMAND = ();
50our %COMMAND_TIME = (); 78our %COMMAND_TIME = ();
51 79
52our @EXTS = (); # list of extension package names 80our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 81our %EXTCMD = ();
82our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 83our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 84our %EXT_MAP = (); # pluggable maps
56 85
57our $RELOAD; # number of reloads so far 86our $RELOAD; # number of reloads so far, non-zero while in reload
58our @EVENT; 87our @EVENT;
59 88
60our $CONFDIR = confdir; 89our $CONFDIR = confdir;
61our $DATADIR = datadir; 90our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 91our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 92our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 93our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir; 94our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 95our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 97our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 98our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 99our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime";
102
103our %RESOURCE;
71 104
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER;
74our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 107our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 108our $USE_FSYNC = 1; # use fsync to write maps - default off
79 109
110our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER;
80our $BDB_POLL_WATCHER; 112our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 113our $DB_ENV;
82 114
83our %CFG; 115our %CFG;
84 116
85our $UPTIME; $UPTIME ||= time; 117our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 118our $RUNTIME;
119our $NOW;
87 120
88our %PLAYER; # all users 121our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 122our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 123our $LINK_MAP; # the special {link} map, which is always available
91 124
92# 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 ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 126our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 127
95our $LOAD; # a number between 0 (idle) and 1 (too many objects) 128our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing 129our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter
97our $tick_start; # for load detecting purposes 131our $TICK_START; # for load detecting purposes
98 132
99binmode STDOUT; 133binmode STDOUT;
100binmode STDERR; 134binmode STDERR;
101 135
102# read virtual server time, if available 136# read virtual server time, if available
103unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 137unless ($RUNTIME || !-e $RUNTIMEFILE) {
104 open my $fh, "<", "$LOCALDIR/runtime" 138 open my $fh, "<", $RUNTIMEFILE
105 or die "unable to read runtime file: $!"; 139 or die "unable to read $RUNTIMEFILE file: $!";
106 $RUNTIME = <$fh> + 0.; 140 $RUNTIME = <$fh> + 0.;
107} 141}
108 142
109mkdir $_ 143mkdir $_
110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
155 189
156The raw value load value from the last tick. 190The raw value load value from the last tick.
157 191
158=item %cf::CFG 192=item %cf::CFG
159 193
160Configuration for the server, loaded from C</etc/crossfire/config>, or 194Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 195from wherever your confdir points to.
162 196
163=item cf::wait_for_tick, cf::wait_for_tick_begin 197=item cf::wait_for_tick, cf::wait_for_tick_begin
164 198
165These 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
166returns directly I<after> the tick processing (and consequently, can only wake one process 200returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 201per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 202
203=item @cf::INVOKE_RESULTS
204
205This array contains the results of the last C<invoke ()> call. When
206C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
207that call.
208
169=back 209=back
170 210
171=cut 211=cut
172 212
173BEGIN { 213BEGIN {
177 $msg .= "\n" 217 $msg .= "\n"
178 unless $msg =~ /\n$/; 218 unless $msg =~ /\n$/;
179 219
180 $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;
181 221
182 utf8::encode $msg;
183 LOG llevError, $msg; 222 LOG llevError, $msg;
184 }; 223 };
185} 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#?
186 240
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 241@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 242@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 243@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 244@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
197for my $pkg (qw( 251for my $pkg (qw(
198 cf::global cf::attachable 252 cf::global cf::attachable
199 cf::object cf::object::player 253 cf::object cf::object::player
200 cf::client cf::player 254 cf::client cf::player
201 cf::arch cf::living 255 cf::arch cf::living
256 cf::map cf::mapspace
202 cf::map cf::party cf::region 257 cf::party cf::region
203)) { 258)) {
204 no strict 'refs';
205 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 259 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
206} 260}
207 261
208$Event::DIED = sub { 262$EV::DIED = sub {
209 warn "error in event callback: @_"; 263 warn "error in event callback: @_";
210}; 264};
211 265
212############################################################################# 266#############################################################################
213 267
236 $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;
237 $d 291 $d
238 } || "[unable to dump $_[0]: '$@']"; 292 } || "[unable to dump $_[0]: '$@']";
239} 293}
240 294
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243=item $ref = cf::from_json $json 295=item $ref = cf::decode_json $json
244 296
245Converts a JSON string into the corresponding perl data structure. 297Converts a JSON string into the corresponding perl data structure.
246 298
247=item $json = cf::to_json $ref 299=item $json = cf::encode_json $ref
248 300
249Converts a perl data structure into its JSON representation. 301Converts a perl data structure into its JSON representation.
302
303=cut
304
305our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
306
307sub encode_json($) { $json_coder->encode ($_[0]) }
308sub decode_json($) { $json_coder->decode ($_[0]) }
250 309
251=item cf::lock_wait $string 310=item cf::lock_wait $string
252 311
253Wait until the given lock is available. See cf::lock_acquire. 312Wait until the given lock is available. See cf::lock_acquire.
254 313
257Wait 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
258a 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,
259for example when the coroutine gets canceled), the lock is automatically 318for example when the coroutine gets canceled), the lock is automatically
260returned. 319returned.
261 320
321Locks are *not* recursive, locking from the same coro twice results in a
322deadlocked coro.
323
262Lock 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
263uses map_find and cf::map::load uses map_load). 325uses map_find and cf::map::load uses map_load).
264 326
265=item $locked = cf::lock_active $string 327=item $locked = cf::lock_active $string
266 328
267Return 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.
268 330
269=cut 331=cut
270 332
271our %LOCK; 333our %LOCK;
334our %LOCKER;#d#
272 335
273sub lock_wait($) { 336sub lock_wait($) {
274 my ($key) = @_; 337 my ($key) = @_;
275 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
276 # wait for lock, if any 344 # wait for lock, if any
277 while ($LOCK{$key}) { 345 while ($LOCK{$key}) {
346 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
278 push @{ $LOCK{$key} }, $Coro::current; 347 push @{ $LOCK{$key} }, $Coro::current;
279 Coro::schedule; 348 Coro::schedule;
280 } 349 }
281} 350}
282 351
285 354
286 # wait, to be sure we are not locked 355 # wait, to be sure we are not locked
287 lock_wait $key; 356 lock_wait $key;
288 357
289 $LOCK{$key} = []; 358 $LOCK{$key} = [];
359 $LOCKER{$key} = $Coro::current;#d#
290 360
291 Coro::guard { 361 Coro::guard {
362 delete $LOCKER{$key};#d#
292 # wake up all waiters, to be on the safe side 363 # wake up all waiters, to be on the safe side
293 $_->ready for @{ delete $LOCK{$key} }; 364 $_->ready for @{ delete $LOCK{$key} };
294 } 365 }
295} 366}
296 367
299 370
300 ! ! $LOCK{$key} 371 ! ! $LOCK{$key}
301} 372}
302 373
303sub freeze_mainloop { 374sub freeze_mainloop {
304 return unless $TICK_WATCHER->is_active; 375 tick_inhibit_inc;
305 376
306 my $guard = Coro::guard { 377 Coro::guard \&tick_inhibit_dec;
307 $TICK_WATCHER->start; 378}
379
380=item cf::periodic $interval, $cb
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
393}
394
395=item cf::get_slot $time[, $priority[, $name]]
396
397Allocate $time seconds of blocking CPU time at priority C<$priority>:
398This call blocks and returns only when you have at least C<$time> seconds
399of cpu time till the next tick. The slot is only valid till the next cede.
400
401The optional C<$name> can be used to identify the job to run. It might be
402used for statistical purposes and should identify the same time-class.
403
404Useful for short background jobs.
405
406=cut
407
408our @SLOT_QUEUE;
409our $SLOT_QUEUE;
410
411$SLOT_QUEUE->cancel if $SLOT_QUEUE;
412$SLOT_QUEUE = Coro::async {
413 $Coro::current->desc ("timeslot manager");
414
415 my $signal = new Coro::Signal;
416
417 while () {
418 next_job:
419 my $avail = cf::till_tick;
420 if ($avail > 0.01) {
421 for (0 .. $#SLOT_QUEUE) {
422 if ($SLOT_QUEUE[$_][0] < $avail) {
423 my $job = splice @SLOT_QUEUE, $_, 1, ();
424 $job->[2]->send;
425 Coro::cede;
426 goto next_job;
427 }
428 }
429 }
430
431 if (@SLOT_QUEUE) {
432 # we do not use wait_for_tick() as it returns immediately when tick is inactive
433 push @cf::WAIT_FOR_TICK, $signal;
434 $signal->wait;
435 } else {
436 Coro::schedule;
437 }
308 }; 438 }
309 $TICK_WATCHER->stop; 439};
310 $guard 440
441sub get_slot($;$$) {
442 return if tick_inhibit || $Coro::current == $Coro::main;
443
444 my ($time, $pri, $name) = @_;
445
446 $time = $TICK * .6 if $time > $TICK * .6;
447 my $sig = new Coro::Signal;
448
449 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
450 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
451 $SLOT_QUEUE->ready;
452 $sig->wait;
311} 453}
312 454
313=item cf::async { BLOCK } 455=item cf::async { BLOCK }
314 456
315Currently the same as Coro::async_pool, meaning you cannot use 457Currently the same as Coro::async_pool, meaning you cannot use
320 462
321BEGIN { *async = \&Coro::async_pool } 463BEGIN { *async = \&Coro::async_pool }
322 464
323=item cf::sync_job { BLOCK } 465=item cf::sync_job { BLOCK }
324 466
325The design of Crossfire TRT requires that the main coroutine ($Coro::main) 467The design of Deliantra requires that the main coroutine ($Coro::main)
326is always able to handle events or runnable, as Crossfire TRT is only 468is always able to handle events or runnable, as Deliantra is only
327partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 469partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
328acceptable. 470acceptable.
329 471
330If 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
331the given BLOCK in another coroutine while waiting for the result. The 473the given BLOCK in another coroutine while waiting for the result. The
336 478
337sub sync_job(&) { 479sub sync_job(&) {
338 my ($job) = @_; 480 my ($job) = @_;
339 481
340 if ($Coro::current == $Coro::main) { 482 if ($Coro::current == $Coro::main) {
341 my $time = Event::time; 483 my $time = EV::time;
342 484
343 # this is the main coro, too bad, we have to block 485 # this is the main coro, too bad, we have to block
344 # till the operation succeeds, freezing the server :/ 486 # till the operation succeeds, freezing the server :/
345 487
346 # TODO: use suspend/resume instead 488 LOG llevError, Carp::longmess "sync job";#d#
347 # (but this is cancel-safe) 489
348 my $freeze_guard = freeze_mainloop; 490 my $freeze_guard = freeze_mainloop;
349 491
350 my $busy = 1; 492 my $busy = 1;
351 my @res; 493 my @res;
352 494
353 (async { 495 (async {
496 $Coro::current->desc ("sync job coro");
354 @res = eval { $job->() }; 497 @res = eval { $job->() };
355 warn $@ if $@; 498 warn $@ if $@;
356 undef $busy; 499 undef $busy;
357 })->prio (Coro::PRIO_MAX); 500 })->prio (Coro::PRIO_MAX);
358 501
359 while ($busy) { 502 while ($busy) {
360 Coro::cede or Event::one_event; 503 if (Coro::nready) {
504 Coro::cede_notself;
505 } else {
506 EV::loop EV::LOOP_ONESHOT;
361 } 507 }
508 }
362 509
363 $time = Event::time - $time; 510 my $time = EV::time - $time;
364 511
365 LOG llevError | logBacktrace, Carp::longmess "long sync job"
366 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
367
368 $tick_start += $time; # do not account sync jobs to server load 512 $TICK_START += $time; # do not account sync jobs to server load
369 513
370 wantarray ? @res : $res[0] 514 wantarray ? @res : $res[0]
371 } else { 515 } else {
372 # we are in another coroutine, how wonderful, everything just works 516 # we are in another coroutine, how wonderful, everything just works
373 517
398=item fork_call { }, $args 542=item fork_call { }, $args
399 543
400Executes the given code block with the given arguments in a seperate 544Executes the given code block with the given arguments in a seperate
401process, returning the results. Everything must be serialisable with 545process, returning the results. Everything must be serialisable with
402Coro::Storable. May, of course, block. Note that the executed sub may 546Coro::Storable. May, of course, block. Note that the executed sub may
403never block itself or use any form of Event handling. 547never block itself or use any form of event handling.
404 548
405=cut 549=cut
406 550
407sub fork_call(&@) { 551sub fork_call(&@) {
408 my ($cb, @args) = @_; 552 my ($cb, @args) = @_;
409 553
410# 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,
411# or die "socketpair: $!"; 555 # otherwise perl prematurely frees the stuff :/
412 pipe my $fh1, my $fh2 556 # TODO: investigate and fix (likely this will be rather laborious)
413 or die "pipe: $!";
414 557
415 if (my $pid = fork) { 558 my @res = Coro::Util::fork_eval {
416 close $fh2;
417
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
419 $res = Coro::Storable::thaw $res;
420
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423 die $$res unless "ARRAY" eq ref $res;
424
425 return wantarray ? @$res : $res->[-1];
426 } else {
427 reset_signals; 559 reset_signals;
428 local $SIG{__WARN__}; 560 &$cb
429 local $SIG{__DIE__}; 561 }, @args;
430 eval {
431 close $fh1;
432 562
433 my @res = eval { $cb->(@args) }; 563 wantarray ? @res : $res[-1]
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 564}
435 };
436 565
437 warn $@ if $@; 566=item $coin = coin_from_name $name
438 _exit 0; 567
439 } 568=cut
569
570our %coin_alias = (
571 "silver" => "silvercoin",
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
440} 591}
441 592
442=item $value = cf::db_get $family => $key 593=item $value = cf::db_get $family => $key
443 594
444Returns a single value from the environment database. 595Returns a single value from the environment database.
446=item cf::db_put $family => $key => $value 597=item cf::db_put $family => $key => $value
447 598
448Stores 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
449data 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).
450 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
451=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}
452 625
453our $DB; 626our $DB;
454 627
455sub db_init { 628sub db_init {
456 unless ($DB) {
457 $DB = BDB::db_create $DB_ENV;
458
459 cf::sync_job { 629 cf::sync_job {
460 eval { 630 $DB ||= db_table "db";
461 $DB->set_flags (BDB::CHKSUM);
462
463 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
464 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
465 cf::cleanup "db_open(db): $!" if $!;
466 };
467 cf::cleanup "db_open(db): $@" if $@;
468 };
469 } 631 };
470} 632}
471 633
472sub db_get($$) { 634sub db_get($$) {
473 my $key = "$_[0]/$_[1]"; 635 my $key = "$_[0]/$_[1]";
474 636
524 if (1) { 686 if (1) {
525 $md5 = 687 $md5 =
526 join "\x00", 688 join "\x00",
527 $processversion, 689 $processversion,
528 map { 690 map {
529 Coro::cede; 691 cf::cede_to_tick;
530 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 692 ($src->[$_], Digest::MD5::md5_hex $data[$_])
531 } 0.. $#$src; 693 } 0.. $#$src;
532 694
533 695
534 my $dbmd5 = db_get cache => "$id/md5"; 696 my $dbmd5 = db_get cache => "$id/md5";
572 734
573############################################################################# 735#############################################################################
574 736
575=head2 ATTACHABLE OBJECTS 737=head2 ATTACHABLE OBJECTS
576 738
577Many 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
578attach callbacks/event handlers (a collection of which is called an "attachment") 740attach callbacks/event handlers (a collection of which is called an "attachment")
579to it. All such attachable objects support the following methods. 741to it. All such attachable objects support the following methods.
580 742
581In 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>
582C<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
583Crossfire TRT). 745Deliantra).
584 746
585=over 4 747=over 4
586 748
587=item $attachable->attach ($attachment, key => $value...) 749=item $attachable->attach ($attachment, key => $value...)
588 750
632=item cf::CLASS::attachment $name, ... 794=item cf::CLASS::attachment $name, ...
633 795
634Register an attachment by C<$name> through which attachable objects of the 796Register an attachment by C<$name> through which attachable objects of the
635given CLASS can refer to this attachment. 797given CLASS can refer to this attachment.
636 798
637Some classes such as crossfire maps and objects can specify attachments 799Some classes such as deliantra maps and objects can specify attachments
638that 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.
639 801
640These calls expect any number of the following handler/hook descriptions: 802These calls expect any number of the following handler/hook descriptions:
641 803
642=over 4 804=over 4
840 "; 1002 ";
841 die if $@; 1003 die if $@;
842} 1004}
843 1005
844our $override; 1006our $override;
845our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1007our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846 1008
847sub override { 1009sub override {
848 $override = 1; 1010 $override = 1;
849 @invoke_results = (); 1011 @INVOKE_RESULTS = (@_);
850} 1012}
851 1013
852sub do_invoke { 1014sub do_invoke {
853 my $event = shift; 1015 my $event = shift;
854 my $callbacks = shift; 1016 my $callbacks = shift;
855 1017
856 @invoke_results = (); 1018 @INVOKE_RESULTS = ();
857 1019
858 local $override; 1020 local $override;
859 1021
860 for (@$callbacks) { 1022 for (@$callbacks) {
861 eval { &{$_->[1]} }; 1023 eval { &{$_->[1]} };
870 } 1032 }
871 1033
872 0 1034 0
873} 1035}
874 1036
875=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1037=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
876 1038
877=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1039=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
878 1040
879Generate an object-specific event with the given arguments. 1041Generate an object-specific event with the given arguments.
880 1042
881This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1043This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
882removed in future versions), and there is no public API to access override 1044removed in future versions), and there is no public API to access override
883results (if you must, access C<@cf::invoke_results> directly). 1045results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884 1046
885=back 1047=back
886 1048
887=cut 1049=cut
888 1050
889############################################################################# 1051#############################################################################
890# object support 1052# object support
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#
1087sub _can_merge {
1088 my ($ob1, $ob2) = @_;
1089
1090 ++$SLOW_MERGES;#d#
1091
1092 # we do the slow way here
1093 return _object_equal $ob1, $ob2
1094}
891 1095
892sub reattach { 1096sub reattach {
893 # basically do the same as instantiate, without calling instantiate 1097 # basically do the same as instantiate, without calling instantiate
894 my ($obj) = @_; 1098 my ($obj) = @_;
895 1099
1100 # no longer needed after getting rid of delete_package?
896 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
897 1102
898 my $registry = $obj->registry; 1103 my $registry = $obj->registry;
899 1104
900 @$registry = (); 1105 @$registry = ();
901 1106
916cf::attachable->attach ( 1121cf::attachable->attach (
917 prio => -1000000, 1122 prio => -1000000,
918 on_instantiate => sub { 1123 on_instantiate => sub {
919 my ($obj, $data) = @_; 1124 my ($obj, $data) = @_;
920 1125
921 $data = from_json $data; 1126 $data = decode_json $data;
922 1127
923 for (@$data) { 1128 for (@$data) {
924 my ($name, $args) = @$_; 1129 my ($name, $args) = @$_;
925 1130
926 $obj->attach ($name, %{$args || {} }); 1131 $obj->attach ($name, %{$args || {} });
942sub object_freezer_save { 1147sub object_freezer_save {
943 my ($filename, $rdata, $objs) = @_; 1148 my ($filename, $rdata, $objs) = @_;
944 1149
945 sync_job { 1150 sync_job {
946 if (length $$rdata) { 1151 if (length $$rdata) {
1152 utf8::decode (my $decname = $filename);
947 warn sprintf "saving %s (%d,%d)\n", 1153 warn sprintf "saving %s (%d,%d)\n",
948 $filename, length $$rdata, scalar @$objs; 1154 $decname, length $$rdata, scalar @$objs;
949 1155
950 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
952 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1158 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953 aio_fsync $fh if $cf::USE_FSYNC; 1159 aio_fsync $fh if $cf::USE_FSYNC;
954 close $fh; 1160 aio_close $fh;
955 1161
956 if (@$objs) { 1162 if (@$objs) {
957 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) {
958 chmod SAVE_MODE, $fh; 1164 aio_chmod $fh, SAVE_MODE;
959 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1165 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
960 aio_write $fh, 0, (length $data), $data, 0; 1166 aio_write $fh, 0, (length $data), $data, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1167 aio_fsync $fh if $cf::USE_FSYNC;
962 close $fh; 1168 aio_close $fh;
963 aio_rename "$filename.pst~", "$filename.pst"; 1169 aio_rename "$filename.pst~", "$filename.pst";
964 } 1170 }
965 } else { 1171 } else {
966 aio_unlink "$filename.pst"; 1172 aio_unlink "$filename.pst";
967 } 1173 }
972 } 1178 }
973 } else { 1179 } else {
974 aio_unlink $filename; 1180 aio_unlink $filename;
975 aio_unlink "$filename.pst"; 1181 aio_unlink "$filename.pst";
976 } 1182 }
977 } 1183 };
978} 1184}
979 1185
980sub object_freezer_as_string { 1186sub object_freezer_as_string {
981 my ($rdata, $objs) = @_; 1187 my ($rdata, $objs) = @_;
982 1188
994 or return; 1200 or return;
995 1201
996 unless (aio_stat "$filename.pst") { 1202 unless (aio_stat "$filename.pst") {
997 (aio_load "$filename.pst", $av) >= 0 1203 (aio_load "$filename.pst", $av) >= 0
998 or return; 1204 or return;
1205
999 $av = eval { (Storable::thaw $av)->{objs} }; 1206 my $st = eval { Coro::Storable::thaw $av };
1207 $av = $st->{objs};
1000 } 1208 }
1001 1209
1210 utf8::decode (my $decname = $filename);
1002 warn sprintf "loading %s (%d)\n", 1211 warn sprintf "loading %s (%d,%d)\n",
1003 $filename, length $data, scalar @{$av || []}; 1212 $decname, length $data, scalar @{$av || []};
1213
1004 return ($data, $av); 1214 ($data, $av)
1005} 1215}
1006 1216
1007=head2 COMMAND CALLBACKS 1217=head2 COMMAND CALLBACKS
1008 1218
1009=over 4 1219=over 4
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1239 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1240}
1031 1241
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1242=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1243
1034Register a callback fro execution when the client sends an extcmd packet. 1244Register a callback for execution when the client sends an (synchronous)
1245extcmd packet. Ext commands will be processed in the order they are
1246received by the server, like other user commands. The first argument is
1247the logged-in player. Ext commands can only be processed after a player
1248has logged in successfully.
1035 1249
1036If the callback returns something, it is sent back as if reply was being 1250If the callback returns something, it is sent back as if reply was being
1037called. 1251called.
1038 1252
1253=item cf::register_exticmd $name => \&callback($ns,$packet);
1254
1255Register a callback for execution when the client sends an (asynchronous)
1256exticmd packet. Exti commands are processed by the server as soon as they
1257are received, i.e. out of order w.r.t. other commands. The first argument
1258is a client socket. Exti commands can be received anytime, even before
1259log-in.
1260
1261If the callback returns something, it is sent back as if reply was being
1262called.
1263
1039=cut 1264=cut
1040 1265
1041sub register_extcmd { 1266sub register_extcmd {
1042 my ($name, $cb) = @_; 1267 my ($name, $cb) = @_;
1043 1268
1044 $EXTCMD{$name} = $cb; 1269 $EXTCMD{$name} = $cb;
1270}
1271
1272sub register_exticmd {
1273 my ($name, $cb) = @_;
1274
1275 $EXTICMD{$name} = $cb;
1045} 1276}
1046 1277
1047cf::player->attach ( 1278cf::player->attach (
1048 on_command => sub { 1279 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1280 my ($pl, $name, $params) = @_;
1058 cf::override; 1289 cf::override;
1059 }, 1290 },
1060 on_extcmd => sub { 1291 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1292 my ($pl, $buf) = @_;
1062 1293
1063 my $msg = eval { from_json $buf }; 1294 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1295
1065 if (ref $msg) { 1296 if (ref $msg) {
1297 my ($type, $reply, @payload) =
1298 "ARRAY" eq ref $msg
1299 ? @$msg
1300 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1301
1302 my @reply;
1303
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1304 if (my $cb = $EXTCMD{$type}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1305 @reply = $cb->($pl, @payload);
1068 $pl->ext_reply ($msg->{msgid}, %reply);
1069 }
1070 } 1306 }
1307
1308 $pl->ext_reply ($reply, @reply)
1309 if $reply;
1310
1071 } else { 1311 } else {
1072 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1312 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073 } 1313 }
1074 1314
1075 cf::override; 1315 cf::override;
1102 1342
1103 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1343 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1104 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1344 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1105 1345
1106 $ext{source} = 1346 $ext{source} =
1107 "package $pkg; use strict; use utf8;\n" 1347 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1108 . "#line 1 \"$path\"\n{\n" 1348 . "#line 1 \"$path\"\n{\n"
1109 . $source 1349 . $source
1110 . "\n};\n1"; 1350 . "\n};\n1";
1111 1351
1112 $todo{$base} = \%ext; 1352 $todo{$base} = \%ext;
1128 my $msg = $@ ? "$v->{path}: $@\n" 1368 my $msg = $@ ? "$v->{path}: $@\n"
1129 : "$v->{base}: extension inactive.\n"; 1369 : "$v->{base}: extension inactive.\n";
1130 1370
1131 if (exists $v->{meta}{mandatory}) { 1371 if (exists $v->{meta}{mandatory}) {
1132 warn $msg; 1372 warn $msg;
1133 warn "mandatory extension failed to load, exiting.\n"; 1373 cf::cleanup "mandatory extension failed to load, exiting.";
1134 exit 1;
1135 } 1374 }
1136 1375
1137 warn $msg; 1376 warn $msg;
1138 } 1377 }
1139 1378
1153 1392
1154=back 1393=back
1155 1394
1156=head2 CORE EXTENSIONS 1395=head2 CORE EXTENSIONS
1157 1396
1158Functions and methods that extend core crossfire objects. 1397Functions and methods that extend core deliantra objects.
1159 1398
1160=cut 1399=cut
1161 1400
1162package cf::player; 1401package cf::player;
1163 1402
1164use Coro::AIO; 1403use Coro::AIO;
1165 1404
1166=head3 cf::player 1405=head3 cf::player
1167 1406
1168=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}
1169 1422
1170=item cf::player::find $login 1423=item cf::player::find $login
1171 1424
1172Returns the given player object, loading it if necessary (might block). 1425Returns the given player object, loading it if necessary (might block).
1173 1426
1192 1445
1193sub exists($) { 1446sub exists($) {
1194 my ($login) = @_; 1447 my ($login) = @_;
1195 1448
1196 $cf::PLAYER{$login} 1449 $cf::PLAYER{$login}
1197 or cf::sync_job { !aio_stat path $login } 1450 or !aio_stat path $login
1198} 1451}
1199 1452
1200sub find($) { 1453sub find($) {
1201 return $cf::PLAYER{$_[0]} || do { 1454 return $cf::PLAYER{$_[0]} || do {
1202 my $login = $_[0]; 1455 my $login = $_[0];
1209 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1462 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1463 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1464 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212 aio_unlink +(playerdir $login) . "/$login.pl"; 1465 aio_unlink +(playerdir $login) . "/$login.pl";
1213 1466
1214 my $pl = load_pl path $login 1467 my $f = new_from_file cf::object::thawer path $login
1215 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;
1216 $cf::PLAYER{$login} = $pl 1475 $cf::PLAYER{$login} = $pl
1217 } 1476 }
1218 } 1477 }
1219} 1478}
1220 1479
1229 return if $pl->{deny_save}; 1488 return if $pl->{deny_save};
1230 1489
1231 aio_mkdir playerdir $pl, 0770; 1490 aio_mkdir playerdir $pl, 0770;
1232 $pl->{last_save} = $cf::RUNTIME; 1491 $pl->{last_save} = $cf::RUNTIME;
1233 1492
1493 cf::get_slot 0.01;
1494
1234 $pl->save_pl ($path); 1495 $pl->save_pl ($path);
1235 Coro::cede; 1496 cf::cede_to_tick;
1236} 1497}
1237 1498
1238sub new($) { 1499sub new($) {
1239 my ($login) = @_; 1500 my ($login) = @_;
1240 1501
1246 $cf::PLAYER{$login} = $self; 1507 $cf::PLAYER{$login} = $self;
1247 1508
1248 $self 1509 $self
1249} 1510}
1250 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
1251=item $pl->quit_character 1522=item $pl->quit_character
1252 1523
1253Nukes the player without looking back. If logged in, the connection will 1524Nukes the player without looking back. If logged in, the connection will
1254be destroyed. May block for a long time. 1525be destroyed. May block for a long time.
1255 1526
1259 my ($pl) = @_; 1530 my ($pl) = @_;
1260 1531
1261 my $name = $pl->ob->name; 1532 my $name = $pl->ob->name;
1262 1533
1263 $pl->{deny_save} = 1; 1534 $pl->{deny_save} = 1;
1264 $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
1265 1536
1266 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1537 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1267 $pl->deactivate; 1538 $pl->deactivate;
1539 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1540 $pl->ob->check_score;
1268 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1541 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1269 $pl->ns->destroy if $pl->ns; 1542 $pl->ns->destroy if $pl->ns;
1270 1543
1271 my $path = playerdir $pl; 1544 my $path = playerdir $pl;
1272 my $temp = "$path~$cf::RUNTIME~deleting~"; 1545 my $temp = "$path~$cf::RUNTIME~deleting~";
1308 or return []; 1581 or return [];
1309 1582
1310 my @logins; 1583 my @logins;
1311 1584
1312 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") {
1313 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1591 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314 aio_read $fh, 0, 512, my $buf, 0 or next; 1592 aio_read $fh, 0, 512, my $buf, 0 or next;
1315 $buf !~ /^password -------------$/m or next; # official not-valid tag 1593 $buf !~ /^password -------------$/m or next; # official not-valid tag
1594 }
1316 1595
1317 utf8::decode $login; 1596 utf8::decode $login;
1318 push @logins, $login; 1597 push @logins, $login;
1319 } 1598 }
1320 1599
1347 } 1626 }
1348 1627
1349 \@paths 1628 \@paths
1350} 1629}
1351 1630
1631=item $protocol_xml = $player->expand_cfpod ($cfpod)
1632
1633Expand deliantra pod fragments into protocol xml.
1634
1352=item $player->ext_reply ($msgid, %msg) 1635=item $player->ext_reply ($msgid, @msg)
1353 1636
1354Sends an ext reply to the player. 1637Sends an ext reply to the player.
1355 1638
1356=cut 1639=cut
1357 1640
1358sub ext_reply($$%) { 1641sub ext_reply($$@) {
1359 my ($self, $id, %msg) = @_; 1642 my ($self, $id, @msg) = @_;
1360 1643
1361 $msg{msgid} = $id; 1644 $self->ns->ext_reply ($id, @msg)
1362
1363 $self->send ("ext " . cf::to_json \%msg);
1364} 1645}
1365 1646
1366=item $player->ext_event ($type, %msg) 1647=item $player->ext_msg ($type, @msg)
1367 1648
1368Sends an ext event to the client. 1649Sends an ext event to the client.
1369 1650
1370=cut 1651=cut
1371 1652
1372sub ext_event($$%) { 1653sub ext_msg($$@) {
1373 my ($self, $type, %msg) = @_; 1654 my ($self, $type, @msg) = @_;
1374 1655
1375 $self->ns->ext_event ($type, %msg); 1656 $self->ns->ext_msg ($type, @msg);
1376} 1657}
1377 1658
1378=head3 cf::region 1659=head3 cf::region
1379 1660
1380=over 4 1661=over 4
1393 my ($path) = @_; 1674 my ($path) = @_;
1394 1675
1395 my ($match, $specificity); 1676 my ($match, $specificity);
1396 1677
1397 for my $region (list) { 1678 for my $region (list) {
1398 if ($region->match && $path =~ $region->match) { 1679 if ($region->{match} && $path =~ $region->{match}) {
1399 ($match, $specificity) = ($region, $region->specificity) 1680 ($match, $specificity) = ($region, $region->specificity)
1400 if $region->specificity > $specificity; 1681 if $region->specificity > $specificity;
1401 } 1682 }
1402 } 1683 }
1403 1684
1424our $MAX_RESET = 3600; 1705our $MAX_RESET = 3600;
1425our $DEFAULT_RESET = 3000; 1706our $DEFAULT_RESET = 3000;
1426 1707
1427sub generate_random_map { 1708sub generate_random_map {
1428 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
1429 # mit "rum" bekleckern, nicht 1713 # mit "rum" bekleckern, nicht
1430 $self->_create_random_map ( 1714 $self->_create_random_map (
1431 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1715 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1432 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1716 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1433 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1717 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1523 $self->init; # pass $1 etc. 1807 $self->init; # pass $1 etc.
1524 return $self; 1808 return $self;
1525 } 1809 }
1526 } 1810 }
1527 1811
1528 Carp::carp "unable to resolve path '$path' (base '$base')."; 1812 Carp::cluck "unable to resolve path '$path' (base '$base').";
1529 () 1813 ()
1530} 1814}
1531 1815
1532sub init { 1816sub init {
1533 my ($self) = @_; 1817 my ($self) = @_;
1555 1839
1556# the temporary/swap location 1840# the temporary/swap location
1557sub save_path { 1841sub save_path {
1558 my ($self) = @_; 1842 my ($self) = @_;
1559 1843
1560 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1844 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1561 "$TMPDIR/$path.map" 1845 "$TMPDIR/$path.map"
1562} 1846}
1563 1847
1564# the unique path, undef == no special unique path 1848# the unique path, undef == no special unique path
1565sub uniq_path { 1849sub uniq_path {
1566 my ($self) = @_; 1850 my ($self) = @_;
1567 1851
1568 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1852 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1569 "$UNIQUEDIR/$path" 1853 "$UNIQUEDIR/$path"
1570} 1854}
1571 1855
1572# and all this just because we cannot iterate over 1856# and all this just because we cannot iterate over
1573# all maps in C++... 1857# all maps in C++...
1596 1880
1597sub load_header_from($) { 1881sub load_header_from($) {
1598 my ($self, $path) = @_; 1882 my ($self, $path) = @_;
1599 1883
1600 utf8::encode $path; 1884 utf8::encode $path;
1601 #aio_open $path, O_RDONLY, 0 1885 my $f = new_from_file cf::object::thawer $path
1602 # or return;
1603
1604 $self->_load_header ($path)
1605 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;
1606 1893
1607 $self->{load_path} = $path; 1894 $self->{load_path} = $path;
1608 1895
1609 1 1896 1
1610} 1897}
1664sub find { 1951sub find {
1665 my ($path, $origin) = @_; 1952 my ($path, $origin) = @_;
1666 1953
1667 $path = normalise $path, $origin && $origin->path; 1954 $path = normalise $path, $origin && $origin->path;
1668 1955
1956 cf::lock_wait "map_data:$path";#d#remove
1669 cf::lock_wait "map_find:$path"; 1957 cf::lock_wait "map_find:$path";
1670 1958
1671 $cf::MAP{$path} || do { 1959 $cf::MAP{$path} || do {
1960 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1672 my $guard = cf::lock_acquire "map_find:$path"; 1961 my $guard2 = cf::lock_acquire "map_find:$path";
1962
1673 my $map = new_from_path cf::map $path 1963 my $map = new_from_path cf::map $path
1674 or return; 1964 or return;
1675 1965
1676 $map->{last_save} = $cf::RUNTIME; 1966 $map->{last_save} = $cf::RUNTIME;
1677 1967
1679 or return; 1969 or return;
1680 1970
1681 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1971 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1682 # doing this can freeze the server in a sync job, obviously 1972 # doing this can freeze the server in a sync job, obviously
1683 #$cf::WAIT_FOR_TICK->wait; 1973 #$cf::WAIT_FOR_TICK->wait;
1974 undef $guard2;
1975 undef $guard1;
1684 $map->reset; 1976 $map->reset;
1685 undef $guard;
1686 return find $path; 1977 return find $path;
1687 } 1978 }
1688 1979
1689 $cf::MAP{$path} = $map 1980 $cf::MAP{$path} = $map
1690 } 1981 }
1699 local $self->{deny_reset} = 1; # loading can take a long time 1990 local $self->{deny_reset} = 1; # loading can take a long time
1700 1991
1701 my $path = $self->{path}; 1992 my $path = $self->{path};
1702 1993
1703 { 1994 {
1704 my $guard = cf::lock_acquire "map_load:$path"; 1995 my $guard = cf::lock_acquire "map_data:$path";
1705 1996
1997 return unless $self->valid;
1706 return if $self->in_memory != cf::MAP_SWAPPED; 1998 return unless $self->in_memory == cf::MAP_SWAPPED;
1707 1999
1708 $self->in_memory (cf::MAP_LOADING); 2000 $self->in_memory (cf::MAP_LOADING);
1709 2001
1710 $self->alloc; 2002 $self->alloc;
1711 2003
1712 $self->pre_load; 2004 $self->pre_load;
1713 Coro::cede; 2005 cf::cede_to_tick;
1714 2006
2007 my $f = new_from_file cf::object::thawer $self->{load_path};
2008 $f->skip_block;
1715 $self->_load_objects ($self->{load_path}, 1) 2009 $self->_load_objects ($f)
1716 or return; 2010 or return;
1717 2011
1718 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2012 $self->post_load_original
1719 if delete $self->{load_original}; 2013 if delete $self->{load_original};
1720 2014
1721 if (my $uniq = $self->uniq_path) { 2015 if (my $uniq = $self->uniq_path) {
1722 utf8::encode $uniq; 2016 utf8::encode $uniq;
1723 if (aio_open $uniq, O_RDONLY, 0) { 2017 unless (aio_stat $uniq) {
2018 if (my $f = new_from_file cf::object::thawer $uniq) {
1724 $self->clear_unique_items; 2019 $self->clear_unique_items;
1725 $self->_load_objects ($uniq, 0); 2020 $self->_load_objects ($f);
2021 $f->resolve_delayed_derefs;
2022 }
1726 } 2023 }
1727 } 2024 }
1728 2025
1729 Coro::cede; 2026 $f->resolve_delayed_derefs;
2027
2028 cf::cede_to_tick;
1730 # now do the right thing for maps 2029 # now do the right thing for maps
1731 $self->link_multipart_objects; 2030 $self->link_multipart_objects;
1732 $self->difficulty ($self->estimate_difficulty) 2031 $self->difficulty ($self->estimate_difficulty)
1733 unless $self->difficulty; 2032 unless $self->difficulty;
1734 Coro::cede; 2033 cf::cede_to_tick;
1735 2034
1736 unless ($self->{deny_activate}) { 2035 unless ($self->{deny_activate}) {
1737 $self->decay_objects; 2036 $self->decay_objects;
1738 $self->fix_auto_apply; 2037 $self->fix_auto_apply;
1739 $self->update_buttons; 2038 $self->update_buttons;
1740 Coro::cede; 2039 cf::cede_to_tick;
1741 $self->set_darkness_map; 2040 $self->set_darkness_map;
1742 Coro::cede; 2041 cf::cede_to_tick;
1743 $self->activate; 2042 $self->activate;
1744 } 2043 }
1745 2044
2045 $self->{last_save} = $cf::RUNTIME;
2046 $self->last_access ($cf::RUNTIME);
2047
1746 $self->in_memory (cf::MAP_IN_MEMORY); 2048 $self->in_memory (cf::MAP_ACTIVE);
1747 } 2049 }
1748 2050
1749 $self->post_load; 2051 $self->post_load;
1750} 2052}
1751 2053
1760 2062
1761 $self 2063 $self
1762} 2064}
1763 2065
1764# 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
1765sub load_diag { 2067sub load_neighbours {
1766 my ($map) = @_; 2068 my ($map) = @_;
1767 2069
1768 my @diag; # diagonal neighbours 2070 my @neigh; # diagonal neighbours
1769 2071
1770 for (0 .. 3) { 2072 for (0 .. 3) {
1771 my $neigh = $map->tile_path ($_) 2073 my $neigh = $map->tile_path ($_)
1772 or next; 2074 or next;
1773 $neigh = find $neigh, $map 2075 $neigh = find $neigh, $map
1774 or next; 2076 or next;
1775 $neigh->load; 2077 $neigh->load;
1776 2078
2079 push @neigh,
1777 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2080 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1778 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2081 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1779 } 2082 }
1780 2083
1781 for (@diag) { 2084 for (grep defined $_->[0], @neigh) {
2085 my ($path, $origin) = @$_;
1782 my $neigh = find @$_ 2086 my $neigh = find $path, $origin
1783 or next; 2087 or next;
1784 $neigh->load; 2088 $neigh->load;
1785 } 2089 }
1786} 2090}
1787 2091
1792} 2096}
1793 2097
1794sub do_load_sync { 2098sub do_load_sync {
1795 my ($map) = @_; 2099 my ($map) = @_;
1796 2100
2101 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2102 if $Coro::current == $Coro::main;
2103
1797 cf::sync_job { $map->load }; 2104 cf::sync_job { $map->load };
1798} 2105}
1799 2106
1800our %MAP_PREFETCH; 2107our %MAP_PREFETCH;
1801our $MAP_PREFETCHER = undef; 2108our $MAP_PREFETCHER = undef;
1802 2109
1803sub find_async { 2110sub find_async {
1804 my ($path, $origin) = @_; 2111 my ($path, $origin, $load) = @_;
1805 2112
1806 $path = normalise $path, $origin && $origin->{path}; 2113 $path = normalise $path, $origin && $origin->{path};
1807 2114
1808 if (my $map = $cf::MAP{$path}) { 2115 if (my $map = $cf::MAP{$path}) {
1809 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2116 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1810 } 2117 }
1811 2118
1812 undef $MAP_PREFETCH{$path}; 2119 $MAP_PREFETCH{$path} |= $load;
2120
1813 $MAP_PREFETCHER ||= cf::async { 2121 $MAP_PREFETCHER ||= cf::async {
2122 $Coro::current->{desc} = "map prefetcher";
2123
1814 while (%MAP_PREFETCH) { 2124 while (%MAP_PREFETCH) {
1815 for my $path (keys %MAP_PREFETCH) { 2125 while (my ($k, $v) = each %MAP_PREFETCH) {
1816 my $map = find $path 2126 if (my $map = find $k) {
1817 or next;
1818 $map->load; 2127 $map->load if $v;
2128 }
1819 2129
1820 delete $MAP_PREFETCH{$path}; 2130 delete $MAP_PREFETCH{$k};
1821 } 2131 }
1822 } 2132 }
1823 undef $MAP_PREFETCHER; 2133 undef $MAP_PREFETCHER;
1824 }; 2134 };
1825 $MAP_PREFETCHER->prio (6); 2135 $MAP_PREFETCHER->prio (6);
1828} 2138}
1829 2139
1830sub save { 2140sub save {
1831 my ($self) = @_; 2141 my ($self) = @_;
1832 2142
1833 my $lock = cf::lock_acquire "map_data:" . $self->path; 2143 my $lock = cf::lock_acquire "map_data:$self->{path}";
1834 2144
1835 $self->{last_save} = $cf::RUNTIME; 2145 $self->{last_save} = $cf::RUNTIME;
1836 2146
1837 return unless $self->dirty; 2147 return unless $self->dirty;
1838 2148
1844 return if $self->{deny_save}; 2154 return if $self->{deny_save};
1845 2155
1846 local $self->{last_access} = $self->last_access;#d# 2156 local $self->{last_access} = $self->last_access;#d#
1847 2157
1848 cf::async { 2158 cf::async {
2159 $Coro::current->{desc} = "map player save";
1849 $_->contr->save for $self->players; 2160 $_->contr->save for $self->players;
1850 }; 2161 };
2162
2163 cf::get_slot 0.02;
1851 2164
1852 if ($uniq) { 2165 if ($uniq) {
1853 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1854 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2167 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1855 } else { 2168 } else {
1861 my ($self) = @_; 2174 my ($self) = @_;
1862 2175
1863 # save first because save cedes 2176 # save first because save cedes
1864 $self->save; 2177 $self->save;
1865 2178
1866 my $lock = cf::lock_acquire "map_data:" . $self->path; 2179 my $lock = cf::lock_acquire "map_data:$self->{path}";
1867 2180
1868 return if $self->players; 2181 return if $self->players;
1869 return if $self->in_memory != cf::MAP_IN_MEMORY; 2182 return if $self->in_memory != cf::MAP_ACTIVE;
1870 return if $self->{deny_save}; 2183 return if $self->{deny_save};
1871 2184
2185 $self->in_memory (cf::MAP_SWAPPED);
2186
2187 $self->deactivate;
2188 $_->clear_links_to ($self) for values %cf::MAP;
1872 $self->clear; 2189 $self->clear;
1873 $self->in_memory (cf::MAP_SWAPPED);
1874} 2190}
1875 2191
1876sub reset_at { 2192sub reset_at {
1877 my ($self) = @_; 2193 my ($self) = @_;
1878 2194
1910 if $uniq; 2226 if $uniq;
1911 } 2227 }
1912 2228
1913 delete $cf::MAP{$self->path}; 2229 delete $cf::MAP{$self->path};
1914 2230
2231 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP;
1915 $self->clear; 2233 $self->clear;
1916
1917 $_->clear_links_to ($self) for values %cf::MAP;
1918 2234
1919 $self->unlink_save; 2235 $self->unlink_save;
1920 $self->destroy; 2236 $self->destroy;
1921} 2237}
1922 2238
1923my $nuke_counter = "aaaa"; 2239my $nuke_counter = "aaaa";
1924 2240
1925sub nuke { 2241sub nuke {
1926 my ($self) = @_; 2242 my ($self) = @_;
1927 2243
2244 {
2245 my $lock = cf::lock_acquire "map_data:$self->{path}";
2246
1928 delete $cf::MAP{$self->path}; 2247 delete $cf::MAP{$self->path};
1929 2248
1930 $self->unlink_save; 2249 $self->unlink_save;
1931 2250
1932 bless $self, "cf::map"; 2251 bless $self, "cf::map";
1933 delete $self->{deny_reset}; 2252 delete $self->{deny_reset};
1934 $self->{deny_save} = 1; 2253 $self->{deny_save} = 1;
1935 $self->reset_timeout (1); 2254 $self->reset_timeout (1);
1936 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2255 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1937 2256
1938 $cf::MAP{$self->path} = $self; 2257 $cf::MAP{$self->path} = $self;
2258 }
1939 2259
1940 $self->reset; # polite request, might not happen 2260 $self->reset; # polite request, might not happen
1941} 2261}
1942 2262
1943=item $maps = cf::map::tmp_maps 2263=item $maps = cf::map::tmp_maps
1985 2305
1986sub unique_maps() { 2306sub unique_maps() {
1987 [ 2307 [
1988 map { 2308 map {
1989 utf8::decode $_; 2309 utf8::decode $_;
1990 /\.map$/ 2310 s/\.map$//; # TODO future compatibility hack
2311 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2312 ? ()
1991 ? normalise $_ 2313 : normalise $_
1992 : ()
1993 } @{ aio_readdir $UNIQUEDIR or [] } 2314 } @{ aio_readdir $UNIQUEDIR or [] }
1994 ] 2315 ]
1995} 2316}
1996 2317
1997package cf;
1998
1999=back 2318=back
2000 2319
2001=head3 cf::object 2320=head3 cf::object
2002 2321
2003=cut 2322=cut
2006 2325
2007=over 4 2326=over 4
2008 2327
2009=item $ob->inv_recursive 2328=item $ob->inv_recursive
2010 2329
2011Returns 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.
2012 2332
2013=cut 2333=cut
2014 2334
2015sub inv_recursive_; 2335sub inv_recursive_;
2016sub inv_recursive_ { 2336sub inv_recursive_ {
2019 2339
2020sub inv_recursive { 2340sub inv_recursive {
2021 inv_recursive_ inv $_[0] 2341 inv_recursive_ inv $_[0]
2022} 2342}
2023 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
2024package cf; 2372package cf;
2025 2373
2026=back 2374=back
2027 2375
2028=head3 cf::object::player 2376=head3 cf::object::player
2034Sends 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>
2035can 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
2036dialogue with the given NPC character. 2384dialogue with the given NPC character.
2037 2385
2038=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};
2039 2401
2040# rough implementation of a future "reply" method that works 2402# rough implementation of a future "reply" method that works
2041# with dialog boxes. 2403# with dialog boxes.
2042#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
2043sub cf::object::player::reply($$$;$) { 2405sub cf::object::player::reply($$$;$) {
2050 2412
2051 } else { 2413 } else {
2052 my $pl = $self->contr; 2414 my $pl = $self->contr;
2053 2415
2054 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2416 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2055 my $diag = $pl->{npc_dialog}; 2417 my $dialog = $pl->{npc_dialog};
2056 $diag->{pl}->ext_reply ( 2418 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2057 $diag->{id}, msgtype => "reply", msg => $msg, add_topics => []
2058 );
2059 2419
2060 } else { 2420 } else {
2061 $msg = $npc->name . " says: $msg" if $npc; 2421 $msg = $npc->name . " says: $msg" if $npc;
2062 $self->message ($msg, $flags); 2422 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2063 } 2423 }
2064 } 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 (@_);
2065} 2435}
2066 2436
2067=item $player_object->may ("access") 2437=item $player_object->may ("access")
2068 2438
2069Returns wether the given player is authorized to access resource "access" 2439Returns wether the given player is authorized to access resource "access"
2082 2452
2083=item $player_object->enter_link 2453=item $player_object->enter_link
2084 2454
2085Freezes 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}>).
2086 2456
2087The 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.
2088I<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.
2089 2461
2090Will never block. 2462Will never block.
2091 2463
2092=item $player_object->leave_link ($map, $x, $y) 2464=item $player_object->leave_link ($map, $x, $y)
2093 2465
2148 # use -1 or undef as default coordinates, not 0, 0 2520 # use -1 or undef as default coordinates, not 0, 0
2149 ($x, $y) = ($map->enter_x, $map->enter_y) 2521 ($x, $y) = ($map->enter_x, $map->enter_y)
2150 if $x <=0 && $y <= 0; 2522 if $x <=0 && $y <= 0;
2151 2523
2152 $map->load; 2524 $map->load;
2153 $map->load_diag; 2525 $map->load_neighbours;
2154 2526
2155 return unless $self->contr->active; 2527 return unless $self->contr->active;
2528 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2156 $self->activate_recursive; 2529 $self->activate_recursive;
2157 2530
2158 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2159 $self->enter_map ($map, $x, $y); 2532 $self->enter_map ($map, $x, $y);
2160} 2533}
2161 2534
2162=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2535=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2163 2536
2164Moves the player to the given map-path and coordinates by first freezing 2537Moves the player to the given map-path and coordinates by first freezing
2165her, loading and preparing them map, calling the provided $check callback 2538her, loading and preparing them map, calling the provided $check callback
2166that 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
2167the new (success) or old (failed) map position. 2540the new (success) or old (failed) map position. In either case, $done will
2541be called at the end of this process.
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 >>.
2168 2545
2169=cut 2546=cut
2170 2547
2171our $GOTOGEN; 2548our $GOTOGEN;
2172 2549
2173sub cf::object::player::goto { 2550sub cf::object::player::goto {
2174 my ($self, $path, $x, $y, $check) = @_; 2551 my ($self, $path, $x, $y, $check, $done) = @_;
2175 2552
2176 # do generation counting so two concurrent goto's will be executed in-order 2553 # do generation counting so two concurrent goto's will be executed in-order
2177 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2554 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2178 2555
2179 $self->enter_link; 2556 $self->enter_link;
2180 2557
2181 (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
2182 my $map = eval { 2580 my $map = eval {
2183 my $map = cf::map::find $path; 2581 my $map = defined $path ? cf::map::find $path : undef;
2184 2582
2185 if ($map) { 2583 if ($map) {
2186 $map = $map->customise_for ($self); 2584 $map = $map->customise_for ($self);
2187 $map = $check->($map) if $check && $map; 2585 $map = $check->($map) if $check && $map;
2188 } else { 2586 } else {
2189 $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);
2190 } 2588 }
2191 2589
2192 $map 2590 $map
2193 }; 2591 };
2194 2592
2199 2597
2200 if ($gen == $self->{_goto_generation}) { 2598 if ($gen == $self->{_goto_generation}) {
2201 delete $self->{_goto_generation}; 2599 delete $self->{_goto_generation};
2202 $self->leave_link ($map, $x, $y); 2600 $self->leave_link ($map, $x, $y);
2203 } 2601 }
2602
2603 $done->() if $done;
2204 })->prio (1); 2604 })->prio (1);
2205} 2605}
2206 2606
2207=item $player_object->enter_exit ($exit_object) 2607=item $player_object->enter_exit ($exit_object)
2208 2608
2228} 2628}
2229 2629
2230sub prepare_random_map { 2630sub prepare_random_map {
2231 my ($exit) = @_; 2631 my ($exit) = @_;
2232 2632
2233 my $guard = cf::lock_acquire "exit_prepare:$exit";
2234
2235 # all this does is basically replace the /! path by 2633 # all this does is basically replace the /! path by
2236 # a new random map path (?random/...) with a seed 2634 # a new random map path (?random/...) with a seed
2237 # that depends on the exit object 2635 # that depends on the exit object
2238 2636
2239 my $rmp = parse_random_map_params $exit->msg; 2637 my $rmp = parse_random_map_params $exit->msg;
2241 if ($exit->map) { 2639 if ($exit->map) {
2242 $rmp->{region} = $exit->region->name; 2640 $rmp->{region} = $exit->region->name;
2243 $rmp->{origin_map} = $exit->map->path; 2641 $rmp->{origin_map} = $exit->map->path;
2244 $rmp->{origin_x} = $exit->x; 2642 $rmp->{origin_x} = $exit->x;
2245 $rmp->{origin_y} = $exit->y; 2643 $rmp->{origin_y} = $exit->y;
2644
2645 $exit->map->touch;
2246 } 2646 }
2247 2647
2248 $rmp->{random_seed} ||= $exit->random_seed; 2648 $rmp->{random_seed} ||= $exit->random_seed;
2249 2649
2250 my $data = cf::to_json $rmp; 2650 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2251 my $md5 = Digest::MD5::md5_hex $data; 2651 my $md5 = Digest::MD5::md5_hex $data;
2252 my $meta = "$RANDOMDIR/$md5.meta"; 2652 my $meta = "$RANDOMDIR/$md5.meta";
2253 2653
2254 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2654 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2255 aio_write $fh, 0, (length $data), $data, 0; 2655 aio_write $fh, 0, (length $data), $data, 0;
2256 undef $fh; 2656 undef $fh;
2257 aio_rename "$meta~", $meta; 2657 aio_rename "$meta~", $meta;
2258 2658
2659 my $slaying = "?random/$md5";
2660
2661 if ($exit->valid) {
2259 $exit->slaying ("?random/$md5"); 2662 $exit->slaying ("?random/$md5");
2260 $exit->msg (undef); 2663 $exit->msg (undef);
2664 }
2261 } 2665 }
2262} 2666}
2263 2667
2264sub cf::object::player::enter_exit { 2668sub cf::object::player::enter_exit {
2265 my ($self, $exit) = @_; 2669 my ($self, $exit) = @_;
2266 2670
2267 return unless $self->type == cf::PLAYER; 2671 return unless $self->type == cf::PLAYER;
2268 2672
2269 if ($exit->slaying eq "/!") {
2270 #TODO: this should de-fi-ni-te-ly not be a sync-job
2271 # the problem is that $exit might not survive long enough
2272 # so it needs to be done right now, right here
2273 cf::sync_job { prepare_random_map $exit };
2274 }
2275
2276 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2277 my $hp = $exit->stats->hp;
2278 my $sp = $exit->stats->sp;
2279
2280 $self->enter_link; 2673 $self->enter_link;
2281 2674
2282 (async { 2675 (async {
2283 $self->deactivate_recursive; # just to be sure 2676 $Coro::current->{desc} = "enter_exit";
2677
2284 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
2285 $self->goto ($slaying, $hp, $sp); 2693 $self->goto ($map, $x, $y);
2286 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
2287 1; 2699 1
2288 }) { 2700 }) {
2289 $self->message ("Something went wrong deep within the crossfire server. " 2701 $self->message ("Something went wrong deep within the deliantra server. "
2290 . "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. "
2291 . "Please report this to the dungeon master!", 2703 . "Please report this to the dungeon master!",
2292 cf::NDI_UNIQUE | cf::NDI_RED); 2704 cf::NDI_UNIQUE | cf::NDI_RED);
2293 2705
2294 warn "ERROR in enter_exit: $@"; 2706 warn "ERROR in enter_exit: $@";
2313 2725
2314 utf8::encode $text; 2726 utf8::encode $text;
2315 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2727 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2316} 2728}
2317 2729
2730=item $client->send_msg ($channel, $msg, $color, [extra...])
2731
2732Send a drawinfo or msg packet to the client, formatting the msg for the
2733client if neccessary. C<$type> should be a string identifying the type of
2734the message, with C<log> being the default. If C<$color> is negative, suppress
2735the message unless the client supports the msg packet.
2736
2737=cut
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
2803sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_;
2805
2806 $msg = $self->pl->expand_cfpod ($msg)
2807 unless $color & cf::NDI_VERBATIM;
2808
2809 $color &= cf::NDI_CLIENT_MASK; # just in case...
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
2820 } elsif (ref $channel) {
2821 # send meta info to client, if not yet sent
2822 unless (exists $self->{channel}{$channel->{id}}) {
2823 $self->{channel}{$channel->{id}} = $channel;
2824 $self->ext_msg (channel_info => $channel)
2825 if $self->can_msg;
2826 }
2827
2828 $channel = $channel->{id};
2829 }
2830
2831 return unless @extra || length $msg;
2832
2833 if ($self->can_msg) {
2834 # default colour, mask it out
2835 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2836 if $color & cf::NDI_DEF;
2837
2838 my $pkt = "msg "
2839 . $self->{json_coder}->encode (
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);
2854 } else {
2855 if ($color >= 0) {
2856 # replace some tags by gcfclient-compatible ones
2857 for ($msg) {
2858 1 while
2859 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2860 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2861 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2862 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2863 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2864 }
2865
2866 $color &= cf::NDI_COLOR_MASK;
2867
2868 utf8::encode $msg;
2869
2870 if (0 && $msg =~ /\[/) {
2871 # COMMAND/INFO
2872 $self->send_packet ("drawextinfo $color 10 8 $msg")
2873 } else {
2874 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2875 $self->send_packet ("drawinfo $color $msg")
2876 }
2877 }
2878 }
2879}
2880
2318=item $client->ext_event ($type, %msg) 2881=item $client->ext_msg ($type, @msg)
2319 2882
2320Sends an exti event to the client. 2883Sends an ext event to the client.
2321 2884
2322=cut 2885=cut
2323 2886
2324sub cf::client::ext_event($$%) { 2887sub cf::client::ext_msg($$@) {
2325 my ($self, $type, %msg) = @_; 2888 my ($self, $type, @msg) = @_;
2326 2889
2890 if ($self->extcmd == 2) {
2891 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2892 } elsif ($self->extcmd == 1) { # TODO: remove
2327 $msg{msgtype} = "event_$type"; 2893 push @msg, msgtype => "event_$type";
2328 $self->send_packet ("ext " . cf::to_json \%msg); 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;
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2913 }
2329} 2914}
2330 2915
2331=item $success = $client->query ($flags, "text", \&cb) 2916=item $success = $client->query ($flags, "text", \&cb)
2332 2917
2333Queues a query to the client, calling the given callback with 2918Queues a query to the client, calling the given callback with
2334the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2919the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2335C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2920C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2336 2921
2337Queries can fail, so check the return code. Or don't, as queries will become 2922Queries can fail, so check the return code. Or don't, as queries will
2338reliable at some point in the future. 2923become reliable at some point in the future.
2339 2924
2340=cut 2925=cut
2341 2926
2342sub cf::client::query { 2927sub cf::client::query {
2343 my ($self, $flags, $text, $cb) = @_; 2928 my ($self, $flags, $text, $cb) = @_;
2351 utf8::encode $text; 2936 utf8::encode $text;
2352 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2937 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2353 2938
2354 $self->send_packet ($self->{query_queue}[0][0]) 2939 $self->send_packet ($self->{query_queue}[0][0])
2355 if @{ $self->{query_queue} } == 1; 2940 if @{ $self->{query_queue} } == 1;
2941
2942 1
2356} 2943}
2357 2944
2358cf::client->attach ( 2945cf::client->attach (
2946 on_connect => sub {
2947 my ($ns) = @_;
2948
2949 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2950 },
2359 on_reply => sub { 2951 on_reply => sub {
2360 my ($ns, $msg) = @_; 2952 my ($ns, $msg) = @_;
2361 2953
2362 # this weird shuffling is so that direct followup queries 2954 # this weird shuffling is so that direct followup queries
2363 # get handled first 2955 # get handled first
2375 } else { 2967 } else {
2376 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2968 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2377 } 2969 }
2378 } 2970 }
2379 }, 2971 },
2972 on_exticmd => sub {
2973 my ($ns, $buf) = @_;
2974
2975 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2976
2977 if (ref $msg) {
2978 my ($type, $reply, @payload) =
2979 "ARRAY" eq ref $msg
2980 ? @$msg
2981 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2982
2983 my @reply;
2984
2985 if (my $cb = $EXTICMD{$type}) {
2986 @reply = $cb->($ns, @payload);
2987 }
2988
2989 $ns->ext_reply ($reply, @reply)
2990 if $reply;
2991
2992 } else {
2993 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2994 }
2995
2996 cf::override;
2997 },
2380); 2998);
2381 2999
2382=item $client->async (\&cb) 3000=item $client->async (\&cb)
2383 3001
2384Create a new coroutine, running the specified callback. The coroutine will 3002Create a new coroutine, running the specified callback. The coroutine will
2425our $safe = new Safe "safe"; 3043our $safe = new Safe "safe";
2426our $safe_hole = new Safe::Hole; 3044our $safe_hole = new Safe::Hole;
2427 3045
2428$SIG{FPE} = 'IGNORE'; 3046$SIG{FPE} = 'IGNORE';
2429 3047
2430$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));
2431 3053
2432# here we export the classes and methods available to script code 3054# here we export the classes and methods available to script code
2433 3055
2434=pod 3056=pod
2435 3057
2436The following functions and methods are available within a safe environment: 3058The following functions and methods are available within a safe environment:
2437 3059
2438 cf::object contr pay_amount pay_player map 3060 cf::object
3061 contr pay_amount pay_player map x y force_find force_add destroy
3062 insert remove name archname title slaying race decrease split
3063
2439 cf::object::player player 3064 cf::object::player
2440 cf::player peaceful 3065 player
2441 cf::map trigger 3066
3067 cf::player
3068 peaceful
3069
3070 cf::map
3071 trigger
2442 3072
2443=cut 3073=cut
2444 3074
2445for ( 3075for (
2446 ["cf::object" => qw(contr pay_amount pay_player map)], 3076 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3077 insert remove inv nrof name archname title slaying race
3078 decrease split destroy change_exp)],
2447 ["cf::object::player" => qw(player)], 3079 ["cf::object::player" => qw(player)],
2448 ["cf::player" => qw(peaceful)], 3080 ["cf::player" => qw(peaceful)],
2449 ["cf::map" => qw(trigger)], 3081 ["cf::map" => qw(trigger)],
2450) { 3082) {
2451 no strict 'refs'; 3083 no strict 'refs';
2527# the server's init and main functions 3159# the server's init and main functions
2528 3160
2529sub load_facedata($) { 3161sub load_facedata($) {
2530 my ($path) = @_; 3162 my ($path) = @_;
2531 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
2532 warn "loading facedata from $path\n"; 3170 warn "loading facedata from $path\n";
2533 3171
2534 my $facedata; 3172 my $facedata;
2535 0 < aio_load $path, $facedata 3173 0 < aio_load $path, $facedata
2536 or die "$path: $!"; 3174 or die "$path: $!";
2538 $facedata = Coro::Storable::thaw $facedata; 3176 $facedata = Coro::Storable::thaw $facedata;
2539 3177
2540 $facedata->{version} == 2 3178 $facedata->{version} == 2
2541 or cf::cleanup "$path: version mismatch, cannot proceed."; 3179 or cf::cleanup "$path: version mismatch, cannot proceed.";
2542 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
2543 { 3188 {
2544 my $faces = $facedata->{faceinfo}; 3189 my $faces = $facedata->{faceinfo};
2545 3190
2546 while (my ($face, $info) = each %$faces) { 3191 while (my ($face, $info) = each %$faces) {
2547 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3192 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3193
2548 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3194 cf::face::set_visibility $idx, $info->{visibility};
3195 cf::face::set_magicmap $idx, $info->{magicmap};
2549 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3196 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2550 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3197 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2551 Coro::cede; 3198
3199 cf::cede_to_tick;
2552 } 3200 }
2553 3201
2554 while (my ($face, $info) = each %$faces) { 3202 while (my ($face, $info) = each %$faces) {
2555 next unless $info->{smooth}; 3203 next unless $info->{smooth};
3204
2556 my $idx = cf::face::find $face 3205 my $idx = cf::face::find $face
2557 or next; 3206 or next;
3207
2558 if (my $smooth = cf::face::find $info->{smooth}) { 3208 if (my $smooth = cf::face::find $info->{smooth}) {
3209 cf::face::set_smooth $idx, $smooth;
2559 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3210 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2560 } else { 3211 } else {
2561 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3212 warn "smooth face '$info->{smooth}' not found for face '$face'";
2562 } 3213 }
2563 Coro::cede; 3214
3215 cf::cede_to_tick;
2564 } 3216 }
2565 } 3217 }
2566 3218
2567 { 3219 {
2568 my $anims = $facedata->{animinfo}; 3220 my $anims = $facedata->{animinfo};
2569 3221
2570 while (my ($anim, $info) = each %$anims) { 3222 while (my ($anim, $info) = each %$anims) {
2571 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3223 cf::anim::set $anim, $info->{frames}, $info->{facings};
2572 Coro::cede; 3224 cf::cede_to_tick;
2573 } 3225 }
2574 3226
2575 cf::anim::invalidate_all; # d'oh 3227 cf::anim::invalidate_all; # d'oh
2576 } 3228 }
2577 3229
3230 {
3231 # TODO: for gcfclient pleasure, we should give resources
3232 # that gcfclient doesn't grok a >10000 face index.
3233 my $res = $facedata->{resource};
3234
3235 while (my ($name, $info) = each %$res) {
3236 if (defined $info->{type}) {
3237 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3238 my $data;
3239
3240 if ($info->{type} & 1) {
3241 # prepend meta info
3242
3243 my $meta = $enc->encode ({
3244 name => $name,
3245 %{ $info->{meta} || {} },
3246 });
3247
3248 $data = pack "(w/a*)*", $meta, $info->{data};
3249 } else {
3250 $data = $info->{data};
3251 }
3252
3253 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3254 cf::face::set_type $idx, $info->{type};
3255 } else {
3256 $RESOURCE{$name} = $info;
3257 }
3258
3259 cf::cede_to_tick;
3260 }
3261 }
3262
3263 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3264
2578 1 3265 1
2579} 3266}
2580 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});
3287
3288register_exticmd fx_want => sub {
3289 my ($ns, $want) = @_;
3290
3291 while (my ($k, $v) = each %$want) {
3292 $ns->fx_want ($k, $v);
3293 }
3294};
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
2581sub 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
2582 load_resource_file "$MAPDIR/regions" 3311 load_resource_file "$MAPDIR/regions"
2583 or die "unable to load regions file\n"; 3312 or die "unable to load regions file\n";
3313
3314 for (cf::region::list) {
3315 $_->{match} = qr/$_->{match}/
3316 if exists $_->{match};
3317 }
2584} 3318}
2585 3319
2586sub reload_facedata { 3320sub reload_facedata {
2587 load_facedata "$DATADIR/facedata" 3321 load_facedata "$DATADIR/facedata"
2588 or die "unable to load facedata\n"; 3322 or die "unable to load facedata\n";
2599} 3333}
2600 3334
2601sub reload_resources { 3335sub reload_resources {
2602 warn "reloading resource files...\n"; 3336 warn "reloading resource files...\n";
2603 3337
3338 reload_facedata;
3339 reload_archetypes;
2604 reload_regions; 3340 reload_regions;
2605 reload_facedata;
2606 #reload_archetypes;#d#
2607 reload_archetypes;
2608 reload_treasures; 3341 reload_treasures;
2609 3342
2610 warn "finished reloading resource files\n"; 3343 warn "finished reloading resource files\n";
2611} 3344}
2612 3345
2613sub init { 3346sub init {
3347 my $guard = freeze_mainloop;
3348
3349 evthread_start IO::AIO::poll_fileno;
3350
2614 reload_resources; 3351 reload_resources;
2615} 3352}
2616 3353
2617sub cfg_load { 3354sub reload_config {
2618 open my $fh, "<:utf8", "$CONFDIR/config" 3355 open my $fh, "<:utf8", "$CONFDIR/config"
2619 or return; 3356 or return;
2620 3357
2621 local $/; 3358 local $/;
2622 *CFG = YAML::Syck::Load <$fh>; 3359 *CFG = YAML::Load <$fh>;
2623 3360
2624 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3361 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2625 3362
2626 $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};
2627 $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};
2633 }; 3370 };
2634 warn $@ if $@; 3371 warn $@ if $@;
2635 } 3372 }
2636} 3373}
2637 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
2638sub main { 3394sub main {
3395 atomic;
3396
2639 # we must not ever block the main coroutine 3397 # we must not ever block the main coroutine
2640 local $Coro::idle = sub { 3398 local $Coro::idle = sub {
2641 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#
2642 (async { 3400 (async {
2643 Event::one_event; 3401 $Coro::current->{desc} = "IDLE BUG HANDLER";
3402 EV::loop EV::LOOP_ONESHOT;
2644 })->prio (Coro::PRIO_MAX); 3403 })->prio (Coro::PRIO_MAX);
2645 }; 3404 };
2646 3405
2647 cfg_load; 3406 {
3407 my $guard = freeze_mainloop;
3408 reload_config;
2648 db_init; 3409 db_init;
2649 load_extensions; 3410 load_extensions;
2650 3411
2651 $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
2652 Event::loop; 3420 EV::loop;
2653} 3421}
2654 3422
2655############################################################################# 3423#############################################################################
2656# initialisation and cleanup 3424# initialisation and cleanup
2657 3425
2658# install some emergency cleanup handlers 3426# install some emergency cleanup handlers
2659BEGIN { 3427BEGIN {
3428 our %SIGWATCHER = ();
2660 for my $signal (qw(INT HUP TERM)) { 3429 for my $signal (qw(INT HUP TERM)) {
2661 Event->signal ( 3430 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2662 reentrant => 0,
2663 data => WF_AUTOCANCEL,
2664 signal => $signal,
2665 prio => 0,
2666 cb => sub {
2667 cf::cleanup "SIG$signal"; 3431 cf::cleanup "SIG$signal";
2668 },
2669 ); 3432 };
2670 } 3433 }
2671} 3434}
2672 3435
2673sub write_runtime { 3436sub write_runtime_sync {
2674 my $runtime = "$LOCALDIR/runtime";
2675
2676 # first touch the runtime file to show we are still running: 3437 # first touch the runtime file to show we are still running:
2677 # the fsync below can take a very very long time. 3438 # the fsync below can take a very very long time.
2678 3439
2679 IO::AIO::aio_utime $runtime, undef, undef; 3440 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2680 3441
2681 my $guard = cf::lock_acquire "write_runtime"; 3442 my $guard = cf::lock_acquire "write_runtime";
2682 3443
2683 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3444 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2684 or return; 3445 or return;
2685 3446
2686 my $value = $cf::RUNTIME + 90 + 10; 3447 my $value = $cf::RUNTIME + 90 + 10;
2687 # 10 is the runtime save interval, for a monotonic clock 3448 # 10 is the runtime save interval, for a monotonic clock
2688 # 60 allows for the watchdog to kill the server. 3449 # 60 allows for the watchdog to kill the server.
2698 aio_utime $fh, undef, undef; 3459 aio_utime $fh, undef, undef;
2699 3460
2700 close $fh 3461 close $fh
2701 or return; 3462 or return;
2702 3463
2703 aio_rename "$runtime~", $runtime 3464 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2704 and return; 3465 and return;
2705 3466
2706 warn "runtime file written.\n"; 3467 warn "runtime file written.\n";
2707 3468
2708 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 };
2709} 3513}
2710 3514
2711sub emergency_save() { 3515sub emergency_save() {
2712 my $freeze_guard = cf::freeze_mainloop; 3516 my $freeze_guard = cf::freeze_mainloop;
2713 3517
2719 # and maps saved/destroyed asynchronously. 3523 # and maps saved/destroyed asynchronously.
2720 warn "begin emergency player save\n"; 3524 warn "begin emergency player save\n";
2721 for my $login (keys %cf::PLAYER) { 3525 for my $login (keys %cf::PLAYER) {
2722 my $pl = $cf::PLAYER{$login} or next; 3526 my $pl = $cf::PLAYER{$login} or next;
2723 $pl->valid or next; 3527 $pl->valid or next;
3528 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2724 $pl->save; 3529 $pl->save;
2725 } 3530 }
2726 warn "end emergency player save\n"; 3531 warn "end emergency player save\n";
2727 3532
2728 warn "begin emergency map save\n"; 3533 warn "begin emergency map save\n";
2734 warn "end emergency map save\n"; 3539 warn "end emergency map save\n";
2735 3540
2736 warn "begin emergency database checkpoint\n"; 3541 warn "begin emergency database checkpoint\n";
2737 BDB::db_env_txn_checkpoint $DB_ENV; 3542 BDB::db_env_txn_checkpoint $DB_ENV;
2738 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";
2739 }; 3548 };
2740 3549
2741 warn "leave emergency perl save\n"; 3550 warn "leave emergency perl save\n";
2742} 3551}
2743 3552
2744sub post_cleanup { 3553sub post_cleanup {
2745 my ($make_core) = @_; 3554 my ($make_core) = @_;
2746 3555
2747 warn Carp::longmess "post_cleanup backtrace" 3556 warn Carp::longmess "post_cleanup backtrace"
2748 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#
2749} 3587}
2750 3588
2751sub do_reload_perl() { 3589sub do_reload_perl() {
2752 # can/must only be called in main 3590 # can/must only be called in main
2753 if ($Coro::current != $Coro::main) { 3591 if ($Coro::current != $Coro::main) {
2754 warn "can only reload from main coroutine"; 3592 warn "can only reload from main coroutine";
2755 return; 3593 return;
2756 } 3594 }
2757 3595
3596 return if $RELOAD++;
3597
3598 while ($RELOAD) {
2758 warn "reloading..."; 3599 warn "reloading...";
2759 3600
2760 warn "entering sync_job"; 3601 warn "entering sync_job";
2761 3602
2762 cf::sync_job { 3603 cf::sync_job {
2763 cf::write_runtime; # external watchdog should not bark 3604 cf::write_runtime_sync; # external watchdog should not bark
2764 cf::emergency_save; 3605 cf::emergency_save;
2765 cf::write_runtime; # external watchdog should not bark 3606 cf::write_runtime_sync; # external watchdog should not bark
2766 3607
2767 warn "syncing database to disk"; 3608 warn "syncing database to disk";
2768 BDB::db_env_txn_checkpoint $DB_ENV; 3609 BDB::db_env_txn_checkpoint $DB_ENV;
2769 3610
2770 # 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
2771 3612
2772 warn "cancelling all WF_AUTOCANCEL watchers";
2773 for (Event::all_watchers) {
2774 $_->cancel if $_->data & WF_AUTOCANCEL;
2775 }
2776
2777 warn "flushing outstanding aio requests"; 3613 warn "flushing outstanding aio requests";
2778 for (;;) {
2779 BDB::flush;
2780 IO::AIO::flush;
2781 Coro::cede;
2782 last unless IO::AIO::nreqs || BDB::nreqs; 3614 while (IO::AIO::nreqs || BDB::nreqs) {
2783 warn "iterate..."; 3615 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2784 }
2785
2786 ++$RELOAD;
2787
2788 warn "cancelling all extension coros";
2789 $_->cancel for values %EXT_CORO;
2790 %EXT_CORO = ();
2791
2792 warn "removing commands";
2793 %COMMAND = ();
2794
2795 warn "removing ext commands";
2796 %EXTCMD = ();
2797
2798 warn "unloading/nuking all extensions";
2799 for my $pkg (@EXTS) {
2800 warn "... unloading $pkg";
2801
2802 if (my $cb = $pkg->can ("unload")) {
2803 eval {
2804 $cb->($pkg);
2805 1
2806 } or warn "$pkg unloaded, but with errors: $@";
2807 } 3616 }
2808 3617
2809 warn "... nuking $pkg"; 3618 warn "cancelling all extension coros";
2810 Symbol::delete_package $pkg; 3619 $_->cancel for values %EXT_CORO;
2811 } 3620 %EXT_CORO = ();
2812 3621
2813 warn "unloading all perl modules loaded from $LIBDIR"; 3622 warn "removing commands";
2814 while (my ($k, $v) = each %INC) { 3623 %COMMAND = ();
2815 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2816 3624
3625 warn "removing ext/exti commands";
3626 %EXTCMD = ();
3627 %EXTICMD = ();
3628
3629 warn "unloading/nuking all extensions";
3630 for my $pkg (@EXTS) {
2817 warn "... unloading $k"; 3631 warn "... unloading $pkg";
2818 delete $INC{$k};
2819 3632
2820 $k =~ s/\.pm$//;
2821 $k =~ s/\//::/g;
2822
2823 if (my $cb = $k->can ("unload_module")) { 3633 if (my $cb = $pkg->can ("unload")) {
3634 eval {
2824 $cb->(); 3635 $cb->($pkg);
3636 1
3637 } or warn "$pkg unloaded, but with errors: $@";
3638 }
3639
3640 warn "... clearing $pkg";
3641 clear_package $pkg;
2825 } 3642 }
2826 3643
2827 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;
2828 } 3659 }
2829 3660
2830 warn "getting rid of safe::, as good as possible"; 3661 warn "getting rid of safe::, as good as possible";
2831 Symbol::delete_package "safe::$_" 3662 clear_package "safe::$_"
2832 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);
2833 3664
2834 warn "unloading cf.pm \"a bit\""; 3665 warn "unloading cf.pm \"a bit\"";
2835 delete $INC{"cf.pm"}; 3666 delete $INC{"cf.pm"};
2836 delete $INC{"cf/pod.pm"}; 3667 delete $INC{"cf/pod.pm"};
2837 3668
2838 # don't, removes xs symbols, too, 3669 # don't, removes xs symbols, too,
2839 # and global variables created in xs 3670 # and global variables created in xs
2840 #Symbol::delete_package __PACKAGE__; 3671 #clear_package __PACKAGE__;
2841 3672
2842 warn "unload completed, starting to reload now"; 3673 warn "unload completed, starting to reload now";
2843 3674
2844 warn "reloading cf.pm"; 3675 warn "reloading cf.pm";
2845 require cf; 3676 require cf;
2846 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3677 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2847 3678
2848 warn "loading config and database again"; 3679 warn "loading config and database again";
2849 cf::cfg_load; 3680 cf::reload_config;
2850 3681
2851 warn "loading extensions"; 3682 warn "loading extensions";
2852 cf::load_extensions; 3683 cf::load_extensions;
2853 3684
2854 warn "reattaching attachments to objects/players"; 3685 warn "reattaching attachments to objects/players";
2855 _global_reattach; # objects, sockets 3686 _global_reattach; # objects, sockets
2856 warn "reattaching attachments to maps"; 3687 warn "reattaching attachments to maps";
2857 reattach $_ for values %MAP; 3688 reattach $_ for values %MAP;
2858 warn "reattaching attachments to players"; 3689 warn "reattaching attachments to players";
2859 reattach $_ for values %PLAYER; 3690 reattach $_ for values %PLAYER;
2860 3691
2861 warn "leaving sync_job"; 3692 warn "leaving sync_job";
2862 3693
2863 1 3694 1
2864 } or do { 3695 } or do {
2865 warn $@; 3696 warn $@;
2866 warn "error while reloading, exiting."; 3697 cf::cleanup "error while reloading, exiting.";
2867 exit 1;
2868 }; 3698 };
2869 3699
2870 warn "reloaded"; 3700 warn "reloaded";
3701 --$RELOAD;
3702 }
2871}; 3703};
2872 3704
2873our $RELOAD_WATCHER; # used only during reload 3705our $RELOAD_WATCHER; # used only during reload
2874 3706
2875sub reload_perl() { 3707sub reload_perl() {
2876 # doing reload synchronously and two reloads happen back-to-back, 3708 # doing reload synchronously and two reloads happen back-to-back,
2877 # coro crashes during coro_state_free->destroy here. 3709 # coro crashes during coro_state_free->destroy here.
2878 3710
2879 $RELOAD_WATCHER ||= Event->timer ( 3711 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
2880 reentrant => 0,
2881 after => 0,
2882 data => WF_AUTOCANCEL,
2883 cb => sub {
2884 do_reload_perl; 3712 do_reload_perl;
2885 undef $RELOAD_WATCHER; 3713 undef $RELOAD_WATCHER;
2886 },
2887 ); 3714 };
2888} 3715}
2889 3716
2890register_command "reload" => sub { 3717register_command "reload" => sub {
2891 my ($who, $arg) = @_; 3718 my ($who, $arg) = @_;
2892 3719
2893 if ($who->flag (FLAG_WIZ)) { 3720 if ($who->flag (FLAG_WIZ)) {
2894 $who->message ("reloading server."); 3721 $who->message ("reloading server.");
3722 async {
3723 $Coro::current->{desc} = "perl_reload";
2895 async { reload_perl }; 3724 reload_perl;
3725 };
2896 } 3726 }
2897}; 3727};
2898 3728
2899unshift @INC, $LIBDIR; 3729unshift @INC, $LIBDIR;
2900 3730
2902 3732
2903our @WAIT_FOR_TICK; 3733our @WAIT_FOR_TICK;
2904our @WAIT_FOR_TICK_BEGIN; 3734our @WAIT_FOR_TICK_BEGIN;
2905 3735
2906sub wait_for_tick { 3736sub wait_for_tick {
2907 return unless $TICK_WATCHER->is_active;
2908 return if $Coro::current == $Coro::main; 3737 return if tick_inhibit || $Coro::current == $Coro::main;
2909 3738
2910 my $signal = new Coro::Signal; 3739 my $signal = new Coro::Signal;
2911 push @WAIT_FOR_TICK, $signal; 3740 push @WAIT_FOR_TICK, $signal;
2912 $signal->wait; 3741 $signal->wait;
2913} 3742}
2914 3743
2915sub wait_for_tick_begin { 3744sub wait_for_tick_begin {
2916 return unless $TICK_WATCHER->is_active;
2917 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
2918 3746
2919 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
2920 push @WAIT_FOR_TICK_BEGIN, $signal; 3748 push @WAIT_FOR_TICK_BEGIN, $signal;
2921 $signal->wait; 3749 $signal->wait;
2922} 3750}
2923 3751
2924 my $min = 1e6;#d# 3752sub tick {
2925 my $avg = 10;
2926$TICK_WATCHER = Event->timer (
2927 reentrant => 0,
2928 parked => 1,
2929 prio => 0,
2930 at => $NEXT_TICK || $TICK,
2931 data => WF_AUTOCANCEL,
2932 cb => sub {
2933 if ($Coro::current != $Coro::main) { 3753 if ($Coro::current != $Coro::main) {
2934 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"
2935 unless ++$bug_warning > 10; 3755 unless ++$bug_warning > 10;
2936 return; 3756 return;
2937 } 3757 }
2938 3758
2939 $NOW = $tick_start = Event::time;
2940
2941 cf::server_tick; # one server iteration 3759 cf::server_tick; # one server iteration
2942 3760
2943 0 && sync_job {#d# 3761 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2944 for(1..10) { 3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2945 my $t = Event::time; 3763 Coro::async_pool {
2946 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3764 $Coro::current->{desc} = "runtime saver";
2947 or die; 3765 write_runtime_sync
2948 3766 or warn "ERROR: unable to write runtime file: $!";
2949 $map->width (50);
2950 $map->height (50);
2951 $map->alloc;
2952 $map->_load_objects ("/tmp/x.map", 1);
2953 my $t = Event::time - $t;
2954
2955 #next unless $t < 0.0013;#d#
2956 if ($t < $min) {
2957 $min = $t;
2958 }
2959 $avg = $avg * 0.99 + $t * 0.01;
2960 }
2961 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2962 exit 0;
2963 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2964 }; 3767 };
3768 }
2965 3769
2966 $RUNTIME += $TICK;
2967 $NEXT_TICK += $TICK;
2968
2969 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2970 $NEXT_RUNTIME_WRITE = $NOW + 10;
2971 Coro::async_pool {
2972 write_runtime
2973 or warn "ERROR: unable to write runtime file: $!";
2974 };
2975 }
2976
2977# my $AFTER = Event::time;
2978# warn $AFTER - $NOW;#d#
2979
2980 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3770 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2981 $sig->send; 3771 $sig->send;
2982 } 3772 }
2983 while (my $sig = shift @WAIT_FOR_TICK) { 3773 while (my $sig = shift @WAIT_FOR_TICK) {
2984 $sig->send; 3774 $sig->send;
2985 } 3775 }
2986 3776
2987 $NOW = Event::time; 3777 $LOAD = ($NOW - $TICK_START) / $TICK;
2988
2989 # if we are delayed by four ticks or more, skip them all
2990 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2991
2992 $TICK_WATCHER->at ($NEXT_TICK);
2993 $TICK_WATCHER->start;
2994
2995 $LOAD = ($NOW - $tick_start) / $TICK;
2996 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3778 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2997 3779
2998 _post_tick; 3780 if (0) {
2999 3781 if ($NEXT_TICK) {
3000 3782 my $jitter = $TICK_START - $NEXT_TICK;
3783 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3784 warn "jitter $JITTER\n";#d#
3785 }
3001 }, 3786 }
3002); 3787}
3003 3788
3004{ 3789{
3005 BDB::max_poll_time $TICK * 0.1; 3790 # configure BDB
3006 $BDB_POLL_WATCHER = Event->io ( 3791
3007 reentrant => 0,
3008 fd => BDB::poll_fileno,
3009 poll => 'r',
3010 prio => 0,
3011 data => WF_AUTOCANCEL,
3012 cb => \&BDB::poll_cb,
3013 );
3014 BDB::min_parallel 8; 3792 BDB::min_parallel 8;
3015 3793 BDB::max_poll_reqs $TICK * 0.1;
3016 BDB::set_sync_prepare { 3794 $AnyEvent::BDB::WATCHER->priority (1);
3017 my $status;
3018 my $current = $Coro::current;
3019 (
3020 sub {
3021 $status = $!;
3022 $current->ready; undef $current;
3023 },
3024 sub {
3025 Coro::schedule while defined $current;
3026 $! = $status;
3027 },
3028 )
3029 };
3030 3795
3031 unless ($DB_ENV) { 3796 unless ($DB_ENV) {
3032 $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);
3033 3803
3034 cf::sync_job { 3804 cf::sync_job {
3035 eval { 3805 eval {
3036 BDB::db_env_open 3806 BDB::db_env_open
3037 $DB_ENV, 3807 $DB_ENV,
3039 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
3040 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3810 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3041 0666; 3811 0666;
3042 3812
3043 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3813 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3044
3045 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3046 $DB_ENV->set_lk_detect;
3047 }; 3814 };
3048 3815
3049 cf::cleanup "db_env_open(db): $@" if $@; 3816 cf::cleanup "db_env_open(db): $@" if $@;
3050 }; 3817 };
3051 } 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 };
3052} 3829}
3053 3830
3054{ 3831{
3832 # configure IO::AIO
3833
3055 IO::AIO::min_parallel 8; 3834 IO::AIO::min_parallel 8;
3056
3057 undef $Coro::AIO::WATCHER;
3058 IO::AIO::max_poll_time $TICK * 0.1; 3835 IO::AIO::max_poll_time $TICK * 0.1;
3059 $AIO_POLL_WATCHER = Event->io ( 3836 undef $AnyEvent::AIO::WATCHER;
3060 reentrant => 0,
3061 data => WF_AUTOCANCEL,
3062 fd => IO::AIO::poll_fileno,
3063 poll => 'r',
3064 prio => 6,
3065 cb => \&IO::AIO::poll_cb,
3066 );
3067} 3837}
3068 3838
3069my $_log_backtrace; 3839my $_log_backtrace;
3070 3840
3071sub _log_backtrace { 3841sub _log_backtrace {
3074 $msg =~ s/\n//; 3844 $msg =~ s/\n//;
3075 3845
3076 # limit the # of concurrent backtraces 3846 # limit the # of concurrent backtraces
3077 if ($_log_backtrace < 2) { 3847 if ($_log_backtrace < 2) {
3078 ++$_log_backtrace; 3848 ++$_log_backtrace;
3849 my $perl_bt = Carp::longmess $msg;
3079 async { 3850 async {
3851 $Coro::current->{desc} = "abt $msg";
3852
3080 my @bt = fork_call { 3853 my @bt = fork_call {
3081 @addr = map { sprintf "%x", $_ } @addr; 3854 @addr = map { sprintf "%x", $_ } @addr;
3082 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3855 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3083 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 |"
3084 or die "addr2line: $!"; 3857 or die "addr2line: $!";
3092 } 3865 }
3093 3866
3094 @funcs 3867 @funcs
3095 }; 3868 };
3096 3869
3097 LOG llevInfo, "[ABT] $msg\n"; 3870 LOG llevInfo, "[ABT] $perl_bt\n";
3871 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3098 LOG llevInfo, "[ABT] $_\n" for @bt; 3872 LOG llevInfo, "[ABT] $_\n" for @bt;
3099 --$_log_backtrace; 3873 --$_log_backtrace;
3100 }; 3874 };
3101 } else { 3875 } else {
3102 LOG llevInfo, "[ABT] $msg\n"; 3876 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines