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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines