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.309 by elmex, Mon Jul 16 15:27:06 2007 UTC vs.
Revision 1.452 by root, Tue Sep 23 00:24:52 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines