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.301 by root, Tue Jul 10 07:01:51 2007 UTC vs.
Revision 1.452 by root, Tue Sep 23 00:24:52 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
15use Coro 3.61 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
49use Coro::Util ();
24 50
25use JSON::XS 1.4 (); 51use JSON::XS 2.01 ();
26use BDB (); 52use BDB ();
27use Data::Dumper; 53use Data::Dumper;
28use Digest::MD5; 54use Digest::MD5;
29use Fcntl; 55use Fcntl;
30use YAML::Syck (); 56use YAML ();
31use IO::AIO 2.32 (); 57use IO::AIO ();
32use Time::HiRes; 58use Time::HiRes;
33use Compress::LZF; 59use Compress::LZF;
60use Digest::MD5 ();
61
62AnyEvent::detect;
34 63
35# configure various modules to our taste 64# configure various modules to our taste
36# 65#
37$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
38Coro::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";
39Compress::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
40
41$Event::Eval = 1; # no idea why this is required, but it is
42
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1;
45
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 74
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 76
50our %COMMAND = (); 77our %COMMAND = ();
51our %COMMAND_TIME = (); 78our %COMMAND_TIME = ();
54our %EXTCMD = (); 81our %EXTCMD = ();
55our %EXTICMD = (); 82our %EXTICMD = ();
56our %EXT_CORO = (); # coroutines bound to extensions 83our %EXT_CORO = (); # coroutines bound to extensions
57our %EXT_MAP = (); # pluggable maps 84our %EXT_MAP = (); # pluggable maps
58 85
59our $RELOAD; # number of reloads so far 86our $RELOAD; # number of reloads so far, non-zero while in reload
60our @EVENT; 87our @EVENT;
61 88
62our $CONFDIR = confdir; 89our $CONFDIR = confdir;
63our $DATADIR = datadir; 90our $DATADIR = datadir;
64our $LIBDIR = "$DATADIR/ext"; 91our $LIBDIR = "$DATADIR/ext";
65our $PODDIR = "$DATADIR/pod"; 92our $PODDIR = "$DATADIR/pod";
66our $MAPDIR = "$DATADIR/" . mapdir; 93our $MAPDIR = "$DATADIR/" . mapdir;
67our $LOCALDIR = localdir; 94our $LOCALDIR = localdir;
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 95our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 97our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 98our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 99our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime";
102
103our %RESOURCE;
73 104
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 107our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 108our $USE_FSYNC = 1; # use fsync to write maps - default off
81 109
110our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER;
82our $BDB_POLL_WATCHER; 112our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 113our $DB_ENV;
84 114
85our %CFG; 115our %CFG;
86 116
87our $UPTIME; $UPTIME ||= time; 117our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 118our $RUNTIME;
119our $NOW;
89 120
90our %PLAYER; # all users 121our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 122our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 123our $LINK_MAP; # the special {link} map, which is always available
93 124
94# 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 ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 126our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 127
97our $LOAD; # a number between 0 (idle) and 1 (too many objects) 128our $LOAD; # a number between 0 (idle) and 1 (too many objects)
98our $LOADAVG; # same thing, but with alpha-smoothing 129our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter
99our $tick_start; # for load detecting purposes 131our $TICK_START; # for load detecting purposes
100 132
101binmode STDOUT; 133binmode STDOUT;
102binmode STDERR; 134binmode STDERR;
103 135
104# read virtual server time, if available 136# read virtual server time, if available
105unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 137unless ($RUNTIME || !-e $RUNTIMEFILE) {
106 open my $fh, "<", "$LOCALDIR/runtime" 138 open my $fh, "<", $RUNTIMEFILE
107 or die "unable to read runtime file: $!"; 139 or die "unable to read $RUNTIMEFILE file: $!";
108 $RUNTIME = <$fh> + 0.; 140 $RUNTIME = <$fh> + 0.;
109} 141}
110 142
111mkdir $_ 143mkdir $_
112 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
157 189
158The raw value load value from the last tick. 190The raw value load value from the last tick.
159 191
160=item %cf::CFG 192=item %cf::CFG
161 193
162Configuration for the server, loaded from C</etc/crossfire/config>, or 194Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 195from wherever your confdir points to.
164 196
165=item cf::wait_for_tick, cf::wait_for_tick_begin 197=item cf::wait_for_tick, cf::wait_for_tick_begin
166 198
167These 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
168returns 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
169per 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.
170 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
171=back 209=back
172 210
173=cut 211=cut
174 212
175BEGIN { 213BEGIN {
179 $msg .= "\n" 217 $msg .= "\n"
180 unless $msg =~ /\n$/; 218 unless $msg =~ /\n$/;
181 219
182 $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;
183 221
184 utf8::encode $msg;
185 LOG llevError, $msg; 222 LOG llevError, $msg;
186 }; 223 };
187} 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#?
188 240
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 241@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 242@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 243@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 244@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
199for my $pkg (qw( 251for my $pkg (qw(
200 cf::global cf::attachable 252 cf::global cf::attachable
201 cf::object cf::object::player 253 cf::object cf::object::player
202 cf::client cf::player 254 cf::client cf::player
203 cf::arch cf::living 255 cf::arch cf::living
256 cf::map cf::mapspace
204 cf::map cf::party cf::region 257 cf::party cf::region
205)) { 258)) {
206 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 259 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 260}
209 261
210$Event::DIED = sub { 262$EV::DIED = sub {
211 warn "error in event callback: @_"; 263 warn "error in event callback: @_";
212}; 264};
213 265
214############################################################################# 266#############################################################################
215 267
238 $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;
239 $d 291 $d
240 } || "[unable to dump $_[0]: '$@']"; 292 } || "[unable to dump $_[0]: '$@']";
241} 293}
242 294
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.
250 302
251=cut 303=cut
252 304
253our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 305our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254 306
255sub to_json ($) { $json_coder->encode ($_[0]) } 307sub encode_json($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) } 308sub decode_json($) { $json_coder->decode ($_[0]) }
257 309
258=item cf::lock_wait $string 310=item cf::lock_wait $string
259 311
260Wait until the given lock is available. See cf::lock_acquire. 312Wait until the given lock is available. See cf::lock_acquire.
261 313
264Wait 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
265a 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,
266for example when the coroutine gets canceled), the lock is automatically 318for example when the coroutine gets canceled), the lock is automatically
267returned. 319returned.
268 320
321Locks are *not* recursive, locking from the same coro twice results in a
322deadlocked coro.
323
269Lock 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
270uses map_find and cf::map::load uses map_load). 325uses map_find and cf::map::load uses map_load).
271 326
272=item $locked = cf::lock_active $string 327=item $locked = cf::lock_active $string
273 328
274Return 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.
275 330
276=cut 331=cut
277 332
278our %LOCK; 333our %LOCK;
334our %LOCKER;#d#
279 335
280sub lock_wait($) { 336sub lock_wait($) {
281 my ($key) = @_; 337 my ($key) = @_;
282 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
283 # wait for lock, if any 344 # wait for lock, if any
284 while ($LOCK{$key}) { 345 while ($LOCK{$key}) {
346 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
285 push @{ $LOCK{$key} }, $Coro::current; 347 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule; 348 Coro::schedule;
287 } 349 }
288} 350}
289 351
292 354
293 # wait, to be sure we are not locked 355 # wait, to be sure we are not locked
294 lock_wait $key; 356 lock_wait $key;
295 357
296 $LOCK{$key} = []; 358 $LOCK{$key} = [];
359 $LOCKER{$key} = $Coro::current;#d#
297 360
298 Coro::guard { 361 Coro::guard {
362 delete $LOCKER{$key};#d#
299 # wake up all waiters, to be on the safe side 363 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} }; 364 $_->ready for @{ delete $LOCK{$key} };
301 } 365 }
302} 366}
303 367
306 370
307 ! ! $LOCK{$key} 371 ! ! $LOCK{$key}
308} 372}
309 373
310sub freeze_mainloop { 374sub freeze_mainloop {
311 return unless $TICK_WATCHER->is_active; 375 tick_inhibit_inc;
312 376
313 my $guard = Coro::guard { 377 Coro::guard \&tick_inhibit_dec;
314 $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 }
315 }; 438 }
316 $TICK_WATCHER->stop; 439};
317 $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;
318} 453}
319 454
320=item cf::async { BLOCK } 455=item cf::async { BLOCK }
321 456
322Currently the same as Coro::async_pool, meaning you cannot use 457Currently the same as Coro::async_pool, meaning you cannot use
327 462
328BEGIN { *async = \&Coro::async_pool } 463BEGIN { *async = \&Coro::async_pool }
329 464
330=item cf::sync_job { BLOCK } 465=item cf::sync_job { BLOCK }
331 466
332The design of Crossfire TRT requires that the main coroutine ($Coro::main) 467The design of Deliantra requires that the main coroutine ($Coro::main)
333is always able to handle events or runnable, as Crossfire TRT is only 468is always able to handle events or runnable, as Deliantra is only
334partly 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
335acceptable. 470acceptable.
336 471
337If 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
338the given BLOCK in another coroutine while waiting for the result. The 473the given BLOCK in another coroutine while waiting for the result. The
343 478
344sub sync_job(&) { 479sub sync_job(&) {
345 my ($job) = @_; 480 my ($job) = @_;
346 481
347 if ($Coro::current == $Coro::main) { 482 if ($Coro::current == $Coro::main) {
348 my $time = Event::time; 483 my $time = EV::time;
349 484
350 # this is the main coro, too bad, we have to block 485 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 486 # till the operation succeeds, freezing the server :/
352 487
353 # TODO: use suspend/resume instead 488 LOG llevError, Carp::longmess "sync job";#d#
354 # (but this is cancel-safe) 489
355 my $freeze_guard = freeze_mainloop; 490 my $freeze_guard = freeze_mainloop;
356 491
357 my $busy = 1; 492 my $busy = 1;
358 my @res; 493 my @res;
359 494
360 (async { 495 (async {
496 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 497 @res = eval { $job->() };
362 warn $@ if $@; 498 warn $@ if $@;
363 undef $busy; 499 undef $busy;
364 })->prio (Coro::PRIO_MAX); 500 })->prio (Coro::PRIO_MAX);
365 501
366 while ($busy) { 502 while ($busy) {
367 Coro::cede or Event::one_event; 503 if (Coro::nready) {
504 Coro::cede_notself;
505 } else {
506 EV::loop EV::LOOP_ONESHOT;
368 } 507 }
508 }
369 509
370 $time = Event::time - $time; 510 my $time = EV::time - $time;
371 511
372 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374
375 $tick_start += $time; # do not account sync jobs to server load 512 $TICK_START += $time; # do not account sync jobs to server load
376 513
377 wantarray ? @res : $res[0] 514 wantarray ? @res : $res[0]
378 } else { 515 } else {
379 # we are in another coroutine, how wonderful, everything just works 516 # we are in another coroutine, how wonderful, everything just works
380 517
405=item fork_call { }, $args 542=item fork_call { }, $args
406 543
407Executes the given code block with the given arguments in a seperate 544Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with 545process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may 546Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 547never block itself or use any form of event handling.
411 548
412=cut 549=cut
413
414sub _store_scalar {
415 open my $fh, ">", \my $buf
416 or die "fork_call: cannot open fh-to-buf in child : $!";
417 Storable::store_fd $_[0], $fh;
418 close $fh;
419
420 $buf
421}
422 550
423sub fork_call(&@) { 551sub fork_call(&@) {
424 my ($cb, @args) = @_; 552 my ($cb, @args) = @_;
425 553
426# 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,
427# or die "socketpair: $!"; 555 # otherwise perl prematurely frees the stuff :/
428 pipe my $fh1, my $fh2 556 # TODO: investigate and fix (likely this will be rather laborious)
429 or die "pipe: $!";
430 557
431 if (my $pid = fork) { 558 my @res = Coro::Util::fork_eval {
432 close $fh2;
433
434 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
435 warn "pst<$res>" unless $res =~ /^pst/;
436 $res = Coro::Storable::thaw $res;
437
438 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
439
440 Carp::confess $$res unless "ARRAY" eq ref $res;
441
442 return wantarray ? @$res : $res->[-1];
443 } else {
444 reset_signals; 559 reset_signals;
445 local $SIG{__WARN__}; 560 &$cb
446 local $SIG{__DIE__}; 561 }, @args;
447 # just in case, this hack effectively disables event
448 # in the child. cleaner and slower would be canceling all watchers,
449 # but this works for the time being.
450 local $Coro::idle;
451 $Coro::current->prio (Coro::PRIO_MAX);
452 562
453 eval { 563 wantarray ? @res : $res[-1]
454 close $fh1; 564}
455 565
456 my @res = eval { $cb->(@args) }; 566=item $coin = coin_from_name $name
457 567
458 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 568=cut
459 close $fh2;
460 };
461 569
462 warn $@ if $@; 570our %coin_alias = (
463 _exit 0; 571 "silver" => "silvercoin",
464 } 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
465} 591}
466 592
467=item $value = cf::db_get $family => $key 593=item $value = cf::db_get $family => $key
468 594
469Returns a single value from the environment database. 595Returns a single value from the environment database.
471=item cf::db_put $family => $key => $value 597=item cf::db_put $family => $key => $value
472 598
473Stores 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
474data 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).
475 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
476=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}
477 625
478our $DB; 626our $DB;
479 627
480sub db_init { 628sub db_init {
481 unless ($DB) {
482 $DB = BDB::db_create $DB_ENV;
483
484 cf::sync_job { 629 cf::sync_job {
485 eval { 630 $DB ||= db_table "db";
486 $DB->set_flags (BDB::CHKSUM);
487
488 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
489 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
490 cf::cleanup "db_open(db): $!" if $!;
491 };
492 cf::cleanup "db_open(db): $@" if $@;
493 };
494 } 631 };
495} 632}
496 633
497sub db_get($$) { 634sub db_get($$) {
498 my $key = "$_[0]/$_[1]"; 635 my $key = "$_[0]/$_[1]";
499 636
549 if (1) { 686 if (1) {
550 $md5 = 687 $md5 =
551 join "\x00", 688 join "\x00",
552 $processversion, 689 $processversion,
553 map { 690 map {
554 Coro::cede; 691 cf::cede_to_tick;
555 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 692 ($src->[$_], Digest::MD5::md5_hex $data[$_])
556 } 0.. $#$src; 693 } 0.. $#$src;
557 694
558 695
559 my $dbmd5 = db_get cache => "$id/md5"; 696 my $dbmd5 = db_get cache => "$id/md5";
597 734
598############################################################################# 735#############################################################################
599 736
600=head2 ATTACHABLE OBJECTS 737=head2 ATTACHABLE OBJECTS
601 738
602Many 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
603attach callbacks/event handlers (a collection of which is called an "attachment") 740attach callbacks/event handlers (a collection of which is called an "attachment")
604to it. All such attachable objects support the following methods. 741to it. All such attachable objects support the following methods.
605 742
606In 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>
607C<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
608Crossfire TRT). 745Deliantra).
609 746
610=over 4 747=over 4
611 748
612=item $attachable->attach ($attachment, key => $value...) 749=item $attachable->attach ($attachment, key => $value...)
613 750
657=item cf::CLASS::attachment $name, ... 794=item cf::CLASS::attachment $name, ...
658 795
659Register an attachment by C<$name> through which attachable objects of the 796Register an attachment by C<$name> through which attachable objects of the
660given CLASS can refer to this attachment. 797given CLASS can refer to this attachment.
661 798
662Some classes such as crossfire maps and objects can specify attachments 799Some classes such as deliantra maps and objects can specify attachments
663that 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.
664 801
665These calls expect any number of the following handler/hook descriptions: 802These calls expect any number of the following handler/hook descriptions:
666 803
667=over 4 804=over 4
865 "; 1002 ";
866 die if $@; 1003 die if $@;
867} 1004}
868 1005
869our $override; 1006our $override;
870our @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?
871 1008
872sub override { 1009sub override {
873 $override = 1; 1010 $override = 1;
874 @invoke_results = (); 1011 @INVOKE_RESULTS = (@_);
875} 1012}
876 1013
877sub do_invoke { 1014sub do_invoke {
878 my $event = shift; 1015 my $event = shift;
879 my $callbacks = shift; 1016 my $callbacks = shift;
880 1017
881 @invoke_results = (); 1018 @INVOKE_RESULTS = ();
882 1019
883 local $override; 1020 local $override;
884 1021
885 for (@$callbacks) { 1022 for (@$callbacks) {
886 eval { &{$_->[1]} }; 1023 eval { &{$_->[1]} };
895 } 1032 }
896 1033
897 0 1034 0
898} 1035}
899 1036
900=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1037=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
901 1038
902=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1039=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
903 1040
904Generate an object-specific event with the given arguments. 1041Generate an object-specific event with the given arguments.
905 1042
906This 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
907removed 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
908results (if you must, access C<@cf::invoke_results> directly). 1045results (if you must, access C<@cf::INVOKE_RESULTS> directly).
909 1046
910=back 1047=back
911 1048
912=cut 1049=cut
913 1050
914############################################################################# 1051#############################################################################
915# 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}
916 1095
917sub reattach { 1096sub reattach {
918 # basically do the same as instantiate, without calling instantiate 1097 # basically do the same as instantiate, without calling instantiate
919 my ($obj) = @_; 1098 my ($obj) = @_;
920 1099
1100 # no longer needed after getting rid of delete_package?
921 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
922 1102
923 my $registry = $obj->registry; 1103 my $registry = $obj->registry;
924 1104
925 @$registry = (); 1105 @$registry = ();
926 1106
941cf::attachable->attach ( 1121cf::attachable->attach (
942 prio => -1000000, 1122 prio => -1000000,
943 on_instantiate => sub { 1123 on_instantiate => sub {
944 my ($obj, $data) = @_; 1124 my ($obj, $data) = @_;
945 1125
946 $data = from_json $data; 1126 $data = decode_json $data;
947 1127
948 for (@$data) { 1128 for (@$data) {
949 my ($name, $args) = @$_; 1129 my ($name, $args) = @$_;
950 1130
951 $obj->attach ($name, %{$args || {} }); 1131 $obj->attach ($name, %{$args || {} });
967sub object_freezer_save { 1147sub object_freezer_save {
968 my ($filename, $rdata, $objs) = @_; 1148 my ($filename, $rdata, $objs) = @_;
969 1149
970 sync_job { 1150 sync_job {
971 if (length $$rdata) { 1151 if (length $$rdata) {
1152 utf8::decode (my $decname = $filename);
972 warn sprintf "saving %s (%d,%d)\n", 1153 warn sprintf "saving %s (%d,%d)\n",
973 $filename, length $$rdata, scalar @$objs; 1154 $decname, length $$rdata, scalar @$objs;
974 1155
975 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
976 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
977 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1158 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
978 aio_fsync $fh if $cf::USE_FSYNC; 1159 aio_fsync $fh if $cf::USE_FSYNC;
979 close $fh; 1160 aio_close $fh;
980 1161
981 if (@$objs) { 1162 if (@$objs) {
982 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) {
983 chmod SAVE_MODE, $fh; 1164 aio_chmod $fh, SAVE_MODE;
984 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1165 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
985 aio_write $fh, 0, (length $data), $data, 0; 1166 aio_write $fh, 0, (length $data), $data, 0;
986 aio_fsync $fh if $cf::USE_FSYNC; 1167 aio_fsync $fh if $cf::USE_FSYNC;
987 close $fh; 1168 aio_close $fh;
988 aio_rename "$filename.pst~", "$filename.pst"; 1169 aio_rename "$filename.pst~", "$filename.pst";
989 } 1170 }
990 } else { 1171 } else {
991 aio_unlink "$filename.pst"; 1172 aio_unlink "$filename.pst";
992 } 1173 }
997 } 1178 }
998 } else { 1179 } else {
999 aio_unlink $filename; 1180 aio_unlink $filename;
1000 aio_unlink "$filename.pst"; 1181 aio_unlink "$filename.pst";
1001 } 1182 }
1002 } 1183 };
1003} 1184}
1004 1185
1005sub object_freezer_as_string { 1186sub object_freezer_as_string {
1006 my ($rdata, $objs) = @_; 1187 my ($rdata, $objs) = @_;
1007 1188
1019 or return; 1200 or return;
1020 1201
1021 unless (aio_stat "$filename.pst") { 1202 unless (aio_stat "$filename.pst") {
1022 (aio_load "$filename.pst", $av) >= 0 1203 (aio_load "$filename.pst", $av) >= 0
1023 or return; 1204 or return;
1205
1024 $av = eval { (Storable::thaw $av)->{objs} }; 1206 my $st = eval { Coro::Storable::thaw $av };
1207 $av = $st->{objs};
1025 } 1208 }
1026 1209
1210 utf8::decode (my $decname = $filename);
1027 warn sprintf "loading %s (%d)\n", 1211 warn sprintf "loading %s (%d,%d)\n",
1028 $filename, length $data, scalar @{$av || []}; 1212 $decname, length $data, scalar @{$av || []};
1213
1029 return ($data, $av); 1214 ($data, $av)
1030} 1215}
1031 1216
1032=head2 COMMAND CALLBACKS 1217=head2 COMMAND CALLBACKS
1033 1218
1034=over 4 1219=over 4
1107 my ($pl, $buf) = @_; 1292 my ($pl, $buf) = @_;
1108 1293
1109 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1294 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1110 1295
1111 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
1112 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1304 if (my $cb = $EXTCMD{$type}) {
1113 if (my %reply = $cb->($pl, $msg)) { 1305 @reply = $cb->($pl, @payload);
1114 $pl->ext_reply ($msg->{msgid}, %reply);
1115 }
1116 } 1306 }
1307
1308 $pl->ext_reply ($reply, @reply)
1309 if $reply;
1310
1117 } else { 1311 } else {
1118 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1312 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1119 } 1313 }
1120 1314
1121 cf::override; 1315 cf::override;
1148 1342
1149 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1343 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1150 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1344 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1151 1345
1152 $ext{source} = 1346 $ext{source} =
1153 "package $pkg; use strict; use utf8;\n" 1347 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1154 . "#line 1 \"$path\"\n{\n" 1348 . "#line 1 \"$path\"\n{\n"
1155 . $source 1349 . $source
1156 . "\n};\n1"; 1350 . "\n};\n1";
1157 1351
1158 $todo{$base} = \%ext; 1352 $todo{$base} = \%ext;
1174 my $msg = $@ ? "$v->{path}: $@\n" 1368 my $msg = $@ ? "$v->{path}: $@\n"
1175 : "$v->{base}: extension inactive.\n"; 1369 : "$v->{base}: extension inactive.\n";
1176 1370
1177 if (exists $v->{meta}{mandatory}) { 1371 if (exists $v->{meta}{mandatory}) {
1178 warn $msg; 1372 warn $msg;
1179 warn "mandatory extension failed to load, exiting.\n"; 1373 cf::cleanup "mandatory extension failed to load, exiting.";
1180 exit 1;
1181 } 1374 }
1182 1375
1183 warn $msg; 1376 warn $msg;
1184 } 1377 }
1185 1378
1199 1392
1200=back 1393=back
1201 1394
1202=head2 CORE EXTENSIONS 1395=head2 CORE EXTENSIONS
1203 1396
1204Functions and methods that extend core crossfire objects. 1397Functions and methods that extend core deliantra objects.
1205 1398
1206=cut 1399=cut
1207 1400
1208package cf::player; 1401package cf::player;
1209 1402
1210use Coro::AIO; 1403use Coro::AIO;
1211 1404
1212=head3 cf::player 1405=head3 cf::player
1213 1406
1214=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}
1215 1422
1216=item cf::player::find $login 1423=item cf::player::find $login
1217 1424
1218Returns the given player object, loading it if necessary (might block). 1425Returns the given player object, loading it if necessary (might block).
1219 1426
1238 1445
1239sub exists($) { 1446sub exists($) {
1240 my ($login) = @_; 1447 my ($login) = @_;
1241 1448
1242 $cf::PLAYER{$login} 1449 $cf::PLAYER{$login}
1243 or cf::sync_job { !aio_stat path $login } 1450 or !aio_stat path $login
1244} 1451}
1245 1452
1246sub find($) { 1453sub find($) {
1247 return $cf::PLAYER{$_[0]} || do { 1454 return $cf::PLAYER{$_[0]} || do {
1248 my $login = $_[0]; 1455 my $login = $_[0];
1255 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1462 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1256 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1463 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1257 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1464 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1258 aio_unlink +(playerdir $login) . "/$login.pl"; 1465 aio_unlink +(playerdir $login) . "/$login.pl";
1259 1466
1260 my $pl = load_pl path $login 1467 my $f = new_from_file cf::object::thawer path $login
1261 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;
1262 $cf::PLAYER{$login} = $pl 1475 $cf::PLAYER{$login} = $pl
1263 } 1476 }
1264 } 1477 }
1265} 1478}
1266 1479
1275 return if $pl->{deny_save}; 1488 return if $pl->{deny_save};
1276 1489
1277 aio_mkdir playerdir $pl, 0770; 1490 aio_mkdir playerdir $pl, 0770;
1278 $pl->{last_save} = $cf::RUNTIME; 1491 $pl->{last_save} = $cf::RUNTIME;
1279 1492
1493 cf::get_slot 0.01;
1494
1280 $pl->save_pl ($path); 1495 $pl->save_pl ($path);
1281 Coro::cede; 1496 cf::cede_to_tick;
1282} 1497}
1283 1498
1284sub new($) { 1499sub new($) {
1285 my ($login) = @_; 1500 my ($login) = @_;
1286 1501
1292 $cf::PLAYER{$login} = $self; 1507 $cf::PLAYER{$login} = $self;
1293 1508
1294 $self 1509 $self
1295} 1510}
1296 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
1297=item $pl->quit_character 1522=item $pl->quit_character
1298 1523
1299Nukes the player without looking back. If logged in, the connection will 1524Nukes the player without looking back. If logged in, the connection will
1300be destroyed. May block for a long time. 1525be destroyed. May block for a long time.
1301 1526
1305 my ($pl) = @_; 1530 my ($pl) = @_;
1306 1531
1307 my $name = $pl->ob->name; 1532 my $name = $pl->ob->name;
1308 1533
1309 $pl->{deny_save} = 1; 1534 $pl->{deny_save} = 1;
1310 $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
1311 1536
1312 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1537 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1313 $pl->deactivate; 1538 $pl->deactivate;
1539 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1540 $pl->ob->check_score;
1314 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1541 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1315 $pl->ns->destroy if $pl->ns; 1542 $pl->ns->destroy if $pl->ns;
1316 1543
1317 my $path = playerdir $pl; 1544 my $path = playerdir $pl;
1318 my $temp = "$path~$cf::RUNTIME~deleting~"; 1545 my $temp = "$path~$cf::RUNTIME~deleting~";
1354 or return []; 1581 or return [];
1355 1582
1356 my @logins; 1583 my @logins;
1357 1584
1358 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") {
1359 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1591 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1360 aio_read $fh, 0, 512, my $buf, 0 or next; 1592 aio_read $fh, 0, 512, my $buf, 0 or next;
1361 $buf !~ /^password -------------$/m or next; # official not-valid tag 1593 $buf !~ /^password -------------$/m or next; # official not-valid tag
1594 }
1362 1595
1363 utf8::decode $login; 1596 utf8::decode $login;
1364 push @logins, $login; 1597 push @logins, $login;
1365 } 1598 }
1366 1599
1393 } 1626 }
1394 1627
1395 \@paths 1628 \@paths
1396} 1629}
1397 1630
1398=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1631=item $protocol_xml = $player->expand_cfpod ($cfpod)
1399 1632
1400Expand crossfire pod fragments into protocol xml. 1633Expand deliantra pod fragments into protocol xml.
1401 1634
1402=cut
1403
1404sub expand_cfpod {
1405 ((my $self), (local $_)) = @_;
1406
1407 # escape & and <
1408 s/&/&amp;/g;
1409 s/(?<![BIUGH])</&lt;/g;
1410
1411 # this is buggy, it needs to properly take care of nested <'s
1412
1413 1 while
1414 # replace B<>, I<>, U<> etc.
1415 s/B<([^\>]*)>/<b>$1<\/b>/
1416 || s/I<([^\>]*)>/<i>$1<\/i>/
1417 || s/U<([^\>]*)>/<u>$1<\/u>/
1418 # replace G<male|female> tags
1419 || s{G<([^>|]*)\|([^>]*)>}{
1420 $self->gender ? $2 : $1
1421 }ge
1422 # replace H<hint text>
1423 || s{H<([^\>]*)>}
1424 {
1425 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1426 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1427 "")
1428 [$self->{hintmode}]
1429 }ge;
1430
1431 # create single paragraphs (very hackish)
1432 s/(?<=\S)\n(?=\w)/ /g;
1433
1434 # compress some whitespace
1435 s/\s+\n/\n/g; # ws line-ends
1436 s/\n\n+/\n/g; # double lines
1437 s/^\n+//; # beginning lines
1438 s/\n+$//; # ending lines
1439
1440 $_
1441}
1442
1443sub hintmode {
1444 $_[0]{hintmode} = $_[1] if @_ > 1;
1445 $_[0]{hintmode}
1446}
1447
1448=item $player->ext_reply ($msgid, %msg) 1635=item $player->ext_reply ($msgid, @msg)
1449 1636
1450Sends an ext reply to the player. 1637Sends an ext reply to the player.
1451 1638
1452=cut 1639=cut
1453 1640
1454sub ext_reply($$%) { 1641sub ext_reply($$@) {
1455 my ($self, $id, %msg) = @_; 1642 my ($self, $id, @msg) = @_;
1456 1643
1457 $msg{msgid} = $id; 1644 $self->ns->ext_reply ($id, @msg)
1458 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1459} 1645}
1460 1646
1461=item $player->ext_event ($type, %msg) 1647=item $player->ext_msg ($type, @msg)
1462 1648
1463Sends an ext event to the client. 1649Sends an ext event to the client.
1464 1650
1465=cut 1651=cut
1466 1652
1467sub ext_event($$%) { 1653sub ext_msg($$@) {
1468 my ($self, $type, %msg) = @_; 1654 my ($self, $type, @msg) = @_;
1469 1655
1470 $self->ns->ext_event ($type, %msg); 1656 $self->ns->ext_msg ($type, @msg);
1471} 1657}
1472 1658
1473=head3 cf::region 1659=head3 cf::region
1474 1660
1475=over 4 1661=over 4
1488 my ($path) = @_; 1674 my ($path) = @_;
1489 1675
1490 my ($match, $specificity); 1676 my ($match, $specificity);
1491 1677
1492 for my $region (list) { 1678 for my $region (list) {
1493 if ($region->match && $path =~ $region->match) { 1679 if ($region->{match} && $path =~ $region->{match}) {
1494 ($match, $specificity) = ($region, $region->specificity) 1680 ($match, $specificity) = ($region, $region->specificity)
1495 if $region->specificity > $specificity; 1681 if $region->specificity > $specificity;
1496 } 1682 }
1497 } 1683 }
1498 1684
1519our $MAX_RESET = 3600; 1705our $MAX_RESET = 3600;
1520our $DEFAULT_RESET = 3000; 1706our $DEFAULT_RESET = 3000;
1521 1707
1522sub generate_random_map { 1708sub generate_random_map {
1523 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
1524 # mit "rum" bekleckern, nicht 1713 # mit "rum" bekleckern, nicht
1525 $self->_create_random_map ( 1714 $self->_create_random_map (
1526 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1715 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1527 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1716 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1528 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1717 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1618 $self->init; # pass $1 etc. 1807 $self->init; # pass $1 etc.
1619 return $self; 1808 return $self;
1620 } 1809 }
1621 } 1810 }
1622 1811
1623 Carp::carp "unable to resolve path '$path' (base '$base')."; 1812 Carp::cluck "unable to resolve path '$path' (base '$base').";
1624 () 1813 ()
1625} 1814}
1626 1815
1627sub init { 1816sub init {
1628 my ($self) = @_; 1817 my ($self) = @_;
1650 1839
1651# the temporary/swap location 1840# the temporary/swap location
1652sub save_path { 1841sub save_path {
1653 my ($self) = @_; 1842 my ($self) = @_;
1654 1843
1655 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1844 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1656 "$TMPDIR/$path.map" 1845 "$TMPDIR/$path.map"
1657} 1846}
1658 1847
1659# the unique path, undef == no special unique path 1848# the unique path, undef == no special unique path
1660sub uniq_path { 1849sub uniq_path {
1661 my ($self) = @_; 1850 my ($self) = @_;
1662 1851
1663 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1852 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1664 "$UNIQUEDIR/$path" 1853 "$UNIQUEDIR/$path"
1665} 1854}
1666 1855
1667# and all this just because we cannot iterate over 1856# and all this just because we cannot iterate over
1668# all maps in C++... 1857# all maps in C++...
1691 1880
1692sub load_header_from($) { 1881sub load_header_from($) {
1693 my ($self, $path) = @_; 1882 my ($self, $path) = @_;
1694 1883
1695 utf8::encode $path; 1884 utf8::encode $path;
1696 #aio_open $path, O_RDONLY, 0 1885 my $f = new_from_file cf::object::thawer $path
1697 # or return;
1698
1699 $self->_load_header ($path)
1700 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;
1701 1893
1702 $self->{load_path} = $path; 1894 $self->{load_path} = $path;
1703 1895
1704 1 1896 1
1705} 1897}
1759sub find { 1951sub find {
1760 my ($path, $origin) = @_; 1952 my ($path, $origin) = @_;
1761 1953
1762 $path = normalise $path, $origin && $origin->path; 1954 $path = normalise $path, $origin && $origin->path;
1763 1955
1956 cf::lock_wait "map_data:$path";#d#remove
1764 cf::lock_wait "map_find:$path"; 1957 cf::lock_wait "map_find:$path";
1765 1958
1766 $cf::MAP{$path} || do { 1959 $cf::MAP{$path} || do {
1960 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1767 my $guard = cf::lock_acquire "map_find:$path"; 1961 my $guard2 = cf::lock_acquire "map_find:$path";
1962
1768 my $map = new_from_path cf::map $path 1963 my $map = new_from_path cf::map $path
1769 or return; 1964 or return;
1770 1965
1771 $map->{last_save} = $cf::RUNTIME; 1966 $map->{last_save} = $cf::RUNTIME;
1772 1967
1774 or return; 1969 or return;
1775 1970
1776 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1971 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1777 # doing this can freeze the server in a sync job, obviously 1972 # doing this can freeze the server in a sync job, obviously
1778 #$cf::WAIT_FOR_TICK->wait; 1973 #$cf::WAIT_FOR_TICK->wait;
1974 undef $guard2;
1975 undef $guard1;
1779 $map->reset; 1976 $map->reset;
1780 undef $guard;
1781 return find $path; 1977 return find $path;
1782 } 1978 }
1783 1979
1784 $cf::MAP{$path} = $map 1980 $cf::MAP{$path} = $map
1785 } 1981 }
1794 local $self->{deny_reset} = 1; # loading can take a long time 1990 local $self->{deny_reset} = 1; # loading can take a long time
1795 1991
1796 my $path = $self->{path}; 1992 my $path = $self->{path};
1797 1993
1798 { 1994 {
1799 my $guard = cf::lock_acquire "map_load:$path"; 1995 my $guard = cf::lock_acquire "map_data:$path";
1800 1996
1997 return unless $self->valid;
1801 return if $self->in_memory != cf::MAP_SWAPPED; 1998 return unless $self->in_memory == cf::MAP_SWAPPED;
1802 1999
1803 $self->in_memory (cf::MAP_LOADING); 2000 $self->in_memory (cf::MAP_LOADING);
1804 2001
1805 $self->alloc; 2002 $self->alloc;
1806 2003
1807 $self->pre_load; 2004 $self->pre_load;
1808 Coro::cede; 2005 cf::cede_to_tick;
1809 2006
2007 my $f = new_from_file cf::object::thawer $self->{load_path};
2008 $f->skip_block;
1810 $self->_load_objects ($self->{load_path}, 1) 2009 $self->_load_objects ($f)
1811 or return; 2010 or return;
1812 2011
1813 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2012 $self->post_load_original
1814 if delete $self->{load_original}; 2013 if delete $self->{load_original};
1815 2014
1816 if (my $uniq = $self->uniq_path) { 2015 if (my $uniq = $self->uniq_path) {
1817 utf8::encode $uniq; 2016 utf8::encode $uniq;
1818 if (aio_open $uniq, O_RDONLY, 0) { 2017 unless (aio_stat $uniq) {
2018 if (my $f = new_from_file cf::object::thawer $uniq) {
1819 $self->clear_unique_items; 2019 $self->clear_unique_items;
1820 $self->_load_objects ($uniq, 0); 2020 $self->_load_objects ($f);
2021 $f->resolve_delayed_derefs;
2022 }
1821 } 2023 }
1822 } 2024 }
1823 2025
1824 Coro::cede; 2026 $f->resolve_delayed_derefs;
2027
2028 cf::cede_to_tick;
1825 # now do the right thing for maps 2029 # now do the right thing for maps
1826 $self->link_multipart_objects; 2030 $self->link_multipart_objects;
1827 $self->difficulty ($self->estimate_difficulty) 2031 $self->difficulty ($self->estimate_difficulty)
1828 unless $self->difficulty; 2032 unless $self->difficulty;
1829 Coro::cede; 2033 cf::cede_to_tick;
1830 2034
1831 unless ($self->{deny_activate}) { 2035 unless ($self->{deny_activate}) {
1832 $self->decay_objects; 2036 $self->decay_objects;
1833 $self->fix_auto_apply; 2037 $self->fix_auto_apply;
1834 $self->update_buttons; 2038 $self->update_buttons;
1835 Coro::cede; 2039 cf::cede_to_tick;
1836 $self->set_darkness_map; 2040 $self->set_darkness_map;
1837 Coro::cede; 2041 cf::cede_to_tick;
1838 $self->activate; 2042 $self->activate;
1839 } 2043 }
1840 2044
2045 $self->{last_save} = $cf::RUNTIME;
2046 $self->last_access ($cf::RUNTIME);
2047
1841 $self->in_memory (cf::MAP_IN_MEMORY); 2048 $self->in_memory (cf::MAP_ACTIVE);
1842 } 2049 }
1843 2050
1844 $self->post_load; 2051 $self->post_load;
1845} 2052}
1846 2053
1855 2062
1856 $self 2063 $self
1857} 2064}
1858 2065
1859# 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
1860sub load_diag { 2067sub load_neighbours {
1861 my ($map) = @_; 2068 my ($map) = @_;
1862 2069
1863 my @diag; # diagonal neighbours 2070 my @neigh; # diagonal neighbours
1864 2071
1865 for (0 .. 3) { 2072 for (0 .. 3) {
1866 my $neigh = $map->tile_path ($_) 2073 my $neigh = $map->tile_path ($_)
1867 or next; 2074 or next;
1868 $neigh = find $neigh, $map 2075 $neigh = find $neigh, $map
1869 or next; 2076 or next;
1870 $neigh->load; 2077 $neigh->load;
1871 2078
2079 push @neigh,
1872 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2080 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1873 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2081 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1874 } 2082 }
1875 2083
1876 for (@diag) { 2084 for (grep defined $_->[0], @neigh) {
2085 my ($path, $origin) = @$_;
1877 my $neigh = find @$_ 2086 my $neigh = find $path, $origin
1878 or next; 2087 or next;
1879 $neigh->load; 2088 $neigh->load;
1880 } 2089 }
1881} 2090}
1882 2091
1887} 2096}
1888 2097
1889sub do_load_sync { 2098sub do_load_sync {
1890 my ($map) = @_; 2099 my ($map) = @_;
1891 2100
2101 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2102 if $Coro::current == $Coro::main;
2103
1892 cf::sync_job { $map->load }; 2104 cf::sync_job { $map->load };
1893} 2105}
1894 2106
1895our %MAP_PREFETCH; 2107our %MAP_PREFETCH;
1896our $MAP_PREFETCHER = undef; 2108our $MAP_PREFETCHER = undef;
1897 2109
1898sub find_async { 2110sub find_async {
1899 my ($path, $origin) = @_; 2111 my ($path, $origin, $load) = @_;
1900 2112
1901 $path = normalise $path, $origin && $origin->{path}; 2113 $path = normalise $path, $origin && $origin->{path};
1902 2114
1903 if (my $map = $cf::MAP{$path}) { 2115 if (my $map = $cf::MAP{$path}) {
1904 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2116 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1905 } 2117 }
1906 2118
1907 undef $MAP_PREFETCH{$path}; 2119 $MAP_PREFETCH{$path} |= $load;
2120
1908 $MAP_PREFETCHER ||= cf::async { 2121 $MAP_PREFETCHER ||= cf::async {
2122 $Coro::current->{desc} = "map prefetcher";
2123
1909 while (%MAP_PREFETCH) { 2124 while (%MAP_PREFETCH) {
1910 for my $path (keys %MAP_PREFETCH) { 2125 while (my ($k, $v) = each %MAP_PREFETCH) {
1911 my $map = find $path 2126 if (my $map = find $k) {
1912 or next;
1913 $map->load; 2127 $map->load if $v;
2128 }
1914 2129
1915 delete $MAP_PREFETCH{$path}; 2130 delete $MAP_PREFETCH{$k};
1916 } 2131 }
1917 } 2132 }
1918 undef $MAP_PREFETCHER; 2133 undef $MAP_PREFETCHER;
1919 }; 2134 };
1920 $MAP_PREFETCHER->prio (6); 2135 $MAP_PREFETCHER->prio (6);
1923} 2138}
1924 2139
1925sub save { 2140sub save {
1926 my ($self) = @_; 2141 my ($self) = @_;
1927 2142
1928 my $lock = cf::lock_acquire "map_data:" . $self->path; 2143 my $lock = cf::lock_acquire "map_data:$self->{path}";
1929 2144
1930 $self->{last_save} = $cf::RUNTIME; 2145 $self->{last_save} = $cf::RUNTIME;
1931 2146
1932 return unless $self->dirty; 2147 return unless $self->dirty;
1933 2148
1939 return if $self->{deny_save}; 2154 return if $self->{deny_save};
1940 2155
1941 local $self->{last_access} = $self->last_access;#d# 2156 local $self->{last_access} = $self->last_access;#d#
1942 2157
1943 cf::async { 2158 cf::async {
2159 $Coro::current->{desc} = "map player save";
1944 $_->contr->save for $self->players; 2160 $_->contr->save for $self->players;
1945 }; 2161 };
2162
2163 cf::get_slot 0.02;
1946 2164
1947 if ($uniq) { 2165 if ($uniq) {
1948 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1949 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2167 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1950 } else { 2168 } else {
1956 my ($self) = @_; 2174 my ($self) = @_;
1957 2175
1958 # save first because save cedes 2176 # save first because save cedes
1959 $self->save; 2177 $self->save;
1960 2178
1961 my $lock = cf::lock_acquire "map_data:" . $self->path; 2179 my $lock = cf::lock_acquire "map_data:$self->{path}";
1962 2180
1963 return if $self->players; 2181 return if $self->players;
1964 return if $self->in_memory != cf::MAP_IN_MEMORY; 2182 return if $self->in_memory != cf::MAP_ACTIVE;
1965 return if $self->{deny_save}; 2183 return if $self->{deny_save};
1966 2184
2185 $self->in_memory (cf::MAP_SWAPPED);
2186
2187 $self->deactivate;
2188 $_->clear_links_to ($self) for values %cf::MAP;
1967 $self->clear; 2189 $self->clear;
1968 $self->in_memory (cf::MAP_SWAPPED);
1969} 2190}
1970 2191
1971sub reset_at { 2192sub reset_at {
1972 my ($self) = @_; 2193 my ($self) = @_;
1973 2194
2005 if $uniq; 2226 if $uniq;
2006 } 2227 }
2007 2228
2008 delete $cf::MAP{$self->path}; 2229 delete $cf::MAP{$self->path};
2009 2230
2231 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP;
2010 $self->clear; 2233 $self->clear;
2011
2012 $_->clear_links_to ($self) for values %cf::MAP;
2013 2234
2014 $self->unlink_save; 2235 $self->unlink_save;
2015 $self->destroy; 2236 $self->destroy;
2016} 2237}
2017 2238
2018my $nuke_counter = "aaaa"; 2239my $nuke_counter = "aaaa";
2019 2240
2020sub nuke { 2241sub nuke {
2021 my ($self) = @_; 2242 my ($self) = @_;
2022 2243
2244 {
2245 my $lock = cf::lock_acquire "map_data:$self->{path}";
2246
2023 delete $cf::MAP{$self->path}; 2247 delete $cf::MAP{$self->path};
2024 2248
2025 $self->unlink_save; 2249 $self->unlink_save;
2026 2250
2027 bless $self, "cf::map"; 2251 bless $self, "cf::map";
2028 delete $self->{deny_reset}; 2252 delete $self->{deny_reset};
2029 $self->{deny_save} = 1; 2253 $self->{deny_save} = 1;
2030 $self->reset_timeout (1); 2254 $self->reset_timeout (1);
2031 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2255 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2032 2256
2033 $cf::MAP{$self->path} = $self; 2257 $cf::MAP{$self->path} = $self;
2258 }
2034 2259
2035 $self->reset; # polite request, might not happen 2260 $self->reset; # polite request, might not happen
2036} 2261}
2037 2262
2038=item $maps = cf::map::tmp_maps 2263=item $maps = cf::map::tmp_maps
2080 2305
2081sub unique_maps() { 2306sub unique_maps() {
2082 [ 2307 [
2083 map { 2308 map {
2084 utf8::decode $_; 2309 utf8::decode $_;
2085 /\.map$/ 2310 s/\.map$//; # TODO future compatibility hack
2311 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2312 ? ()
2086 ? normalise $_ 2313 : normalise $_
2087 : ()
2088 } @{ aio_readdir $UNIQUEDIR or [] } 2314 } @{ aio_readdir $UNIQUEDIR or [] }
2089 ] 2315 ]
2090} 2316}
2091 2317
2092package cf;
2093
2094=back 2318=back
2095 2319
2096=head3 cf::object 2320=head3 cf::object
2097 2321
2098=cut 2322=cut
2101 2325
2102=over 4 2326=over 4
2103 2327
2104=item $ob->inv_recursive 2328=item $ob->inv_recursive
2105 2329
2106Returns 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.
2107 2332
2108=cut 2333=cut
2109 2334
2110sub inv_recursive_; 2335sub inv_recursive_;
2111sub inv_recursive_ { 2336sub inv_recursive_ {
2114 2339
2115sub inv_recursive { 2340sub inv_recursive {
2116 inv_recursive_ inv $_[0] 2341 inv_recursive_ inv $_[0]
2117} 2342}
2118 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
2119package cf; 2372package cf;
2120 2373
2121=back 2374=back
2122 2375
2123=head3 cf::object::player 2376=head3 cf::object::player
2129Sends 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>
2130can 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
2131dialogue with the given NPC character. 2384dialogue with the given NPC character.
2132 2385
2133=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};
2134 2401
2135# rough implementation of a future "reply" method that works 2402# rough implementation of a future "reply" method that works
2136# with dialog boxes. 2403# with dialog boxes.
2137#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
2138sub cf::object::player::reply($$$;$) { 2405sub cf::object::player::reply($$$;$) {
2145 2412
2146 } else { 2413 } else {
2147 my $pl = $self->contr; 2414 my $pl = $self->contr;
2148 2415
2149 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2416 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2150 my $diag = $pl->{npc_dialog}; 2417 my $dialog = $pl->{npc_dialog};
2151 $diag->{pl}->ext_reply ( 2418 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2152 $diag->{id},
2153 msgtype => "reply",
2154 msg => $diag->{pl}->expand_cfpod ($msg),
2155 add_topics => []
2156 );
2157 2419
2158 } else { 2420 } else {
2159 $msg = $npc->name . " says: $msg" if $npc; 2421 $msg = $npc->name . " says: $msg" if $npc;
2160 $self->message ($msg, $flags); 2422 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2161 } 2423 }
2162 } 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 (@_);
2163} 2435}
2164 2436
2165=item $player_object->may ("access") 2437=item $player_object->may ("access")
2166 2438
2167Returns wether the given player is authorized to access resource "access" 2439Returns wether the given player is authorized to access resource "access"
2180 2452
2181=item $player_object->enter_link 2453=item $player_object->enter_link
2182 2454
2183Freezes 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}>).
2184 2456
2185The 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.
2186I<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.
2187 2461
2188Will never block. 2462Will never block.
2189 2463
2190=item $player_object->leave_link ($map, $x, $y) 2464=item $player_object->leave_link ($map, $x, $y)
2191 2465
2246 # use -1 or undef as default coordinates, not 0, 0 2520 # use -1 or undef as default coordinates, not 0, 0
2247 ($x, $y) = ($map->enter_x, $map->enter_y) 2521 ($x, $y) = ($map->enter_x, $map->enter_y)
2248 if $x <=0 && $y <= 0; 2522 if $x <=0 && $y <= 0;
2249 2523
2250 $map->load; 2524 $map->load;
2251 $map->load_diag; 2525 $map->load_neighbours;
2252 2526
2253 return unless $self->contr->active; 2527 return unless $self->contr->active;
2528 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2254 $self->activate_recursive; 2529 $self->activate_recursive;
2255 2530
2256 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2257 $self->enter_map ($map, $x, $y); 2532 $self->enter_map ($map, $x, $y);
2258} 2533}
2259 2534
2260=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2535=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2261 2536
2262Moves 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
2263her, loading and preparing them map, calling the provided $check callback 2538her, loading and preparing them map, calling the provided $check callback
2264that 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
2265the 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 >>.
2266 2545
2267=cut 2546=cut
2268 2547
2269our $GOTOGEN; 2548our $GOTOGEN;
2270 2549
2271sub cf::object::player::goto { 2550sub cf::object::player::goto {
2272 my ($self, $path, $x, $y, $check) = @_; 2551 my ($self, $path, $x, $y, $check, $done) = @_;
2273 2552
2274 # 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
2275 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2554 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2276 2555
2277 $self->enter_link; 2556 $self->enter_link;
2278 2557
2279 (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
2280 my $map = eval { 2580 my $map = eval {
2281 my $map = cf::map::find $path; 2581 my $map = defined $path ? cf::map::find $path : undef;
2282 2582
2283 if ($map) { 2583 if ($map) {
2284 $map = $map->customise_for ($self); 2584 $map = $map->customise_for ($self);
2285 $map = $check->($map) if $check && $map; 2585 $map = $check->($map) if $check && $map;
2286 } else { 2586 } else {
2287 $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);
2288 } 2588 }
2289 2589
2290 $map 2590 $map
2291 }; 2591 };
2292 2592
2297 2597
2298 if ($gen == $self->{_goto_generation}) { 2598 if ($gen == $self->{_goto_generation}) {
2299 delete $self->{_goto_generation}; 2599 delete $self->{_goto_generation};
2300 $self->leave_link ($map, $x, $y); 2600 $self->leave_link ($map, $x, $y);
2301 } 2601 }
2602
2603 $done->() if $done;
2302 })->prio (1); 2604 })->prio (1);
2303} 2605}
2304 2606
2305=item $player_object->enter_exit ($exit_object) 2607=item $player_object->enter_exit ($exit_object)
2306 2608
2326} 2628}
2327 2629
2328sub prepare_random_map { 2630sub prepare_random_map {
2329 my ($exit) = @_; 2631 my ($exit) = @_;
2330 2632
2331 my $guard = cf::lock_acquire "exit_prepare:$exit";
2332
2333 # all this does is basically replace the /! path by 2633 # all this does is basically replace the /! path by
2334 # a new random map path (?random/...) with a seed 2634 # a new random map path (?random/...) with a seed
2335 # that depends on the exit object 2635 # that depends on the exit object
2336 2636
2337 my $rmp = parse_random_map_params $exit->msg; 2637 my $rmp = parse_random_map_params $exit->msg;
2339 if ($exit->map) { 2639 if ($exit->map) {
2340 $rmp->{region} = $exit->region->name; 2640 $rmp->{region} = $exit->region->name;
2341 $rmp->{origin_map} = $exit->map->path; 2641 $rmp->{origin_map} = $exit->map->path;
2342 $rmp->{origin_x} = $exit->x; 2642 $rmp->{origin_x} = $exit->x;
2343 $rmp->{origin_y} = $exit->y; 2643 $rmp->{origin_y} = $exit->y;
2644
2645 $exit->map->touch;
2344 } 2646 }
2345 2647
2346 $rmp->{random_seed} ||= $exit->random_seed; 2648 $rmp->{random_seed} ||= $exit->random_seed;
2347 2649
2348 my $data = cf::to_json $rmp; 2650 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2349 my $md5 = Digest::MD5::md5_hex $data; 2651 my $md5 = Digest::MD5::md5_hex $data;
2350 my $meta = "$RANDOMDIR/$md5.meta"; 2652 my $meta = "$RANDOMDIR/$md5.meta";
2351 2653
2352 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2654 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2353 aio_write $fh, 0, (length $data), $data, 0; 2655 aio_write $fh, 0, (length $data), $data, 0;
2354 undef $fh; 2656 undef $fh;
2355 aio_rename "$meta~", $meta; 2657 aio_rename "$meta~", $meta;
2356 2658
2659 my $slaying = "?random/$md5";
2660
2661 if ($exit->valid) {
2357 $exit->slaying ("?random/$md5"); 2662 $exit->slaying ("?random/$md5");
2358 $exit->msg (undef); 2663 $exit->msg (undef);
2664 }
2359 } 2665 }
2360} 2666}
2361 2667
2362sub cf::object::player::enter_exit { 2668sub cf::object::player::enter_exit {
2363 my ($self, $exit) = @_; 2669 my ($self, $exit) = @_;
2364 2670
2365 return unless $self->type == cf::PLAYER; 2671 return unless $self->type == cf::PLAYER;
2366 2672
2367 if ($exit->slaying eq "/!") {
2368 #TODO: this should de-fi-ni-te-ly not be a sync-job
2369 # the problem is that $exit might not survive long enough
2370 # so it needs to be done right now, right here
2371 cf::sync_job { prepare_random_map $exit };
2372 }
2373
2374 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2375 my $hp = $exit->stats->hp;
2376 my $sp = $exit->stats->sp;
2377
2378 $self->enter_link; 2673 $self->enter_link;
2379 2674
2380 # if exit is damned, update players death & WoR home-position
2381 $self->contr->savebed ($slaying, $hp, $sp)
2382 if $exit->flag (FLAG_DAMNED);
2383
2384 (async { 2675 (async {
2385 $self->deactivate_recursive; # just to be sure 2676 $Coro::current->{desc} = "enter_exit";
2677
2386 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
2387 $self->goto ($slaying, $hp, $sp); 2693 $self->goto ($map, $x, $y);
2388 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
2389 1; 2699 1
2390 }) { 2700 }) {
2391 $self->message ("Something went wrong deep within the crossfire server. " 2701 $self->message ("Something went wrong deep within the deliantra server. "
2392 . "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. "
2393 . "Please report this to the dungeon master!", 2703 . "Please report this to the dungeon master!",
2394 cf::NDI_UNIQUE | cf::NDI_RED); 2704 cf::NDI_UNIQUE | cf::NDI_RED);
2395 2705
2396 warn "ERROR in enter_exit: $@"; 2706 warn "ERROR in enter_exit: $@";
2415 2725
2416 utf8::encode $text; 2726 utf8::encode $text;
2417 $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);
2418} 2728}
2419 2729
2420=item $client->send_msg ($color, $type, $msg, [extra...]) 2730=item $client->send_msg ($channel, $msg, $color, [extra...])
2421 2731
2422Send a drawinfo or msg packet to the client, formatting the msg for the 2732Send a drawinfo or msg packet to the client, formatting the msg for the
2423client if neccessary. C<$type> should be a string identifying the type of 2733client if neccessary. C<$type> should be a string identifying the type of
2424the message, with C<log> being the default. If C<$color> is negative, suppress 2734the message, with C<log> being the default. If C<$color> is negative, suppress
2425the message unless the client supports the msg packet. 2735the message unless the client supports the msg packet.
2426 2736
2427=cut 2737=cut
2428 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
2429sub cf::client::send_msg { 2803sub cf::client::send_msg {
2430 my ($self, $color, $type, $msg, @extra) = @_; 2804 my ($self, $channel, $msg, $color, @extra) = @_;
2431 2805
2432 $msg = $self->pl->expand_cfpod ($msg); 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 }
2433 2830
2434 return unless @extra || length $msg; 2831 return unless @extra || length $msg;
2435 2832
2436 if ($self->can_msg) { 2833 if ($self->can_msg) {
2437 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 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);
2438 } else { 2854 } else {
2439 # replace some tags by gcfclient-compatible ones
2440 for ($msg) {
2441 1 while
2442 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2443 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2444 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2445 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2446 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2447 }
2448
2449 if ($color >= 0) { 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
2450 if (0 && $msg =~ /\[/) { 2870 if (0 && $msg =~ /\[/) {
2871 # COMMAND/INFO
2451 $self->send_packet ("drawextinfo $color 4 0 $msg") 2872 $self->send_packet ("drawextinfo $color 10 8 $msg")
2452 } else { 2873 } else {
2453 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2874 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2454 $self->send_packet ("drawinfo $color $msg") 2875 $self->send_packet ("drawinfo $color $msg")
2455 } 2876 }
2456 } 2877 }
2457 } 2878 }
2458} 2879}
2459 2880
2460=item $client->ext_event ($type, %msg) 2881=item $client->ext_msg ($type, @msg)
2461 2882
2462Sends an ext event to the client. 2883Sends an ext event to the client.
2463 2884
2464=cut 2885=cut
2465 2886
2466sub cf::client::ext_event($$%) { 2887sub cf::client::ext_msg($$@) {
2467 my ($self, $type, %msg) = @_; 2888 my ($self, $type, @msg) = @_;
2468 2889
2890 if ($self->extcmd == 2) {
2891 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2892 } elsif ($self->extcmd == 1) { # TODO: remove
2469 $msg{msgtype} = "event_$type"; 2893 push @msg, msgtype => "event_$type";
2470 $self->send_packet ("ext " . $self->{json_coder}->encode (\%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 }
2471} 2914}
2472 2915
2473=item $success = $client->query ($flags, "text", \&cb) 2916=item $success = $client->query ($flags, "text", \&cb)
2474 2917
2475Queues a query to the client, calling the given callback with 2918Queues a query to the client, calling the given callback with
2530 my ($ns, $buf) = @_; 2973 my ($ns, $buf) = @_;
2531 2974
2532 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2975 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2533 2976
2534 if (ref $msg) { 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
2535 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2985 if (my $cb = $EXTICMD{$type}) {
2536 if (my %reply = $cb->($ns, $msg)) { 2986 @reply = $cb->($ns, @payload);
2537 $reply{msgid} = $msg->{msgid};
2538 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2539 }
2540 } 2987 }
2988
2989 $ns->ext_reply ($reply, @reply)
2990 if $reply;
2991
2541 } else { 2992 } else {
2542 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2993 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2543 } 2994 }
2544 2995
2545 cf::override; 2996 cf::override;
2592our $safe = new Safe "safe"; 3043our $safe = new Safe "safe";
2593our $safe_hole = new Safe::Hole; 3044our $safe_hole = new Safe::Hole;
2594 3045
2595$SIG{FPE} = 'IGNORE'; 3046$SIG{FPE} = 'IGNORE';
2596 3047
2597$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));
2598 3053
2599# here we export the classes and methods available to script code 3054# here we export the classes and methods available to script code
2600 3055
2601=pod 3056=pod
2602 3057
2603The following functions and methods are available within a safe environment: 3058The following functions and methods are available within a safe environment:
2604 3059
2605 cf::object 3060 cf::object
2606 contr pay_amount pay_player map x y force_find force_add 3061 contr pay_amount pay_player map x y force_find force_add destroy
2607 insert remove 3062 insert remove name archname title slaying race decrease split
2608 3063
2609 cf::object::player 3064 cf::object::player
2610 player 3065 player
2611 3066
2612 cf::player 3067 cf::player
2617 3072
2618=cut 3073=cut
2619 3074
2620for ( 3075for (
2621 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3076 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2622 insert remove)], 3077 insert remove inv nrof name archname title slaying race
3078 decrease split destroy change_exp)],
2623 ["cf::object::player" => qw(player)], 3079 ["cf::object::player" => qw(player)],
2624 ["cf::player" => qw(peaceful)], 3080 ["cf::player" => qw(peaceful)],
2625 ["cf::map" => qw(trigger)], 3081 ["cf::map" => qw(trigger)],
2626) { 3082) {
2627 no strict 'refs'; 3083 no strict 'refs';
2703# the server's init and main functions 3159# the server's init and main functions
2704 3160
2705sub load_facedata($) { 3161sub load_facedata($) {
2706 my ($path) = @_; 3162 my ($path) = @_;
2707 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
2708 warn "loading facedata from $path\n"; 3170 warn "loading facedata from $path\n";
2709 3171
2710 my $facedata; 3172 my $facedata;
2711 0 < aio_load $path, $facedata 3173 0 < aio_load $path, $facedata
2712 or die "$path: $!"; 3174 or die "$path: $!";
2714 $facedata = Coro::Storable::thaw $facedata; 3176 $facedata = Coro::Storable::thaw $facedata;
2715 3177
2716 $facedata->{version} == 2 3178 $facedata->{version} == 2
2717 or cf::cleanup "$path: version mismatch, cannot proceed."; 3179 or cf::cleanup "$path: version mismatch, cannot proceed.";
2718 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
2719 { 3188 {
2720 my $faces = $facedata->{faceinfo}; 3189 my $faces = $facedata->{faceinfo};
2721 3190
2722 while (my ($face, $info) = each %$faces) { 3191 while (my ($face, $info) = each %$faces) {
2723 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3192 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3193
2724 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3194 cf::face::set_visibility $idx, $info->{visibility};
3195 cf::face::set_magicmap $idx, $info->{magicmap};
2725 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3196 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2726 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3197 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2727 Coro::cede; 3198
3199 cf::cede_to_tick;
2728 } 3200 }
2729 3201
2730 while (my ($face, $info) = each %$faces) { 3202 while (my ($face, $info) = each %$faces) {
2731 next unless $info->{smooth}; 3203 next unless $info->{smooth};
3204
2732 my $idx = cf::face::find $face 3205 my $idx = cf::face::find $face
2733 or next; 3206 or next;
3207
2734 if (my $smooth = cf::face::find $info->{smooth}) { 3208 if (my $smooth = cf::face::find $info->{smooth}) {
3209 cf::face::set_smooth $idx, $smooth;
2735 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3210 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2736 } else { 3211 } else {
2737 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3212 warn "smooth face '$info->{smooth}' not found for face '$face'";
2738 } 3213 }
2739 Coro::cede; 3214
3215 cf::cede_to_tick;
2740 } 3216 }
2741 } 3217 }
2742 3218
2743 { 3219 {
2744 my $anims = $facedata->{animinfo}; 3220 my $anims = $facedata->{animinfo};
2745 3221
2746 while (my ($anim, $info) = each %$anims) { 3222 while (my ($anim, $info) = each %$anims) {
2747 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3223 cf::anim::set $anim, $info->{frames}, $info->{facings};
2748 Coro::cede; 3224 cf::cede_to_tick;
2749 } 3225 }
2750 3226
2751 cf::anim::invalidate_all; # d'oh 3227 cf::anim::invalidate_all; # d'oh
2752 } 3228 }
2753 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
2754 1 3265 1
2755} 3266}
2756 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
2757sub 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
2758 load_resource_file "$MAPDIR/regions" 3311 load_resource_file "$MAPDIR/regions"
2759 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 }
2760} 3318}
2761 3319
2762sub reload_facedata { 3320sub reload_facedata {
2763 load_facedata "$DATADIR/facedata" 3321 load_facedata "$DATADIR/facedata"
2764 or die "unable to load facedata\n"; 3322 or die "unable to load facedata\n";
2765} 3323}
2766 3324
2767sub reload_archetypes { 3325sub reload_archetypes {
2768 load_resource_file "$DATADIR/archetypes" 3326 load_resource_file "$DATADIR/archetypes"
2769 or die "unable to load archetypes\n"; 3327 or die "unable to load archetypes\n";
2770 #d# NEED to laod twice to resolve forward references
2771 # this really needs to be done in an extra post-pass
2772 # (which needs to be synchronous, so solve it differently)
2773 load_resource_file "$DATADIR/archetypes"
2774 or die "unable to load archetypes\n";
2775} 3328}
2776 3329
2777sub reload_treasures { 3330sub reload_treasures {
2778 load_resource_file "$DATADIR/treasures" 3331 load_resource_file "$DATADIR/treasures"
2779 or die "unable to load treasurelists\n"; 3332 or die "unable to load treasurelists\n";
2780} 3333}
2781 3334
2782sub reload_resources { 3335sub reload_resources {
2783 warn "reloading resource files...\n"; 3336 warn "reloading resource files...\n";
2784 3337
3338 reload_facedata;
3339 reload_archetypes;
2785 reload_regions; 3340 reload_regions;
2786 reload_facedata;
2787 #reload_archetypes;#d#
2788 reload_archetypes;
2789 reload_treasures; 3341 reload_treasures;
2790 3342
2791 warn "finished reloading resource files\n"; 3343 warn "finished reloading resource files\n";
2792} 3344}
2793 3345
2794sub init { 3346sub init {
3347 my $guard = freeze_mainloop;
3348
3349 evthread_start IO::AIO::poll_fileno;
3350
2795 reload_resources; 3351 reload_resources;
2796} 3352}
2797 3353
2798sub cfg_load { 3354sub reload_config {
2799 open my $fh, "<:utf8", "$CONFDIR/config" 3355 open my $fh, "<:utf8", "$CONFDIR/config"
2800 or return; 3356 or return;
2801 3357
2802 local $/; 3358 local $/;
2803 *CFG = YAML::Syck::Load <$fh>; 3359 *CFG = YAML::Load <$fh>;
2804 3360
2805 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3361 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2806 3362
2807 $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};
2808 $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};
2814 }; 3370 };
2815 warn $@ if $@; 3371 warn $@ if $@;
2816 } 3372 }
2817} 3373}
2818 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
2819sub main { 3394sub main {
3395 atomic;
3396
2820 # we must not ever block the main coroutine 3397 # we must not ever block the main coroutine
2821 local $Coro::idle = sub { 3398 local $Coro::idle = sub {
2822 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#
2823 (async { 3400 (async {
2824 Event::one_event; 3401 $Coro::current->{desc} = "IDLE BUG HANDLER";
3402 EV::loop EV::LOOP_ONESHOT;
2825 })->prio (Coro::PRIO_MAX); 3403 })->prio (Coro::PRIO_MAX);
2826 }; 3404 };
2827 3405
2828 cfg_load; 3406 {
3407 my $guard = freeze_mainloop;
3408 reload_config;
2829 db_init; 3409 db_init;
2830 load_extensions; 3410 load_extensions;
2831 3411
2832 $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
2833 Event::loop; 3420 EV::loop;
2834} 3421}
2835 3422
2836############################################################################# 3423#############################################################################
2837# initialisation and cleanup 3424# initialisation and cleanup
2838 3425
2839# install some emergency cleanup handlers 3426# install some emergency cleanup handlers
2840BEGIN { 3427BEGIN {
3428 our %SIGWATCHER = ();
2841 for my $signal (qw(INT HUP TERM)) { 3429 for my $signal (qw(INT HUP TERM)) {
2842 Event->signal ( 3430 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2843 reentrant => 0,
2844 data => WF_AUTOCANCEL,
2845 signal => $signal,
2846 prio => 0,
2847 cb => sub {
2848 cf::cleanup "SIG$signal"; 3431 cf::cleanup "SIG$signal";
2849 },
2850 ); 3432 };
2851 } 3433 }
2852} 3434}
2853 3435
2854sub write_runtime { 3436sub write_runtime_sync {
2855 my $runtime = "$LOCALDIR/runtime";
2856
2857 # first touch the runtime file to show we are still running: 3437 # first touch the runtime file to show we are still running:
2858 # the fsync below can take a very very long time. 3438 # the fsync below can take a very very long time.
2859 3439
2860 IO::AIO::aio_utime $runtime, undef, undef; 3440 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2861 3441
2862 my $guard = cf::lock_acquire "write_runtime"; 3442 my $guard = cf::lock_acquire "write_runtime";
2863 3443
2864 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3444 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2865 or return; 3445 or return;
2866 3446
2867 my $value = $cf::RUNTIME + 90 + 10; 3447 my $value = $cf::RUNTIME + 90 + 10;
2868 # 10 is the runtime save interval, for a monotonic clock 3448 # 10 is the runtime save interval, for a monotonic clock
2869 # 60 allows for the watchdog to kill the server. 3449 # 60 allows for the watchdog to kill the server.
2879 aio_utime $fh, undef, undef; 3459 aio_utime $fh, undef, undef;
2880 3460
2881 close $fh 3461 close $fh
2882 or return; 3462 or return;
2883 3463
2884 aio_rename "$runtime~", $runtime 3464 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2885 and return; 3465 and return;
2886 3466
2887 warn "runtime file written.\n"; 3467 warn "runtime file written.\n";
2888 3468
2889 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 };
2890} 3513}
2891 3514
2892sub emergency_save() { 3515sub emergency_save() {
2893 my $freeze_guard = cf::freeze_mainloop; 3516 my $freeze_guard = cf::freeze_mainloop;
2894 3517
2900 # and maps saved/destroyed asynchronously. 3523 # and maps saved/destroyed asynchronously.
2901 warn "begin emergency player save\n"; 3524 warn "begin emergency player save\n";
2902 for my $login (keys %cf::PLAYER) { 3525 for my $login (keys %cf::PLAYER) {
2903 my $pl = $cf::PLAYER{$login} or next; 3526 my $pl = $cf::PLAYER{$login} or next;
2904 $pl->valid or next; 3527 $pl->valid or next;
3528 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2905 $pl->save; 3529 $pl->save;
2906 } 3530 }
2907 warn "end emergency player save\n"; 3531 warn "end emergency player save\n";
2908 3532
2909 warn "begin emergency map save\n"; 3533 warn "begin emergency map save\n";
2915 warn "end emergency map save\n"; 3539 warn "end emergency map save\n";
2916 3540
2917 warn "begin emergency database checkpoint\n"; 3541 warn "begin emergency database checkpoint\n";
2918 BDB::db_env_txn_checkpoint $DB_ENV; 3542 BDB::db_env_txn_checkpoint $DB_ENV;
2919 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";
2920 }; 3548 };
2921 3549
2922 warn "leave emergency perl save\n"; 3550 warn "leave emergency perl save\n";
2923} 3551}
2924 3552
2925sub post_cleanup { 3553sub post_cleanup {
2926 my ($make_core) = @_; 3554 my ($make_core) = @_;
2927 3555
2928 warn Carp::longmess "post_cleanup backtrace" 3556 warn Carp::longmess "post_cleanup backtrace"
2929 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#
2930} 3587}
2931 3588
2932sub do_reload_perl() { 3589sub do_reload_perl() {
2933 # can/must only be called in main 3590 # can/must only be called in main
2934 if ($Coro::current != $Coro::main) { 3591 if ($Coro::current != $Coro::main) {
2935 warn "can only reload from main coroutine"; 3592 warn "can only reload from main coroutine";
2936 return; 3593 return;
2937 } 3594 }
2938 3595
3596 return if $RELOAD++;
3597
3598 while ($RELOAD) {
2939 warn "reloading..."; 3599 warn "reloading...";
2940 3600
2941 warn "entering sync_job"; 3601 warn "entering sync_job";
2942 3602
2943 cf::sync_job { 3603 cf::sync_job {
2944 cf::write_runtime; # external watchdog should not bark 3604 cf::write_runtime_sync; # external watchdog should not bark
2945 cf::emergency_save; 3605 cf::emergency_save;
2946 cf::write_runtime; # external watchdog should not bark 3606 cf::write_runtime_sync; # external watchdog should not bark
2947 3607
2948 warn "syncing database to disk"; 3608 warn "syncing database to disk";
2949 BDB::db_env_txn_checkpoint $DB_ENV; 3609 BDB::db_env_txn_checkpoint $DB_ENV;
2950 3610
2951 # 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
2952 3612
2953 warn "cancelling all WF_AUTOCANCEL watchers";
2954 for (Event::all_watchers) {
2955 $_->cancel if $_->data & WF_AUTOCANCEL;
2956 }
2957
2958 warn "flushing outstanding aio requests"; 3613 warn "flushing outstanding aio requests";
2959 for (;;) {
2960 BDB::flush;
2961 IO::AIO::flush;
2962 Coro::cede;
2963 last unless IO::AIO::nreqs || BDB::nreqs; 3614 while (IO::AIO::nreqs || BDB::nreqs) {
2964 warn "iterate..."; 3615 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2965 }
2966
2967 ++$RELOAD;
2968
2969 warn "cancelling all extension coros";
2970 $_->cancel for values %EXT_CORO;
2971 %EXT_CORO = ();
2972
2973 warn "removing commands";
2974 %COMMAND = ();
2975
2976 warn "removing ext/exti commands";
2977 %EXTCMD = ();
2978 %EXTICMD = ();
2979
2980 warn "unloading/nuking all extensions";
2981 for my $pkg (@EXTS) {
2982 warn "... unloading $pkg";
2983
2984 if (my $cb = $pkg->can ("unload")) {
2985 eval {
2986 $cb->($pkg);
2987 1
2988 } or warn "$pkg unloaded, but with errors: $@";
2989 } 3616 }
2990 3617
2991 warn "... nuking $pkg"; 3618 warn "cancelling all extension coros";
2992 Symbol::delete_package $pkg; 3619 $_->cancel for values %EXT_CORO;
2993 } 3620 %EXT_CORO = ();
2994 3621
2995 warn "unloading all perl modules loaded from $LIBDIR"; 3622 warn "removing commands";
2996 while (my ($k, $v) = each %INC) { 3623 %COMMAND = ();
2997 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2998 3624
3625 warn "removing ext/exti commands";
3626 %EXTCMD = ();
3627 %EXTICMD = ();
3628
3629 warn "unloading/nuking all extensions";
3630 for my $pkg (@EXTS) {
2999 warn "... unloading $k"; 3631 warn "... unloading $pkg";
3000 delete $INC{$k};
3001 3632
3002 $k =~ s/\.pm$//;
3003 $k =~ s/\//::/g;
3004
3005 if (my $cb = $k->can ("unload_module")) { 3633 if (my $cb = $pkg->can ("unload")) {
3634 eval {
3006 $cb->(); 3635 $cb->($pkg);
3636 1
3637 } or warn "$pkg unloaded, but with errors: $@";
3638 }
3639
3640 warn "... clearing $pkg";
3641 clear_package $pkg;
3007 } 3642 }
3008 3643
3009 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;
3010 } 3659 }
3011 3660
3012 warn "getting rid of safe::, as good as possible"; 3661 warn "getting rid of safe::, as good as possible";
3013 Symbol::delete_package "safe::$_" 3662 clear_package "safe::$_"
3014 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);
3015 3664
3016 warn "unloading cf.pm \"a bit\""; 3665 warn "unloading cf.pm \"a bit\"";
3017 delete $INC{"cf.pm"}; 3666 delete $INC{"cf.pm"};
3018 delete $INC{"cf/pod.pm"}; 3667 delete $INC{"cf/pod.pm"};
3019 3668
3020 # don't, removes xs symbols, too, 3669 # don't, removes xs symbols, too,
3021 # and global variables created in xs 3670 # and global variables created in xs
3022 #Symbol::delete_package __PACKAGE__; 3671 #clear_package __PACKAGE__;
3023 3672
3024 warn "unload completed, starting to reload now"; 3673 warn "unload completed, starting to reload now";
3025 3674
3026 warn "reloading cf.pm"; 3675 warn "reloading cf.pm";
3027 require cf; 3676 require cf;
3028 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3677 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3029 3678
3030 warn "loading config and database again"; 3679 warn "loading config and database again";
3031 cf::cfg_load; 3680 cf::reload_config;
3032 3681
3033 warn "loading extensions"; 3682 warn "loading extensions";
3034 cf::load_extensions; 3683 cf::load_extensions;
3035 3684
3036 warn "reattaching attachments to objects/players"; 3685 warn "reattaching attachments to objects/players";
3037 _global_reattach; # objects, sockets 3686 _global_reattach; # objects, sockets
3038 warn "reattaching attachments to maps"; 3687 warn "reattaching attachments to maps";
3039 reattach $_ for values %MAP; 3688 reattach $_ for values %MAP;
3040 warn "reattaching attachments to players"; 3689 warn "reattaching attachments to players";
3041 reattach $_ for values %PLAYER; 3690 reattach $_ for values %PLAYER;
3042 3691
3043 warn "leaving sync_job"; 3692 warn "leaving sync_job";
3044 3693
3045 1 3694 1
3046 } or do { 3695 } or do {
3047 warn $@; 3696 warn $@;
3048 warn "error while reloading, exiting."; 3697 cf::cleanup "error while reloading, exiting.";
3049 exit 1;
3050 }; 3698 };
3051 3699
3052 warn "reloaded"; 3700 warn "reloaded";
3701 --$RELOAD;
3702 }
3053}; 3703};
3054 3704
3055our $RELOAD_WATCHER; # used only during reload 3705our $RELOAD_WATCHER; # used only during reload
3056 3706
3057sub reload_perl() { 3707sub reload_perl() {
3058 # doing reload synchronously and two reloads happen back-to-back, 3708 # doing reload synchronously and two reloads happen back-to-back,
3059 # coro crashes during coro_state_free->destroy here. 3709 # coro crashes during coro_state_free->destroy here.
3060 3710
3061 $RELOAD_WATCHER ||= Event->timer ( 3711 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
3062 reentrant => 0,
3063 after => 0,
3064 data => WF_AUTOCANCEL,
3065 cb => sub {
3066 do_reload_perl; 3712 do_reload_perl;
3067 undef $RELOAD_WATCHER; 3713 undef $RELOAD_WATCHER;
3068 },
3069 ); 3714 };
3070} 3715}
3071 3716
3072register_command "reload" => sub { 3717register_command "reload" => sub {
3073 my ($who, $arg) = @_; 3718 my ($who, $arg) = @_;
3074 3719
3075 if ($who->flag (FLAG_WIZ)) { 3720 if ($who->flag (FLAG_WIZ)) {
3076 $who->message ("reloading server."); 3721 $who->message ("reloading server.");
3722 async {
3723 $Coro::current->{desc} = "perl_reload";
3077 async { reload_perl }; 3724 reload_perl;
3725 };
3078 } 3726 }
3079}; 3727};
3080 3728
3081unshift @INC, $LIBDIR; 3729unshift @INC, $LIBDIR;
3082 3730
3084 3732
3085our @WAIT_FOR_TICK; 3733our @WAIT_FOR_TICK;
3086our @WAIT_FOR_TICK_BEGIN; 3734our @WAIT_FOR_TICK_BEGIN;
3087 3735
3088sub wait_for_tick { 3736sub wait_for_tick {
3089 return unless $TICK_WATCHER->is_active;
3090 return if $Coro::current == $Coro::main; 3737 return if tick_inhibit || $Coro::current == $Coro::main;
3091 3738
3092 my $signal = new Coro::Signal; 3739 my $signal = new Coro::Signal;
3093 push @WAIT_FOR_TICK, $signal; 3740 push @WAIT_FOR_TICK, $signal;
3094 $signal->wait; 3741 $signal->wait;
3095} 3742}
3096 3743
3097sub wait_for_tick_begin { 3744sub wait_for_tick_begin {
3098 return unless $TICK_WATCHER->is_active;
3099 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
3100 3746
3101 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
3102 push @WAIT_FOR_TICK_BEGIN, $signal; 3748 push @WAIT_FOR_TICK_BEGIN, $signal;
3103 $signal->wait; 3749 $signal->wait;
3104} 3750}
3105 3751
3106 my $min = 1e6;#d# 3752sub tick {
3107 my $avg = 10;
3108$TICK_WATCHER = Event->timer (
3109 reentrant => 0,
3110 parked => 1,
3111 prio => 0,
3112 at => $NEXT_TICK || $TICK,
3113 data => WF_AUTOCANCEL,
3114 cb => sub {
3115 if ($Coro::current != $Coro::main) { 3753 if ($Coro::current != $Coro::main) {
3116 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"
3117 unless ++$bug_warning > 10; 3755 unless ++$bug_warning > 10;
3118 return; 3756 return;
3119 } 3757 }
3120 3758
3121 $NOW = $tick_start = Event::time;
3122
3123 cf::server_tick; # one server iteration 3759 cf::server_tick; # one server iteration
3124 3760
3125 0 && sync_job {#d# 3761 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3126 for(1..10) { 3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3127 my $t = Event::time; 3763 Coro::async_pool {
3128 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3764 $Coro::current->{desc} = "runtime saver";
3129 or die; 3765 write_runtime_sync
3130 3766 or warn "ERROR: unable to write runtime file: $!";
3131 $map->width (50);
3132 $map->height (50);
3133 $map->alloc;
3134 $map->_load_objects ("/tmp/x.map", 1);
3135 my $t = Event::time - $t;
3136
3137 #next unless $t < 0.0013;#d#
3138 if ($t < $min) {
3139 $min = $t;
3140 }
3141 $avg = $avg * 0.99 + $t * 0.01;
3142 }
3143 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3144 exit 0;
3145 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3146 }; 3767 };
3768 }
3147 3769
3148 $RUNTIME += $TICK;
3149 $NEXT_TICK += $TICK;
3150
3151 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3152 $NEXT_RUNTIME_WRITE = $NOW + 10;
3153 Coro::async_pool {
3154 write_runtime
3155 or warn "ERROR: unable to write runtime file: $!";
3156 };
3157 }
3158
3159# my $AFTER = Event::time;
3160# warn $AFTER - $NOW;#d#
3161
3162 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3770 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3163 $sig->send; 3771 $sig->send;
3164 } 3772 }
3165 while (my $sig = shift @WAIT_FOR_TICK) { 3773 while (my $sig = shift @WAIT_FOR_TICK) {
3166 $sig->send; 3774 $sig->send;
3167 } 3775 }
3168 3776
3169 $NOW = Event::time; 3777 $LOAD = ($NOW - $TICK_START) / $TICK;
3170
3171 # if we are delayed by four ticks or more, skip them all
3172 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3173
3174 $TICK_WATCHER->at ($NEXT_TICK);
3175 $TICK_WATCHER->start;
3176
3177 $LOAD = ($NOW - $tick_start) / $TICK;
3178 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3778 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3179 3779
3180 _post_tick; 3780 if (0) {
3181 3781 if ($NEXT_TICK) {
3182 3782 my $jitter = $TICK_START - $NEXT_TICK;
3783 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3784 warn "jitter $JITTER\n";#d#
3785 }
3183 }, 3786 }
3184); 3787}
3185 3788
3186{ 3789{
3187 BDB::max_poll_time $TICK * 0.1; 3790 # configure BDB
3188 $BDB_POLL_WATCHER = Event->io ( 3791
3189 reentrant => 0,
3190 fd => BDB::poll_fileno,
3191 poll => 'r',
3192 prio => 0,
3193 data => WF_AUTOCANCEL,
3194 cb => \&BDB::poll_cb,
3195 );
3196 BDB::min_parallel 8; 3792 BDB::min_parallel 8;
3197 3793 BDB::max_poll_reqs $TICK * 0.1;
3198 BDB::set_sync_prepare { 3794 $AnyEvent::BDB::WATCHER->priority (1);
3199 my $status;
3200 my $current = $Coro::current;
3201 (
3202 sub {
3203 $status = $!;
3204 $current->ready; undef $current;
3205 },
3206 sub {
3207 Coro::schedule while defined $current;
3208 $! = $status;
3209 },
3210 )
3211 };
3212 3795
3213 unless ($DB_ENV) { 3796 unless ($DB_ENV) {
3214 $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);
3215 3803
3216 cf::sync_job { 3804 cf::sync_job {
3217 eval { 3805 eval {
3218 BDB::db_env_open 3806 BDB::db_env_open
3219 $DB_ENV, 3807 $DB_ENV,
3221 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
3222 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3810 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3223 0666; 3811 0666;
3224 3812
3225 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3813 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3226
3227 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3228 $DB_ENV->set_lk_detect;
3229 }; 3814 };
3230 3815
3231 cf::cleanup "db_env_open(db): $@" if $@; 3816 cf::cleanup "db_env_open(db): $@" if $@;
3232 }; 3817 };
3233 } 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 };
3234} 3829}
3235 3830
3236{ 3831{
3832 # configure IO::AIO
3833
3237 IO::AIO::min_parallel 8; 3834 IO::AIO::min_parallel 8;
3238
3239 undef $Coro::AIO::WATCHER;
3240 IO::AIO::max_poll_time $TICK * 0.1; 3835 IO::AIO::max_poll_time $TICK * 0.1;
3241 $AIO_POLL_WATCHER = Event->io ( 3836 undef $AnyEvent::AIO::WATCHER;
3242 reentrant => 0,
3243 data => WF_AUTOCANCEL,
3244 fd => IO::AIO::poll_fileno,
3245 poll => 'r',
3246 prio => 6,
3247 cb => \&IO::AIO::poll_cb,
3248 );
3249} 3837}
3250 3838
3251my $_log_backtrace; 3839my $_log_backtrace;
3252 3840
3253sub _log_backtrace { 3841sub _log_backtrace {
3256 $msg =~ s/\n//; 3844 $msg =~ s/\n//;
3257 3845
3258 # limit the # of concurrent backtraces 3846 # limit the # of concurrent backtraces
3259 if ($_log_backtrace < 2) { 3847 if ($_log_backtrace < 2) {
3260 ++$_log_backtrace; 3848 ++$_log_backtrace;
3849 my $perl_bt = Carp::longmess $msg;
3261 async { 3850 async {
3851 $Coro::current->{desc} = "abt $msg";
3852
3262 my @bt = fork_call { 3853 my @bt = fork_call {
3263 @addr = map { sprintf "%x", $_ } @addr; 3854 @addr = map { sprintf "%x", $_ } @addr;
3264 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3855 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3265 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 |"
3266 or die "addr2line: $!"; 3857 or die "addr2line: $!";
3274 } 3865 }
3275 3866
3276 @funcs 3867 @funcs
3277 }; 3868 };
3278 3869
3279 LOG llevInfo, "[ABT] $msg\n"; 3870 LOG llevInfo, "[ABT] $perl_bt\n";
3871 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3280 LOG llevInfo, "[ABT] $_\n" for @bt; 3872 LOG llevInfo, "[ABT] $_\n" for @bt;
3281 --$_log_backtrace; 3873 --$_log_backtrace;
3282 }; 3874 };
3283 } else { 3875 } else {
3284 LOG llevInfo, "[ABT] $msg\n"; 3876 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines