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

Diff Legend

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