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.302 by root, Tue Jul 10 16:23:59 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;
34use Digest::MD5 (); 62use Digest::MD5 ();
63
64AnyEvent::detect;
35 65
36# configure various modules to our taste 66# configure various modules to our taste
37# 67#
38$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
39Coro::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";
40Compress::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
41 76
42$Event::Eval = 1; # no idea why this is required, but it is 77# strictly for debugging
43 78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 79
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 81
51our %COMMAND = (); 82our %COMMAND = ();
52our %COMMAND_TIME = (); 83our %COMMAND_TIME = ();
… …
55our %EXTCMD = (); 86our %EXTCMD = ();
56our %EXTICMD = (); 87our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 88our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 89our %EXT_MAP = (); # pluggable maps
59 90
60our $RELOAD; # number of reloads so far 91our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 92our @EVENT;
93our @REFLECT; # set by XS
94our %REFLECT; # set by us
62 95
63our $CONFDIR = confdir; 96our $CONFDIR = confdir;
64our $DATADIR = datadir; 97our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 98our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 99our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 100our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 101our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 102our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 103our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 104our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 105our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 106our $BDBDIR = "$LOCALDIR/db";
107our $PIDFILE = "$LOCALDIR/pid";
108our $RUNTIMEFILE = "$LOCALDIR/runtime";
109
110our %RESOURCE;
74 111
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 112our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 114our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 115our $USE_FSYNC = 1; # use fsync to write maps - default on
82 116
117our $BDB_DEADLOCK_WATCHER;
118our $BDB_CHECKPOINT_WATCHER;
83our $BDB_POLL_WATCHER; 119our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 120our $DB_ENV;
121
122our @EXTRA_MODULES = qw(pod mapscript);
85 123
86our %CFG; 124our %CFG;
87 125
88our $UPTIME; $UPTIME ||= time; 126our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 127our $RUNTIME;
128our $NOW;
90 129
91our %PLAYER; # all users 130our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 131our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 132our $LINK_MAP; # the special {link} map, which is always available
94 133
95# 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 ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 135our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 136
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 137our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 138our $LOADAVG; # same thing, but with alpha-smoothing
139our $JITTER; # average jitter
100our $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 :)
101 146
102binmode STDOUT; 147binmode STDOUT;
103binmode STDERR; 148binmode STDERR;
104 149
105# read virtual server time, if available 150# read virtual server time, if available
106unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 151unless ($RUNTIME || !-e $RUNTIMEFILE) {
107 open my $fh, "<", "$LOCALDIR/runtime" 152 open my $fh, "<", $RUNTIMEFILE
108 or die "unable to read runtime file: $!"; 153 or die "unable to read $RUNTIMEFILE file: $!";
109 $RUNTIME = <$fh> + 0.; 154 $RUNTIME = <$fh> + 0.;
110} 155}
156
157eval "sub TICK() { $TICK } 1" or die;
111 158
112mkdir $_ 159mkdir $_
113 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 160 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
114 161
115our $EMERGENCY_POSITION; 162our $EMERGENCY_POSITION;
116 163
117sub 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}
118 173
119############################################################################# 174#############################################################################
120 175
121=head2 GLOBAL VARIABLES 176=head2 GLOBAL VARIABLES
122 177
… …
158 213
159The raw value load value from the last tick. 214The raw value load value from the last tick.
160 215
161=item %cf::CFG 216=item %cf::CFG
162 217
163Configuration for the server, loaded from C</etc/crossfire/config>, or 218Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 219from wherever your confdir points to.
165 220
166=item cf::wait_for_tick, cf::wait_for_tick_begin 221=item cf::wait_for_tick, cf::wait_for_tick_begin
167 222
168These 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
169returns 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
170per 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.
171 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
172=back 239=back
173 240
174=cut 241=cut
175 242
176BEGIN { 243$Coro::State::WARNHOOK = sub {
177 *CORE::GLOBAL::warn = sub {
178 my $msg = join "", @_; 244 my $msg = join "", @_;
179 245
180 $msg .= "\n" 246 $msg .= "\n"
181 unless $msg =~ /\n$/; 247 unless $msg =~ /\n$/;
182 248
183 $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;
184 250
185 utf8::encode $msg;
186 LOG llevError, $msg; 251 LOG llevError, $msg;
187 }; 252};
188} 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};
189 267
190@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 268@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
191@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 269@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
192@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 270@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
193@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 271@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
200for my $pkg (qw( 278for my $pkg (qw(
201 cf::global cf::attachable 279 cf::global cf::attachable
202 cf::object cf::object::player 280 cf::object cf::object::player
203 cf::client cf::player 281 cf::client cf::player
204 cf::arch cf::living 282 cf::arch cf::living
283 cf::map cf::mapspace
205 cf::map cf::party cf::region 284 cf::party cf::region
206)) { 285)) {
207 no strict 'refs';
208 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 286 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
209} 287}
210 288
211$Event::DIED = sub { 289$EV::DIED = sub {
212 warn "error in event callback: @_"; 290 warn "error in event callback: @_";
213}; 291};
214 292
215############################################################################# 293#############################################################################
216 294
… …
239 $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;
240 $d 318 $d
241 } || "[unable to dump $_[0]: '$@']"; 319 } || "[unable to dump $_[0]: '$@']";
242} 320}
243 321
244=item $ref = cf::from_json $json 322=item $ref = cf::decode_json $json
245 323
246Converts a JSON string into the corresponding perl data structure. 324Converts a JSON string into the corresponding perl data structure.
247 325
248=item $json = cf::to_json $ref 326=item $json = cf::encode_json $ref
249 327
250Converts a perl data structure into its JSON representation. 328Converts a perl data structure into its JSON representation.
251 329
252=cut 330=cut
253 331
254our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 332our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255 333
256sub to_json ($) { $json_coder->encode ($_[0]) } 334sub encode_json($) { $json_coder->encode ($_[0]) }
257sub 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}
258 350
259=item cf::lock_wait $string 351=item cf::lock_wait $string
260 352
261Wait until the given lock is available. See cf::lock_acquire. 353Wait until the given lock is available. See cf::lock_acquire.
262 354
263=item my $lock = cf::lock_acquire $string 355=item my $lock = cf::lock_acquire $string
264 356
265Wait 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
266a 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,
267for example when the coroutine gets canceled), the lock is automatically 359for example when the coroutine gets canceled), the lock is automatically
268returned. 360returned.
269 361
362Locks are *not* recursive, locking from the same coro twice results in a
363deadlocked coro.
364
270Lock 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
271uses map_find and cf::map::load uses map_load). 366uses map_find and cf::map::load uses map_load).
272 367
273=item $locked = cf::lock_active $string 368=item $locked = cf::lock_active $string
274 369
275Return 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.
276 371
277=cut 372=cut
278 373
279our %LOCK; 374our $LOCKS = new Coro::SemaphoreSet;
280 375
281sub lock_wait($) { 376sub lock_wait($) {
282 my ($key) = @_; 377 $LOCKS->wait ($_[0]);
283
284 # wait for lock, if any
285 while ($LOCK{$key}) {
286 push @{ $LOCK{$key} }, $Coro::current;
287 Coro::schedule;
288 }
289} 378}
290 379
291sub lock_acquire($) { 380sub lock_acquire($) {
292 my ($key) = @_; 381 $LOCKS->guard ($_[0])
293
294 # wait, to be sure we are not locked
295 lock_wait $key;
296
297 $LOCK{$key} = [];
298
299 Coro::guard {
300 # wake up all waiters, to be on the safe side
301 $_->ready for @{ delete $LOCK{$key} };
302 }
303} 382}
304 383
305sub lock_active($) { 384sub lock_active($) {
306 my ($key) = @_; 385 $LOCKS->count ($_[0]) < 1
307
308 ! ! $LOCK{$key}
309} 386}
310 387
311sub freeze_mainloop { 388sub freeze_mainloop {
312 return unless $TICK_WATCHER->is_active; 389 tick_inhibit_inc;
313 390
314 my $guard = Coro::guard { 391 &Guard::guard (\&tick_inhibit_dec);
315 $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 }
316 }; 452 }
317 $TICK_WATCHER->stop; 453};
318 $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;
319} 467}
320 468
321=item cf::async { BLOCK } 469=item cf::async { BLOCK }
322 470
323Currently the same as Coro::async_pool, meaning you cannot use 471Currently the same as Coro::async_pool, meaning you cannot use
… …
328 476
329BEGIN { *async = \&Coro::async_pool } 477BEGIN { *async = \&Coro::async_pool }
330 478
331=item cf::sync_job { BLOCK } 479=item cf::sync_job { BLOCK }
332 480
333The design of Crossfire TRT requires that the main coroutine ($Coro::main) 481The design of Deliantra requires that the main coroutine ($Coro::main)
334is always able to handle events or runnable, as Crossfire TRT is only 482is always able to handle events or runnable, as Deliantra is only
335partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 483partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
336acceptable. 484acceptable.
337 485
338If 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
339the given BLOCK in another coroutine while waiting for the result. The 487the given BLOCK in another coroutine while waiting for the result. The
… …
344 492
345sub sync_job(&) { 493sub sync_job(&) {
346 my ($job) = @_; 494 my ($job) = @_;
347 495
348 if ($Coro::current == $Coro::main) { 496 if ($Coro::current == $Coro::main) {
349 my $time = Event::time; 497 my $time = EV::time;
350 498
351 # this is the main coro, too bad, we have to block 499 # this is the main coro, too bad, we have to block
352 # till the operation succeeds, freezing the server :/ 500 # till the operation succeeds, freezing the server :/
353 501
354 # TODO: use suspend/resume instead 502 LOG llevError, Carp::longmess "sync job";#d#
355 # (but this is cancel-safe) 503
356 my $freeze_guard = freeze_mainloop; 504 my $freeze_guard = freeze_mainloop;
357 505
358 my $busy = 1; 506 my $busy = 1;
359 my @res; 507 my @res;
360 508
361 (async { 509 (async {
510 $Coro::current->desc ("sync job coro");
362 @res = eval { $job->() }; 511 @res = eval { $job->() };
363 warn $@ if $@; 512 warn $@ if $@;
364 undef $busy; 513 undef $busy;
365 })->prio (Coro::PRIO_MAX); 514 })->prio (Coro::PRIO_MAX);
366 515
367 while ($busy) { 516 while ($busy) {
368 Coro::cede or Event::one_event; 517 if (Coro::nready) {
518 Coro::cede_notself;
519 } else {
520 EV::loop EV::LOOP_ONESHOT;
369 } 521 }
522 }
370 523
371 $time = Event::time - $time; 524 my $time = EV::time - $time;
372 525
373 LOG llevError | logBacktrace, Carp::longmess "long sync job"
374 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
375
376 $tick_start += $time; # do not account sync jobs to server load 526 $TICK_START += $time; # do not account sync jobs to server load
377 527
378 wantarray ? @res : $res[0] 528 wantarray ? @res : $res[0]
379 } else { 529 } else {
380 # we are in another coroutine, how wonderful, everything just works 530 # we are in another coroutine, how wonderful, everything just works
381 531
… …
406=item fork_call { }, $args 556=item fork_call { }, $args
407 557
408Executes the given code block with the given arguments in a seperate 558Executes the given code block with the given arguments in a seperate
409process, returning the results. Everything must be serialisable with 559process, returning the results. Everything must be serialisable with
410Coro::Storable. May, of course, block. Note that the executed sub may 560Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 561never block itself or use any form of event handling.
412 562
413=cut 563=cut
414
415sub _store_scalar {
416 open my $fh, ">", \my $buf
417 or die "fork_call: cannot open fh-to-buf in child : $!";
418 Storable::store_fd $_[0], $fh;
419 close $fh;
420
421 $buf
422}
423 564
424sub fork_call(&@) { 565sub fork_call(&@) {
425 my ($cb, @args) = @_; 566 my ($cb, @args) = @_;
426 567
427# 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,
428# or die "socketpair: $!"; 569 # otherwise perl prematurely frees the stuff :/
429 pipe my $fh1, my $fh2 570 # TODO: investigate and fix (likely this will be rather laborious)
430 or die "pipe: $!";
431 571
432 if (my $pid = fork) { 572 my @res = Coro::Util::fork_eval {
433 close $fh2;
434
435 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
436 warn "pst<$res>" unless $res =~ /^pst/;
437 $res = Coro::Storable::thaw $res;
438
439 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
440
441 Carp::confess $$res unless "ARRAY" eq ref $res;
442
443 return wantarray ? @$res : $res->[-1];
444 } else {
445 reset_signals; 573 reset_signals;
446 local $SIG{__WARN__}; 574 &$cb
447 local $SIG{__DIE__}; 575 }, @args;
448 # just in case, this hack effectively disables event
449 # in the child. cleaner and slower would be canceling all watchers,
450 # but this works for the time being.
451 local $Coro::idle;
452 $Coro::current->prio (Coro::PRIO_MAX);
453 576
454 eval { 577 wantarray ? @res : $res[-1]
455 close $fh1; 578}
456 579
457 my @res = eval { $cb->(@args) }; 580=item $coin = coin_from_name $name
458 581
459 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 582=cut
460 close $fh2;
461 };
462 583
463 warn $@ if $@; 584our %coin_alias = (
464 _exit 0; 585 "silver" => "silvercoin",
465 } 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
466} 605}
467 606
468=item $value = cf::db_get $family => $key 607=item $value = cf::db_get $family => $key
469 608
470Returns a single value from the environment database. 609Returns a single value from the environment database.
… …
472=item cf::db_put $family => $key => $value 611=item cf::db_put $family => $key => $value
473 612
474Stores 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
475data 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).
476 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
477=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}
478 639
479our $DB; 640our $DB;
480 641
481sub db_init { 642sub db_init {
482 unless ($DB) {
483 $DB = BDB::db_create $DB_ENV;
484
485 cf::sync_job { 643 cf::sync_job {
486 eval { 644 $DB ||= db_table "db";
487 $DB->set_flags (BDB::CHKSUM);
488
489 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
490 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
491 cf::cleanup "db_open(db): $!" if $!;
492 };
493 cf::cleanup "db_open(db): $@" if $@;
494 };
495 } 645 };
496} 646}
497 647
498sub db_get($$) { 648sub db_get($$) {
499 my $key = "$_[0]/$_[1]"; 649 my $key = "$_[0]/$_[1]";
500 650
… …
550 if (1) { 700 if (1) {
551 $md5 = 701 $md5 =
552 join "\x00", 702 join "\x00",
553 $processversion, 703 $processversion,
554 map { 704 map {
555 Coro::cede; 705 cf::cede_to_tick;
556 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 706 ($src->[$_], Digest::MD5::md5_hex $data[$_])
557 } 0.. $#$src; 707 } 0.. $#$src;
558 708
559 709
560 my $dbmd5 = db_get cache => "$id/md5"; 710 my $dbmd5 = db_get cache => "$id/md5";
… …
598 748
599############################################################################# 749#############################################################################
600 750
601=head2 ATTACHABLE OBJECTS 751=head2 ATTACHABLE OBJECTS
602 752
603Many 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
604attach callbacks/event handlers (a collection of which is called an "attachment") 754attach callbacks/event handlers (a collection of which is called an "attachment")
605to it. All such attachable objects support the following methods. 755to it. All such attachable objects support the following methods.
606 756
607In 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>
608C<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
609Crossfire TRT). 759Deliantra).
610 760
611=over 4 761=over 4
612 762
613=item $attachable->attach ($attachment, key => $value...) 763=item $attachable->attach ($attachment, key => $value...)
614 764
… …
658=item cf::CLASS::attachment $name, ... 808=item cf::CLASS::attachment $name, ...
659 809
660Register an attachment by C<$name> through which attachable objects of the 810Register an attachment by C<$name> through which attachable objects of the
661given CLASS can refer to this attachment. 811given CLASS can refer to this attachment.
662 812
663Some classes such as crossfire maps and objects can specify attachments 813Some classes such as deliantra maps and objects can specify attachments
664that 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.
665 815
666These calls expect any number of the following handler/hook descriptions: 816These calls expect any number of the following handler/hook descriptions:
667 817
668=over 4 818=over 4
… …
866 "; 1016 ";
867 die if $@; 1017 die if $@;
868} 1018}
869 1019
870our $override; 1020our $override;
871our @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?
872 1022
873sub override { 1023sub override {
874 $override = 1; 1024 $override = 1;
875 @invoke_results = (); 1025 @INVOKE_RESULTS = (@_);
876} 1026}
877 1027
878sub do_invoke { 1028sub do_invoke {
879 my $event = shift; 1029 my $event = shift;
880 my $callbacks = shift; 1030 my $callbacks = shift;
881 1031
882 @invoke_results = (); 1032 @INVOKE_RESULTS = ();
883 1033
884 local $override; 1034 local $override;
885 1035
886 for (@$callbacks) { 1036 for (@$callbacks) {
887 eval { &{$_->[1]} }; 1037 eval { &{$_->[1]} };
… …
896 } 1046 }
897 1047
898 0 1048 0
899} 1049}
900 1050
901=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1051=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
902 1052
903=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1053=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
904 1054
905Generate an object-specific event with the given arguments. 1055Generate an object-specific event with the given arguments.
906 1056
907This 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
908removed 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
909results (if you must, access C<@cf::invoke_results> directly). 1059results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910 1060
911=back 1061=back
912 1062
913=cut 1063=cut
914 1064
915############################################################################# 1065#############################################################################
916# 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}
917 1109
918sub reattach { 1110sub reattach {
919 # basically do the same as instantiate, without calling instantiate 1111 # basically do the same as instantiate, without calling instantiate
920 my ($obj) = @_; 1112 my ($obj) = @_;
921 1113
1114 # no longer needed after getting rid of delete_package?
922 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
923 1116
924 my $registry = $obj->registry; 1117 my $registry = $obj->registry;
925 1118
926 @$registry = (); 1119 @$registry = ();
927 1120
… …
942cf::attachable->attach ( 1135cf::attachable->attach (
943 prio => -1000000, 1136 prio => -1000000,
944 on_instantiate => sub { 1137 on_instantiate => sub {
945 my ($obj, $data) = @_; 1138 my ($obj, $data) = @_;
946 1139
947 $data = from_json $data; 1140 $data = decode_json $data;
948 1141
949 for (@$data) { 1142 for (@$data) {
950 my ($name, $args) = @$_; 1143 my ($name, $args) = @$_;
951 1144
952 $obj->attach ($name, %{$args || {} }); 1145 $obj->attach ($name, %{$args || {} });
… …
968sub object_freezer_save { 1161sub object_freezer_save {
969 my ($filename, $rdata, $objs) = @_; 1162 my ($filename, $rdata, $objs) = @_;
970 1163
971 sync_job { 1164 sync_job {
972 if (length $$rdata) { 1165 if (length $$rdata) {
1166 utf8::decode (my $decname = $filename);
973 warn sprintf "saving %s (%d,%d)\n", 1167 warn sprintf "saving %s (%d,%d)\n",
974 $filename, length $$rdata, scalar @$objs; 1168 $decname, length $$rdata, scalar @$objs;
975 1169
976 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1170 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
977 chmod SAVE_MODE, $fh; 1171 aio_chmod $fh, SAVE_MODE;
978 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1172 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
979 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 }
980 close $fh; 1177 aio_close $fh;
981 1178
982 if (@$objs) { 1179 if (@$objs) {
983 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) {
984 chmod SAVE_MODE, $fh; 1181 aio_chmod $fh, SAVE_MODE;
985 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1182 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
986 aio_write $fh, 0, (length $data), $data, 0; 1183 aio_write $fh, 0, (length $data), $data, 0;
987 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 }
988 close $fh; 1188 aio_close $fh;
989 aio_rename "$filename.pst~", "$filename.pst"; 1189 aio_rename "$filename.pst~", "$filename.pst";
990 } 1190 }
991 } else { 1191 } else {
992 aio_unlink "$filename.pst"; 1192 aio_unlink "$filename.pst";
993 } 1193 }
994 1194
995 aio_rename "$filename~", $filename; 1195 aio_rename "$filename~", $filename;
1196
1197 $filename =~ s%/[^/]+$%%;
1198 aio_pathsync $filename if $cf::USE_FSYNC;
996 } else { 1199 } else {
997 warn "FATAL: $filename~: $!\n"; 1200 warn "unable to save objects: $filename~: $!\n";
998 } 1201 }
999 } else { 1202 } else {
1000 aio_unlink $filename; 1203 aio_unlink $filename;
1001 aio_unlink "$filename.pst"; 1204 aio_unlink "$filename.pst";
1002 } 1205 }
1003 } 1206 };
1004} 1207}
1005 1208
1006sub object_freezer_as_string { 1209sub object_freezer_as_string {
1007 my ($rdata, $objs) = @_; 1210 my ($rdata, $objs) = @_;
1008 1211
… …
1020 or return; 1223 or return;
1021 1224
1022 unless (aio_stat "$filename.pst") { 1225 unless (aio_stat "$filename.pst") {
1023 (aio_load "$filename.pst", $av) >= 0 1226 (aio_load "$filename.pst", $av) >= 0
1024 or return; 1227 or return;
1228
1025 $av = eval { (Storable::thaw $av)->{objs} }; 1229 my $st = eval { Coro::Storable::thaw $av };
1230 $av = $st->{objs};
1026 } 1231 }
1027 1232
1233 utf8::decode (my $decname = $filename);
1028 warn sprintf "loading %s (%d)\n", 1234 warn sprintf "loading %s (%d,%d)\n",
1029 $filename, length $data, scalar @{$av || []}; 1235 $decname, length $data, scalar @{$av || []};
1236
1030 return ($data, $av); 1237 ($data, $av)
1031} 1238}
1032 1239
1033=head2 COMMAND CALLBACKS 1240=head2 COMMAND CALLBACKS
1034 1241
1035=over 4 1242=over 4
… …
1089 my ($name, $cb) = @_; 1296 my ($name, $cb) = @_;
1090 1297
1091 $EXTICMD{$name} = $cb; 1298 $EXTICMD{$name} = $cb;
1092} 1299}
1093 1300
1301use File::Glob ();
1302
1094cf::player->attach ( 1303cf::player->attach (
1095 on_command => sub { 1304 on_command => sub {
1096 my ($pl, $name, $params) = @_; 1305 my ($pl, $name, $params) = @_;
1097 1306
1098 my $cb = $COMMAND{$name} 1307 my $cb = $COMMAND{$name}
… …
1108 my ($pl, $buf) = @_; 1317 my ($pl, $buf) = @_;
1109 1318
1110 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1319 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111 1320
1112 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
1113 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1329 if (my $cb = $EXTCMD{$type}) {
1114 if (my %reply = $cb->($pl, $msg)) { 1330 @reply = $cb->($pl, @payload);
1115 $pl->ext_reply ($msg->{msgid}, %reply);
1116 }
1117 } 1331 }
1332
1333 $pl->ext_reply ($reply, @reply)
1334 if $reply;
1335
1118 } else { 1336 } else {
1119 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1337 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120 } 1338 }
1121 1339
1122 cf::override; 1340 cf::override;
1123 }, 1341 },
1124); 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}
1125 1356
1126sub load_extensions { 1357sub load_extensions {
1127 cf::sync_job { 1358 cf::sync_job {
1128 my %todo; 1359 my %todo;
1129 1360
… …
1149 1380
1150 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1381 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1151 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1382 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1152 1383
1153 $ext{source} = 1384 $ext{source} =
1154 "package $pkg; use strict; use utf8;\n" 1385 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1155 . "#line 1 \"$path\"\n{\n" 1386 . "#line 1 \"$path\"\n{\n"
1156 . $source 1387 . $source
1157 . "\n};\n1"; 1388 . "\n};\n1";
1158 1389
1159 $todo{$base} = \%ext; 1390 $todo{$base} = \%ext;
… …
1175 my $msg = $@ ? "$v->{path}: $@\n" 1406 my $msg = $@ ? "$v->{path}: $@\n"
1176 : "$v->{base}: extension inactive.\n"; 1407 : "$v->{base}: extension inactive.\n";
1177 1408
1178 if (exists $v->{meta}{mandatory}) { 1409 if (exists $v->{meta}{mandatory}) {
1179 warn $msg; 1410 warn $msg;
1180 warn "mandatory extension failed to load, exiting.\n"; 1411 cf::cleanup "mandatory extension failed to load, exiting.";
1181 exit 1;
1182 } 1412 }
1183 1413
1184 warn $msg; 1414 warn $msg;
1185 } 1415 }
1186 1416
… …
1200 1430
1201=back 1431=back
1202 1432
1203=head2 CORE EXTENSIONS 1433=head2 CORE EXTENSIONS
1204 1434
1205Functions and methods that extend core crossfire objects. 1435Functions and methods that extend core deliantra objects.
1206 1436
1207=cut 1437=cut
1208 1438
1209package cf::player; 1439package cf::player;
1210 1440
1211use Coro::AIO; 1441use Coro::AIO;
1212 1442
1213=head3 cf::player 1443=head3 cf::player
1214 1444
1215=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}
1216 1460
1217=item cf::player::find $login 1461=item cf::player::find $login
1218 1462
1219Returns the given player object, loading it if necessary (might block). 1463Returns the given player object, loading it if necessary (might block).
1220 1464
… …
1239 1483
1240sub exists($) { 1484sub exists($) {
1241 my ($login) = @_; 1485 my ($login) = @_;
1242 1486
1243 $cf::PLAYER{$login} 1487 $cf::PLAYER{$login}
1244 or cf::sync_job { !aio_stat path $login } 1488 or !aio_stat path $login
1245} 1489}
1246 1490
1247sub find($) { 1491sub find($) {
1248 return $cf::PLAYER{$_[0]} || do { 1492 return $cf::PLAYER{$_[0]} || do {
1249 my $login = $_[0]; 1493 my $login = $_[0];
… …
1256 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1500 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1257 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1501 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1258 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1502 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1259 aio_unlink +(playerdir $login) . "/$login.pl"; 1503 aio_unlink +(playerdir $login) . "/$login.pl";
1260 1504
1261 my $pl = load_pl path $login 1505 my $f = new_from_file cf::object::thawer path $login
1262 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;
1263 $cf::PLAYER{$login} = $pl 1513 $cf::PLAYER{$login} = $pl
1264 } 1514 }
1265 } 1515 }
1266} 1516}
1267 1517
… …
1276 return if $pl->{deny_save}; 1526 return if $pl->{deny_save};
1277 1527
1278 aio_mkdir playerdir $pl, 0770; 1528 aio_mkdir playerdir $pl, 0770;
1279 $pl->{last_save} = $cf::RUNTIME; 1529 $pl->{last_save} = $cf::RUNTIME;
1280 1530
1531 cf::get_slot 0.01;
1532
1281 $pl->save_pl ($path); 1533 $pl->save_pl ($path);
1282 Coro::cede; 1534 cf::cede_to_tick;
1283} 1535}
1284 1536
1285sub new($) { 1537sub new($) {
1286 my ($login) = @_; 1538 my ($login) = @_;
1287 1539
… …
1293 $cf::PLAYER{$login} = $self; 1545 $cf::PLAYER{$login} = $self;
1294 1546
1295 $self 1547 $self
1296} 1548}
1297 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
1298=item $pl->quit_character 1560=item $pl->quit_character
1299 1561
1300Nukes the player without looking back. If logged in, the connection will 1562Nukes the player without looking back. If logged in, the connection will
1301be destroyed. May block for a long time. 1563be destroyed. May block for a long time.
1302 1564
… …
1306 my ($pl) = @_; 1568 my ($pl) = @_;
1307 1569
1308 my $name = $pl->ob->name; 1570 my $name = $pl->ob->name;
1309 1571
1310 $pl->{deny_save} = 1; 1572 $pl->{deny_save} = 1;
1311 $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
1312 1574
1313 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1575 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1314 $pl->deactivate; 1576 $pl->deactivate;
1577 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1578 $pl->ob->check_score;
1315 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1579 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1316 $pl->ns->destroy if $pl->ns; 1580 $pl->ns->destroy if $pl->ns;
1317 1581
1318 my $path = playerdir $pl; 1582 my $path = playerdir $pl;
1319 my $temp = "$path~$cf::RUNTIME~deleting~"; 1583 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1355 or return []; 1619 or return [];
1356 1620
1357 my @logins; 1621 my @logins;
1358 1622
1359 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") {
1360 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1629 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1361 aio_read $fh, 0, 512, my $buf, 0 or next; 1630 aio_read $fh, 0, 512, my $buf, 0 or next;
1362 $buf !~ /^password -------------$/m or next; # official not-valid tag 1631 $buf !~ /^password -------------$/m or next; # official not-valid tag
1632 }
1363 1633
1364 utf8::decode $login; 1634 utf8::decode $login;
1365 push @logins, $login; 1635 push @logins, $login;
1366 } 1636 }
1367 1637
… …
1394 } 1664 }
1395 1665
1396 \@paths 1666 \@paths
1397} 1667}
1398 1668
1399=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1669=item $protocol_xml = $player->expand_cfpod ($cfpod)
1400 1670
1401Expand crossfire pod fragments into protocol xml. 1671Expand deliantra pod fragments into protocol xml.
1402 1672
1403=cut
1404
1405sub expand_cfpod {
1406 ((my $self), (local $_)) = @_;
1407
1408 # escape & and <
1409 s/&/&amp;/g;
1410 s/(?<![BIUGH])</&lt;/g;
1411
1412 # this is buggy, it needs to properly take care of nested <'s
1413
1414 1 while
1415 # replace B<>, I<>, U<> etc.
1416 s/B<([^\>]*)>/<b>$1<\/b>/
1417 || s/I<([^\>]*)>/<i>$1<\/i>/
1418 || s/U<([^\>]*)>/<u>$1<\/u>/
1419 # replace G<male|female> tags
1420 || s{G<([^>|]*)\|([^>]*)>}{
1421 $self->gender ? $2 : $1
1422 }ge
1423 # replace H<hint text>
1424 || s{H<([^\>]*)>}
1425 {
1426 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1427 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1428 "")
1429 [$self->{hintmode}]
1430 }ge;
1431
1432 # create single paragraphs (very hackish)
1433 s/(?<=\S)\n(?=\w)/ /g;
1434
1435 # compress some whitespace
1436 s/\s+\n/\n/g; # ws line-ends
1437 s/\n\n+/\n/g; # double lines
1438 s/^\n+//; # beginning lines
1439 s/\n+$//; # ending lines
1440
1441 $_
1442}
1443
1444sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode}
1447}
1448
1449=item $player->ext_reply ($msgid, %msg) 1673=item $player->ext_reply ($msgid, @msg)
1450 1674
1451Sends an ext reply to the player. 1675Sends an ext reply to the player.
1452 1676
1453=cut 1677=cut
1454 1678
1455sub ext_reply($$%) { 1679sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1680 my ($self, $id, @msg) = @_;
1457 1681
1458 $msg{msgid} = $id; 1682 $self->ns->ext_reply ($id, @msg)
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460} 1683}
1461 1684
1462=item $player->ext_event ($type, %msg) 1685=item $player->ext_msg ($type, @msg)
1463 1686
1464Sends an ext event to the client. 1687Sends an ext event to the client.
1465 1688
1466=cut 1689=cut
1467 1690
1468sub ext_event($$%) { 1691sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1692 my ($self, $type, @msg) = @_;
1470 1693
1471 $self->ns->ext_event ($type, %msg); 1694 $self->ns->ext_msg ($type, @msg);
1472} 1695}
1473 1696
1474=head3 cf::region 1697=head3 cf::region
1475 1698
1476=over 4 1699=over 4
… …
1489 my ($path) = @_; 1712 my ($path) = @_;
1490 1713
1491 my ($match, $specificity); 1714 my ($match, $specificity);
1492 1715
1493 for my $region (list) { 1716 for my $region (list) {
1494 if ($region->match && $path =~ $region->match) { 1717 if ($region->{match} && $path =~ $region->{match}) {
1495 ($match, $specificity) = ($region, $region->specificity) 1718 ($match, $specificity) = ($region, $region->specificity)
1496 if $region->specificity > $specificity; 1719 if $region->specificity > $specificity;
1497 } 1720 }
1498 } 1721 }
1499 1722
… …
1520our $MAX_RESET = 3600; 1743our $MAX_RESET = 3600;
1521our $DEFAULT_RESET = 3000; 1744our $DEFAULT_RESET = 3000;
1522 1745
1523sub generate_random_map { 1746sub generate_random_map {
1524 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
1525 # mit "rum" bekleckern, nicht 1751 # mit "rum" bekleckern, nicht
1526 $self->_create_random_map ( 1752 $self->_create_random_map (
1527 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1753 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1528 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1754 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1529 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1755 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1619 $self->init; # pass $1 etc. 1845 $self->init; # pass $1 etc.
1620 return $self; 1846 return $self;
1621 } 1847 }
1622 } 1848 }
1623 1849
1624 Carp::carp "unable to resolve path '$path' (base '$base')."; 1850 Carp::cluck "unable to resolve path '$path' (base '$base').";
1625 () 1851 ()
1626} 1852}
1627 1853
1628sub init { 1854sub init {
1629 my ($self) = @_; 1855 my ($self) = @_;
… …
1651 1877
1652# the temporary/swap location 1878# the temporary/swap location
1653sub save_path { 1879sub save_path {
1654 my ($self) = @_; 1880 my ($self) = @_;
1655 1881
1656 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1882 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1657 "$TMPDIR/$path.map" 1883 "$TMPDIR/$path.map"
1658} 1884}
1659 1885
1660# the unique path, undef == no special unique path 1886# the unique path, undef == no special unique path
1661sub uniq_path { 1887sub uniq_path {
1662 my ($self) = @_; 1888 my ($self) = @_;
1663 1889
1664 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1890 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1665 "$UNIQUEDIR/$path" 1891 "$UNIQUEDIR/$path"
1666}
1667
1668# and all this just because we cannot iterate over
1669# all maps in C++...
1670sub change_all_map_light {
1671 my ($change) = @_;
1672
1673 $_->change_map_light ($change)
1674 for grep $_->outdoor, values %cf::MAP;
1675} 1892}
1676 1893
1677sub decay_objects { 1894sub decay_objects {
1678 my ($self) = @_; 1895 my ($self) = @_;
1679 1896
… …
1692 1909
1693sub load_header_from($) { 1910sub load_header_from($) {
1694 my ($self, $path) = @_; 1911 my ($self, $path) = @_;
1695 1912
1696 utf8::encode $path; 1913 utf8::encode $path;
1697 #aio_open $path, O_RDONLY, 0 1914 my $f = new_from_file cf::object::thawer $path
1698 # or return;
1699
1700 $self->_load_header ($path)
1701 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;
1702 1922
1703 $self->{load_path} = $path; 1923 $self->{load_path} = $path;
1704 1924
1705 1 1925 1
1706} 1926}
… …
1760sub find { 1980sub find {
1761 my ($path, $origin) = @_; 1981 my ($path, $origin) = @_;
1762 1982
1763 $path = normalise $path, $origin && $origin->path; 1983 $path = normalise $path, $origin && $origin->path;
1764 1984
1985 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1765 cf::lock_wait "map_find:$path"; 1986 my $guard2 = cf::lock_acquire "map_find:$path";
1766 1987
1767 $cf::MAP{$path} || do { 1988 $cf::MAP{$path} || do {
1768 my $guard = cf::lock_acquire "map_find:$path";
1769 my $map = new_from_path cf::map $path 1989 my $map = new_from_path cf::map $path
1770 or return; 1990 or return;
1771 1991
1772 $map->{last_save} = $cf::RUNTIME; 1992 $map->{last_save} = $cf::RUNTIME;
1773 1993
… …
1775 or return; 1995 or return;
1776 1996
1777 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1997 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778 # doing this can freeze the server in a sync job, obviously 1998 # doing this can freeze the server in a sync job, obviously
1779 #$cf::WAIT_FOR_TICK->wait; 1999 #$cf::WAIT_FOR_TICK->wait;
2000 undef $guard2;
2001 undef $guard1;
1780 $map->reset; 2002 $map->reset;
1781 undef $guard;
1782 return find $path; 2003 return find $path;
1783 } 2004 }
1784 2005
1785 $cf::MAP{$path} = $map 2006 $cf::MAP{$path} = $map
1786 } 2007 }
… …
1795 local $self->{deny_reset} = 1; # loading can take a long time 2016 local $self->{deny_reset} = 1; # loading can take a long time
1796 2017
1797 my $path = $self->{path}; 2018 my $path = $self->{path};
1798 2019
1799 { 2020 {
1800 my $guard = cf::lock_acquire "map_load:$path"; 2021 my $guard = cf::lock_acquire "map_data:$path";
1801 2022
2023 return unless $self->valid;
1802 return if $self->in_memory != cf::MAP_SWAPPED; 2024 return unless $self->in_memory == cf::MAP_SWAPPED;
1803 2025
1804 $self->in_memory (cf::MAP_LOADING); 2026 $self->in_memory (cf::MAP_LOADING);
1805 2027
1806 $self->alloc; 2028 $self->alloc;
1807 2029
1808 $self->pre_load; 2030 $self->pre_load;
1809 Coro::cede; 2031 cf::cede_to_tick;
1810 2032
2033 my $f = new_from_file cf::object::thawer $self->{load_path};
2034 $f->skip_block;
1811 $self->_load_objects ($self->{load_path}, 1) 2035 $self->_load_objects ($f)
1812 or return; 2036 or return;
1813 2037
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2038 $self->post_load_original
1815 if delete $self->{load_original}; 2039 if delete $self->{load_original};
1816 2040
1817 if (my $uniq = $self->uniq_path) { 2041 if (my $uniq = $self->uniq_path) {
1818 utf8::encode $uniq; 2042 utf8::encode $uniq;
1819 if (aio_open $uniq, O_RDONLY, 0) { 2043 unless (aio_stat $uniq) {
2044 if (my $f = new_from_file cf::object::thawer $uniq) {
1820 $self->clear_unique_items; 2045 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0); 2046 $self->_load_objects ($f);
2047 $f->resolve_delayed_derefs;
2048 }
1822 } 2049 }
1823 } 2050 }
1824 2051
1825 Coro::cede; 2052 $f->resolve_delayed_derefs;
2053
2054 cf::cede_to_tick;
1826 # now do the right thing for maps 2055 # now do the right thing for maps
1827 $self->link_multipart_objects; 2056 $self->link_multipart_objects;
1828 $self->difficulty ($self->estimate_difficulty) 2057 $self->difficulty ($self->estimate_difficulty)
1829 unless $self->difficulty; 2058 unless $self->difficulty;
1830 Coro::cede; 2059 cf::cede_to_tick;
1831 2060
1832 unless ($self->{deny_activate}) { 2061 unless ($self->{deny_activate}) {
1833 $self->decay_objects; 2062 $self->decay_objects;
1834 $self->fix_auto_apply; 2063 $self->fix_auto_apply;
1835 $self->update_buttons; 2064 $self->update_buttons;
1836 Coro::cede; 2065 cf::cede_to_tick;
1837 $self->set_darkness_map;
1838 Coro::cede;
1839 $self->activate; 2066 $self->activate;
1840 } 2067 }
1841 2068
2069 $self->{last_save} = $cf::RUNTIME;
2070 $self->last_access ($cf::RUNTIME);
2071
1842 $self->in_memory (cf::MAP_IN_MEMORY); 2072 $self->in_memory (cf::MAP_ACTIVE);
1843 } 2073 }
1844 2074
1845 $self->post_load; 2075 $self->post_load;
1846} 2076}
1847 2077
… …
1856 2086
1857 $self 2087 $self
1858} 2088}
1859 2089
1860# 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
1861sub load_diag { 2091sub load_neighbours {
1862 my ($map) = @_; 2092 my ($map) = @_;
1863 2093
1864 my @diag; # diagonal neighbours 2094 my @neigh; # diagonal neighbours
1865 2095
1866 for (0 .. 3) { 2096 for (0 .. 3) {
1867 my $neigh = $map->tile_path ($_) 2097 my $neigh = $map->tile_path ($_)
1868 or next; 2098 or next;
1869 $neigh = find $neigh, $map 2099 $neigh = find $neigh, $map
1870 or next; 2100 or next;
1871 $neigh->load; 2101 $neigh->load;
1872 2102
2103 push @neigh,
1873 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2104 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1874 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2105 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1875 } 2106 }
1876 2107
1877 for (@diag) { 2108 for (grep defined $_->[0], @neigh) {
2109 my ($path, $origin) = @$_;
1878 my $neigh = find @$_ 2110 my $neigh = find $path, $origin
1879 or next; 2111 or next;
1880 $neigh->load; 2112 $neigh->load;
1881 } 2113 }
1882} 2114}
1883 2115
… …
1888} 2120}
1889 2121
1890sub do_load_sync { 2122sub do_load_sync {
1891 my ($map) = @_; 2123 my ($map) = @_;
1892 2124
2125 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2126 if $Coro::current == $Coro::main;
2127
1893 cf::sync_job { $map->load }; 2128 cf::sync_job { $map->load };
1894} 2129}
1895 2130
1896our %MAP_PREFETCH; 2131our %MAP_PREFETCH;
1897our $MAP_PREFETCHER = undef; 2132our $MAP_PREFETCHER = undef;
1898 2133
1899sub find_async { 2134sub find_async {
1900 my ($path, $origin) = @_; 2135 my ($path, $origin, $load) = @_;
1901 2136
1902 $path = normalise $path, $origin && $origin->{path}; 2137 $path = normalise $path, $origin && $origin->{path};
1903 2138
1904 if (my $map = $cf::MAP{$path}) { 2139 if (my $map = $cf::MAP{$path}) {
1905 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2140 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1906 } 2141 }
1907 2142
1908 undef $MAP_PREFETCH{$path}; 2143 $MAP_PREFETCH{$path} |= $load;
2144
1909 $MAP_PREFETCHER ||= cf::async { 2145 $MAP_PREFETCHER ||= cf::async {
2146 $Coro::current->{desc} = "map prefetcher";
2147
1910 while (%MAP_PREFETCH) { 2148 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 2149 while (my ($k, $v) = each %MAP_PREFETCH) {
1912 my $map = find $path 2150 if (my $map = find $k) {
1913 or next;
1914 $map->load; 2151 $map->load if $v;
2152 }
1915 2153
1916 delete $MAP_PREFETCH{$path}; 2154 delete $MAP_PREFETCH{$k};
1917 } 2155 }
1918 } 2156 }
1919 undef $MAP_PREFETCHER; 2157 undef $MAP_PREFETCHER;
1920 }; 2158 };
1921 $MAP_PREFETCHER->prio (6); 2159 $MAP_PREFETCHER->prio (6);
… …
1924} 2162}
1925 2163
1926sub save { 2164sub save {
1927 my ($self) = @_; 2165 my ($self) = @_;
1928 2166
1929 my $lock = cf::lock_acquire "map_data:" . $self->path; 2167 my $lock = cf::lock_acquire "map_data:$self->{path}";
1930 2168
1931 $self->{last_save} = $cf::RUNTIME; 2169 $self->{last_save} = $cf::RUNTIME;
1932 2170
1933 return unless $self->dirty; 2171 return unless $self->dirty;
1934 2172
… …
1940 return if $self->{deny_save}; 2178 return if $self->{deny_save};
1941 2179
1942 local $self->{last_access} = $self->last_access;#d# 2180 local $self->{last_access} = $self->last_access;#d#
1943 2181
1944 cf::async { 2182 cf::async {
2183 $Coro::current->{desc} = "map player save";
1945 $_->contr->save for $self->players; 2184 $_->contr->save for $self->players;
1946 }; 2185 };
2186
2187 cf::get_slot 0.02;
1947 2188
1948 if ($uniq) { 2189 if ($uniq) {
1949 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2190 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1950 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2191 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1951 } else { 2192 } else {
… …
1957 my ($self) = @_; 2198 my ($self) = @_;
1958 2199
1959 # save first because save cedes 2200 # save first because save cedes
1960 $self->save; 2201 $self->save;
1961 2202
1962 my $lock = cf::lock_acquire "map_data:" . $self->path; 2203 my $lock = cf::lock_acquire "map_data:$self->{path}";
1963 2204
1964 return if $self->players; 2205 return if $self->players;
1965 return if $self->in_memory != cf::MAP_IN_MEMORY; 2206 return if $self->in_memory != cf::MAP_ACTIVE;
1966 return if $self->{deny_save}; 2207 return if $self->{deny_save};
1967 2208
2209 $self->in_memory (cf::MAP_SWAPPED);
2210
2211 $self->deactivate;
2212 $_->clear_links_to ($self) for values %cf::MAP;
1968 $self->clear; 2213 $self->clear;
1969 $self->in_memory (cf::MAP_SWAPPED);
1970} 2214}
1971 2215
1972sub reset_at { 2216sub reset_at {
1973 my ($self) = @_; 2217 my ($self) = @_;
1974 2218
… …
1992 2236
1993 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2237 my $lock = cf::lock_acquire "map_data:$self->{path}";
1994 2238
1995 return if $self->players; 2239 return if $self->players;
1996 2240
1997 warn "resetting map ", $self->path; 2241 warn "resetting map ", $self->path, "\n";
1998 2242
1999 $self->in_memory (cf::MAP_SWAPPED); 2243 $self->in_memory (cf::MAP_SWAPPED);
2000 2244
2001 # need to save uniques path 2245 # need to save uniques path
2002 unless ($self->{deny_save}) { 2246 unless ($self->{deny_save}) {
… …
2006 if $uniq; 2250 if $uniq;
2007 } 2251 }
2008 2252
2009 delete $cf::MAP{$self->path}; 2253 delete $cf::MAP{$self->path};
2010 2254
2255 $self->deactivate;
2256 $_->clear_links_to ($self) for values %cf::MAP;
2011 $self->clear; 2257 $self->clear;
2012
2013 $_->clear_links_to ($self) for values %cf::MAP;
2014 2258
2015 $self->unlink_save; 2259 $self->unlink_save;
2016 $self->destroy; 2260 $self->destroy;
2017} 2261}
2018 2262
2019my $nuke_counter = "aaaa"; 2263my $nuke_counter = "aaaa";
2020 2264
2021sub nuke { 2265sub nuke {
2022 my ($self) = @_; 2266 my ($self) = @_;
2023 2267
2268 {
2269 my $lock = cf::lock_acquire "map_data:$self->{path}";
2270
2024 delete $cf::MAP{$self->path}; 2271 delete $cf::MAP{$self->path};
2025 2272
2026 $self->unlink_save; 2273 $self->unlink_save;
2027 2274
2028 bless $self, "cf::map"; 2275 bless $self, "cf::map";
2029 delete $self->{deny_reset}; 2276 delete $self->{deny_reset};
2030 $self->{deny_save} = 1; 2277 $self->{deny_save} = 1;
2031 $self->reset_timeout (1); 2278 $self->reset_timeout (1);
2032 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2279 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033 2280
2034 $cf::MAP{$self->path} = $self; 2281 $cf::MAP{$self->path} = $self;
2282 }
2035 2283
2036 $self->reset; # polite request, might not happen 2284 $self->reset; # polite request, might not happen
2037} 2285}
2038 2286
2039=item $maps = cf::map::tmp_maps 2287=item $maps = cf::map::tmp_maps
… …
2081 2329
2082sub unique_maps() { 2330sub unique_maps() {
2083 [ 2331 [
2084 map { 2332 map {
2085 utf8::decode $_; 2333 utf8::decode $_;
2086 /\.map$/ 2334 s/\.map$//; # TODO future compatibility hack
2335 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2336 ? ()
2087 ? normalise $_ 2337 : normalise $_
2088 : ()
2089 } @{ aio_readdir $UNIQUEDIR or [] } 2338 } @{ aio_readdir $UNIQUEDIR or [] }
2090 ] 2339 ]
2091} 2340}
2092 2341
2093package cf;
2094
2095=back 2342=back
2096 2343
2097=head3 cf::object 2344=head3 cf::object
2098 2345
2099=cut 2346=cut
… …
2102 2349
2103=over 4 2350=over 4
2104 2351
2105=item $ob->inv_recursive 2352=item $ob->inv_recursive
2106 2353
2107Returns 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.
2108 2356
2109=cut 2357=cut
2110 2358
2111sub inv_recursive_; 2359sub inv_recursive_;
2112sub inv_recursive_ { 2360sub inv_recursive_ {
… …
2115 2363
2116sub inv_recursive { 2364sub inv_recursive {
2117 inv_recursive_ inv $_[0] 2365 inv_recursive_ inv $_[0]
2118} 2366}
2119 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
2120package cf; 2396package cf;
2121 2397
2122=back 2398=back
2123 2399
2124=head3 cf::object::player 2400=head3 cf::object::player
… …
2130Sends 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>
2131can 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
2132dialogue with the given NPC character. 2408dialogue with the given NPC character.
2133 2409
2134=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};
2135 2425
2136# rough implementation of a future "reply" method that works 2426# rough implementation of a future "reply" method that works
2137# with dialog boxes. 2427# with dialog boxes.
2138#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
2139sub cf::object::player::reply($$$;$) { 2429sub cf::object::player::reply($$$;$) {
… …
2146 2436
2147 } else { 2437 } else {
2148 my $pl = $self->contr; 2438 my $pl = $self->contr;
2149 2439
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2440 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2441 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2442 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158 2443
2159 } else { 2444 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2445 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2446 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2162 } 2447 }
2163 } 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 (@_);
2164} 2459}
2165 2460
2166=item $player_object->may ("access") 2461=item $player_object->may ("access")
2167 2462
2168Returns wether the given player is authorized to access resource "access" 2463Returns wether the given player is authorized to access resource "access"
… …
2181 2476
2182=item $player_object->enter_link 2477=item $player_object->enter_link
2183 2478
2184Freezes 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}>).
2185 2480
2186The 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.
2187I<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.
2188 2485
2189Will never block. 2486Will never block.
2190 2487
2191=item $player_object->leave_link ($map, $x, $y) 2488=item $player_object->leave_link ($map, $x, $y)
2192 2489
… …
2247 # use -1 or undef as default coordinates, not 0, 0 2544 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2545 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2546 if $x <=0 && $y <= 0;
2250 2547
2251 $map->load; 2548 $map->load;
2252 $map->load_diag; 2549 $map->load_neighbours;
2253 2550
2254 return unless $self->contr->active; 2551 return unless $self->contr->active;
2255 $self->activate_recursive;
2256 2552
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2553 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258 $self->enter_map ($map, $x, $y); 2554 $self->enter_map ($map, $x, $y);
2259}
2260 2555
2556 # only activate afterwards, to support waiting in hooks
2557 $self->activate_recursive;
2558}
2559
2261=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2560=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2262 2561
2263Moves 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
2264her, loading and preparing them map, calling the provided $check callback 2563her, loading and preparing them map, calling the provided $check callback
2265that 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
2266the 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 >>.
2267 2570
2268=cut 2571=cut
2269 2572
2270our $GOTOGEN; 2573our $GOTOGEN;
2271 2574
2272sub cf::object::player::goto { 2575sub cf::object::player::goto {
2273 my ($self, $path, $x, $y, $check) = @_; 2576 my ($self, $path, $x, $y, $check, $done) = @_;
2274 2577
2275 # 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
2276 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2579 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2277 2580
2278 $self->enter_link; 2581 $self->enter_link;
2279 2582
2280 (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
2281 my $map = eval { 2605 my $map = eval {
2282 my $map = cf::map::find $path; 2606 my $map = defined $path ? cf::map::find $path : undef;
2283 2607
2284 if ($map) { 2608 if ($map) {
2285 $map = $map->customise_for ($self); 2609 $map = $map->customise_for ($self);
2286 $map = $check->($map) if $check && $map; 2610 $map = $check->($map) if $check && $map;
2287 } else { 2611 } else {
2288 $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);
2289 } 2613 }
2290 2614
2291 $map 2615 $map
2292 }; 2616 };
2293 2617
… …
2298 2622
2299 if ($gen == $self->{_goto_generation}) { 2623 if ($gen == $self->{_goto_generation}) {
2300 delete $self->{_goto_generation}; 2624 delete $self->{_goto_generation};
2301 $self->leave_link ($map, $x, $y); 2625 $self->leave_link ($map, $x, $y);
2302 } 2626 }
2627
2628 $done->() if $done;
2303 })->prio (1); 2629 })->prio (1);
2304} 2630}
2305 2631
2306=item $player_object->enter_exit ($exit_object) 2632=item $player_object->enter_exit ($exit_object)
2307 2633
… …
2327} 2653}
2328 2654
2329sub prepare_random_map { 2655sub prepare_random_map {
2330 my ($exit) = @_; 2656 my ($exit) = @_;
2331 2657
2332 my $guard = cf::lock_acquire "exit_prepare:$exit";
2333
2334 # all this does is basically replace the /! path by 2658 # all this does is basically replace the /! path by
2335 # a new random map path (?random/...) with a seed 2659 # a new random map path (?random/...) with a seed
2336 # that depends on the exit object 2660 # that depends on the exit object
2337 2661
2338 my $rmp = parse_random_map_params $exit->msg; 2662 my $rmp = parse_random_map_params $exit->msg;
… …
2340 if ($exit->map) { 2664 if ($exit->map) {
2341 $rmp->{region} = $exit->region->name; 2665 $rmp->{region} = $exit->region->name;
2342 $rmp->{origin_map} = $exit->map->path; 2666 $rmp->{origin_map} = $exit->map->path;
2343 $rmp->{origin_x} = $exit->x; 2667 $rmp->{origin_x} = $exit->x;
2344 $rmp->{origin_y} = $exit->y; 2668 $rmp->{origin_y} = $exit->y;
2669
2670 $exit->map->touch;
2345 } 2671 }
2346 2672
2347 $rmp->{random_seed} ||= $exit->random_seed; 2673 $rmp->{random_seed} ||= $exit->random_seed;
2348 2674
2349 my $data = cf::to_json $rmp; 2675 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2350 my $md5 = Digest::MD5::md5_hex $data; 2676 my $md5 = Digest::MD5::md5_hex $data;
2351 my $meta = "$RANDOMDIR/$md5.meta"; 2677 my $meta = "$RANDOMDIR/$md5.meta";
2352 2678
2353 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2679 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2354 aio_write $fh, 0, (length $data), $data, 0; 2680 aio_write $fh, 0, (length $data), $data, 0;
2355 undef $fh; 2681 undef $fh;
2356 aio_rename "$meta~", $meta; 2682 aio_rename "$meta~", $meta;
2357 2683
2684 my $slaying = "?random/$md5";
2685
2686 if ($exit->valid) {
2358 $exit->slaying ("?random/$md5"); 2687 $exit->slaying ("?random/$md5");
2359 $exit->msg (undef); 2688 $exit->msg (undef);
2689 }
2360 } 2690 }
2361} 2691}
2362 2692
2363sub cf::object::player::enter_exit { 2693sub cf::object::player::enter_exit {
2364 my ($self, $exit) = @_; 2694 my ($self, $exit) = @_;
2365 2695
2366 return unless $self->type == cf::PLAYER; 2696 return unless $self->type == cf::PLAYER;
2367 2697
2368 if ($exit->slaying eq "/!") {
2369 #TODO: this should de-fi-ni-te-ly not be a sync-job
2370 # the problem is that $exit might not survive long enough
2371 # so it needs to be done right now, right here
2372 cf::sync_job { prepare_random_map $exit };
2373 }
2374
2375 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2376 my $hp = $exit->stats->hp;
2377 my $sp = $exit->stats->sp;
2378
2379 $self->enter_link; 2698 $self->enter_link;
2380 2699
2381 # if exit is damned, update players death & WoR home-position
2382 $self->contr->savebed ($slaying, $hp, $sp)
2383 if $exit->flag (FLAG_DAMNED);
2384
2385 (async { 2700 (async {
2386 $self->deactivate_recursive; # just to be sure 2701 $Coro::current->{desc} = "enter_exit";
2702
2387 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
2388 $self->goto ($slaying, $hp, $sp); 2718 $self->goto ($map, $x, $y);
2389 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
2390 1; 2724 1
2391 }) { 2725 }) {
2392 $self->message ("Something went wrong deep within the crossfire server. " 2726 $self->message ("Something went wrong deep within the deliantra server. "
2393 . "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. "
2394 . "Please report this to the dungeon master!", 2728 . "Please report this to the dungeon master!",
2395 cf::NDI_UNIQUE | cf::NDI_RED); 2729 cf::NDI_UNIQUE | cf::NDI_RED);
2396 2730
2397 warn "ERROR in enter_exit: $@"; 2731 warn "ERROR in enter_exit: $@";
… …
2416 2750
2417 utf8::encode $text; 2751 utf8::encode $text;
2418 $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);
2419} 2753}
2420 2754
2421=item $client->send_msg ($color, $type, $msg, [extra...]) 2755=item $client->send_msg ($channel, $msg, $color, [extra...])
2422 2756
2423Send 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
2424client 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
2425the 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
2426the message unless the client supports the msg packet. 2760the message unless the client supports the msg packet.
2427 2761
2428=cut 2762=cut
2429 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
2430sub cf::client::send_msg { 2866sub cf::client::send_msg {
2431 my ($self, $color, $type, $msg, @extra) = @_; 2867 my ($self, $channel, $msg, $color, @extra) = @_;
2432 2868
2433 $msg = $self->pl->expand_cfpod ($msg); 2869 $msg = $self->pl->expand_cfpod ($msg)
2870 unless $color & cf::NDI_VERBATIM;
2871
2872 $color &= cf::NDI_CLIENT_MASK; # just in case...
2873
2874 # check predefined channels, for the benefit of C
2875 if ($CHANNEL{$channel}) {
2876 $channel = $CHANNEL{$channel};
2877
2878 $self->ext_msg (channel_info => $channel);
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);
2886 }
2887
2888 $channel = $channel->{id};
2889 }
2434 2890
2435 return unless @extra || length $msg; 2891 return unless @extra || length $msg;
2436 2892
2437 if ($self->can_msg) { 2893 # default colour, mask it out
2438 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2894 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2439 } else { 2895 if $color & cf::NDI_DEF;
2440 # replace some tags by gcfclient-compatible ones
2441 for ($msg) {
2442 1 while
2443 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2444 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2445 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2446 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2447 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2448 }
2449 2896
2450 if ($color >= 0) { 2897 my $pkt = "msg "
2451 if (0 && $msg =~ /\[/) { 2898 . $self->{json_coder}->encode (
2452 $self->send_packet ("drawextinfo $color 4 0 $msg") 2899 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2453 } else { 2900 );
2454 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2455 $self->send_packet ("drawinfo $color $msg")
2456 }
2457 }
2458 }
2459}
2460 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
2461=item $client->ext_event ($type, %msg) 2915=item $client->ext_msg ($type, @msg)
2462 2916
2463Sends an ext event to the client. 2917Sends an ext event to the client.
2464 2918
2465=cut 2919=cut
2466 2920
2467sub cf::client::ext_event($$%) { 2921sub cf::client::ext_msg($$@) {
2468 my ($self, $type, %msg) = @_; 2922 my ($self, $type, @msg) = @_;
2469 2923
2924 if ($self->extcmd == 2) {
2925 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2926 } elsif ($self->extcmd == 1) { # TODO: remove
2470 $msg{msgtype} = "event_$type"; 2927 push @msg, msgtype => "event_$type";
2471 $self->send_packet ("ext " . $self->{json_coder}->encode (\%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 }
2472} 2948}
2473 2949
2474=item $success = $client->query ($flags, "text", \&cb) 2950=item $success = $client->query ($flags, "text", \&cb)
2475 2951
2476Queues a query to the client, calling the given callback with 2952Queues a query to the client, calling the given callback with
… …
2531 my ($ns, $buf) = @_; 3007 my ($ns, $buf) = @_;
2532 3008
2533 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3009 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2534 3010
2535 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
2536 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3019 if (my $cb = $EXTICMD{$type}) {
2537 if (my %reply = $cb->($ns, $msg)) { 3020 @reply = $cb->($ns, @payload);
2538 $reply{msgid} = $msg->{msgid};
2539 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2540 }
2541 } 3021 }
3022
3023 $ns->ext_reply ($reply, @reply)
3024 if $reply;
3025
2542 } else { 3026 } else {
2543 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";
2544 } 3028 }
2545 3029
2546 cf::override; 3030 cf::override;
… …
2593our $safe = new Safe "safe"; 3077our $safe = new Safe "safe";
2594our $safe_hole = new Safe::Hole; 3078our $safe_hole = new Safe::Hole;
2595 3079
2596$SIG{FPE} = 'IGNORE'; 3080$SIG{FPE} = 'IGNORE';
2597 3081
2598$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));
2599 3087
2600# here we export the classes and methods available to script code 3088# here we export the classes and methods available to script code
2601 3089
2602=pod 3090=pod
2603 3091
2604The following functions and methods are available within a safe environment: 3092The following functions and methods are available within a safe environment:
2605 3093
2606 cf::object 3094 cf::object
2607 contr pay_amount pay_player map x y force_find force_add 3095 contr pay_amount pay_player map x y force_find force_add destroy
2608 insert remove 3096 insert remove name archname title slaying race decrease split
3097 value
2609 3098
2610 cf::object::player 3099 cf::object::player
2611 player 3100 player
2612 3101
2613 cf::player 3102 cf::player
… …
2618 3107
2619=cut 3108=cut
2620 3109
2621for ( 3110for (
2622 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3111 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2623 insert remove)], 3112 insert remove inv nrof name archname title slaying race
3113 decrease split destroy change_exp value msg lore send_msg)],
2624 ["cf::object::player" => qw(player)], 3114 ["cf::object::player" => qw(player)],
2625 ["cf::player" => qw(peaceful)], 3115 ["cf::player" => qw(peaceful send_msg)],
2626 ["cf::map" => qw(trigger)], 3116 ["cf::map" => qw(trigger)],
2627) { 3117) {
2628 no strict 'refs'; 3118 no strict 'refs';
2629 my ($pkg, @funs) = @$_; 3119 my ($pkg, @funs) = @$_;
2630 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3120 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2647 my ($code, %vars) = @_; 3137 my ($code, %vars) = @_;
2648 3138
2649 my $qcode = $code; 3139 my $qcode = $code;
2650 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3140 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2651 $qcode =~ s/\n/\\n/g; 3141 $qcode =~ s/\n/\\n/g;
3142
3143 %vars = (_dummy => 0) unless %vars;
2652 3144
2653 local $_; 3145 local $_;
2654 local @safe::cf::_safe_eval_args = values %vars; 3146 local @safe::cf::_safe_eval_args = values %vars;
2655 3147
2656 my $eval = 3148 my $eval =
… …
2704# the server's init and main functions 3196# the server's init and main functions
2705 3197
2706sub load_facedata($) { 3198sub load_facedata($) {
2707 my ($path) = @_; 3199 my ($path) = @_;
2708 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
2709 warn "loading facedata from $path\n"; 3207 warn "loading facedata from $path\n";
2710 3208
2711 my $facedata; 3209 my $facedata;
2712 0 < aio_load $path, $facedata 3210 0 < aio_load $path, $facedata
2713 or die "$path: $!"; 3211 or die "$path: $!";
… …
2715 $facedata = Coro::Storable::thaw $facedata; 3213 $facedata = Coro::Storable::thaw $facedata;
2716 3214
2717 $facedata->{version} == 2 3215 $facedata->{version} == 2
2718 or cf::cleanup "$path: version mismatch, cannot proceed."; 3216 or cf::cleanup "$path: version mismatch, cannot proceed.";
2719 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
2720 { 3225 {
2721 my $faces = $facedata->{faceinfo}; 3226 my $faces = $facedata->{faceinfo};
2722 3227
2723 while (my ($face, $info) = each %$faces) { 3228 while (my ($face, $info) = each %$faces) {
2724 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3229 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3230
2725 cf::face::set_visibility $idx, $info->{visibility}; 3231 cf::face::set_visibility $idx, $info->{visibility};
2726 cf::face::set_magicmap $idx, $info->{magicmap}; 3232 cf::face::set_magicmap $idx, $info->{magicmap};
2727 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3233 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2728 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3234 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2729 3235
2730 cf::cede_to_tick; 3236 cf::cede_to_tick;
2731 } 3237 }
2732 3238
2733 while (my ($face, $info) = each %$faces) { 3239 while (my ($face, $info) = each %$faces) {
2734 next unless $info->{smooth}; 3240 next unless $info->{smooth};
3241
2735 my $idx = cf::face::find $face 3242 my $idx = cf::face::find $face
2736 or next; 3243 or next;
3244
2737 if (my $smooth = cf::face::find $info->{smooth}) { 3245 if (my $smooth = cf::face::find $info->{smooth}) {
2738 cf::face::set_smooth $idx, $smooth; 3246 cf::face::set_smooth $idx, $smooth;
2739 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3247 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2740 } else { 3248 } else {
2741 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3249 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
2758 3266
2759 { 3267 {
2760 # TODO: for gcfclient pleasure, we should give resources 3268 # TODO: for gcfclient pleasure, we should give resources
2761 # that gcfclient doesn't grok a >10000 face index. 3269 # that gcfclient doesn't grok a >10000 face index.
2762 my $res = $facedata->{resource}; 3270 my $res = $facedata->{resource};
2763 my $enc = JSON::XS->new->utf8->canonical;
2764 3271
2765 while (my ($name, $info) = each %$res) { 3272 while (my ($name, $info) = each %$res) {
2766 my $meta = $enc->encode ({ 3273 if (defined $info->{type}) {
2767 name => $name,
2768 type => $info->{type},
2769 copyright => $info->{copyright},
2770 });
2771 my $data = pack "(w/a*)*", $meta, $info->{data};
2772 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2773
2774 use Data::Dumper; warn Dumper substr $data, 0, 100;#d#
2775
2776 my $idx = (cf::face::find $name) || cf::face::alloc $name; 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;
2777 cf::face::set_type $idx, 1; 3291 cf::face::set_type $idx, $info->{type};
2778 cf::face::set_data $idx, 0, $data, $chk; 3292 } else {
3293 $RESOURCE{$name} = $info;
3294 }
2779 3295
2780 # TODO
2781 cf::cede_to_tick; 3296 cf::cede_to_tick;
2782 } 3297 }
2783 } 3298 }
2784 3299
3300 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3301
2785 1 3302 1
2786} 3303}
2787 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
2788sub 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
2789 load_resource_file "$MAPDIR/regions" 3348 load_resource_file "$MAPDIR/regions"
2790 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 }
2791} 3355}
2792 3356
2793sub reload_facedata { 3357sub reload_facedata {
2794 load_facedata "$DATADIR/facedata" 3358 load_facedata "$DATADIR/facedata"
2795 or die "unable to load facedata\n"; 3359 or die "unable to load facedata\n";
2796} 3360}
2797 3361
2798sub reload_archetypes { 3362sub reload_archetypes {
2799 load_resource_file "$DATADIR/archetypes" 3363 load_resource_file "$DATADIR/archetypes"
2800 or die "unable to load archetypes\n"; 3364 or die "unable to load archetypes\n";
2801 #d# NEED to laod twice to resolve forward references
2802 # this really needs to be done in an extra post-pass
2803 # (which needs to be synchronous, so solve it differently)
2804 load_resource_file "$DATADIR/archetypes"
2805 or die "unable to load archetypes\n";
2806} 3365}
2807 3366
2808sub reload_treasures { 3367sub reload_treasures {
2809 load_resource_file "$DATADIR/treasures" 3368 load_resource_file "$DATADIR/treasures"
2810 or die "unable to load treasurelists\n"; 3369 or die "unable to load treasurelists\n";
2811} 3370}
2812 3371
2813sub reload_resources { 3372sub reload_resources {
2814 warn "reloading resource files...\n"; 3373 warn "reloading resource files...\n";
2815 3374
3375 reload_facedata;
3376 reload_archetypes;
2816 reload_regions; 3377 reload_regions;
2817 reload_facedata;
2818 #reload_archetypes;#d#
2819 reload_archetypes;
2820 reload_treasures; 3378 reload_treasures;
2821 3379
2822 warn "finished reloading resource files\n"; 3380 warn "finished reloading resource files\n";
2823} 3381}
2824 3382
2825sub init { 3383sub reload_config {
2826 reload_resources;
2827}
2828
2829sub cfg_load {
2830 open my $fh, "<:utf8", "$CONFDIR/config" 3384 open my $fh, "<:utf8", "$CONFDIR/config"
2831 or return; 3385 or return;
2832 3386
2833 local $/; 3387 local $/;
2834 *CFG = YAML::Syck::Load <$fh>; 3388 *CFG = YAML::Load <$fh>;
2835 3389
2836 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3390 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2837 3391
2838 $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};
2839 $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};
… …
2845 }; 3399 };
2846 warn $@ if $@; 3400 warn $@ if $@;
2847 } 3401 }
2848} 3402}
2849 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
2850sub 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
2851 # we must not ever block the main coroutine 3447 # we must not ever block the main coroutine
2852 local $Coro::idle = sub { 3448 local $Coro::idle = sub {
2853 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#
2854 (async { 3450 (async {
2855 Event::one_event; 3451 $Coro::current->{desc} = "IDLE BUG HANDLER";
3452 EV::loop EV::LOOP_ONESHOT;
2856 })->prio (Coro::PRIO_MAX); 3453 })->prio (Coro::PRIO_MAX);
2857 }; 3454 };
2858 3455
2859 cfg_load; 3456 evthread_start IO::AIO::poll_fileno;
3457
3458 cf::sync_job {
3459 reload_resources;
3460 reload_config;
2860 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
2861 load_extensions; 3474 load_extensions;
2862 3475
2863 $TICK_WATCHER->start; 3476 utime time, time, $RUNTIMEFILE;
2864 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;
2865} 3486}
2866 3487
2867############################################################################# 3488#############################################################################
2868# initialisation and cleanup 3489# initialisation and cleanup
2869 3490
2870# install some emergency cleanup handlers 3491# install some emergency cleanup handlers
2871BEGIN { 3492BEGIN {
3493 our %SIGWATCHER = ();
2872 for my $signal (qw(INT HUP TERM)) { 3494 for my $signal (qw(INT HUP TERM)) {
2873 Event->signal ( 3495 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2874 reentrant => 0,
2875 data => WF_AUTOCANCEL,
2876 signal => $signal,
2877 prio => 0,
2878 cb => sub {
2879 cf::cleanup "SIG$signal"; 3496 cf::cleanup "SIG$signal";
2880 },
2881 ); 3497 };
2882 } 3498 }
2883} 3499}
2884 3500
2885sub write_runtime { 3501sub write_runtime_sync {
2886 my $runtime = "$LOCALDIR/runtime";
2887
2888 # first touch the runtime file to show we are still running: 3502 # first touch the runtime file to show we are still running:
2889 # the fsync below can take a very very long time. 3503 # the fsync below can take a very very long time.
2890 3504
2891 IO::AIO::aio_utime $runtime, undef, undef; 3505 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2892 3506
2893 my $guard = cf::lock_acquire "write_runtime"; 3507 my $guard = cf::lock_acquire "write_runtime";
2894 3508
2895 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3509 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2896 or return; 3510 or return;
2897 3511
2898 my $value = $cf::RUNTIME + 90 + 10; 3512 my $value = $cf::RUNTIME + 90 + 10;
2899 # 10 is the runtime save interval, for a monotonic clock 3513 # 10 is the runtime save interval, for a monotonic clock
2900 # 60 allows for the watchdog to kill the server. 3514 # 60 allows for the watchdog to kill the server.
… …
2910 aio_utime $fh, undef, undef; 3524 aio_utime $fh, undef, undef;
2911 3525
2912 close $fh 3526 close $fh
2913 or return; 3527 or return;
2914 3528
2915 aio_rename "$runtime~", $runtime 3529 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2916 and return; 3530 and return;
2917 3531
2918 warn "runtime file written.\n"; 3532 warn "runtime file written.\n";
2919 3533
2920 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 };
2921} 3585}
2922 3586
2923sub emergency_save() { 3587sub emergency_save() {
2924 my $freeze_guard = cf::freeze_mainloop; 3588 my $freeze_guard = cf::freeze_mainloop;
2925 3589
2926 warn "enter emergency perl save\n"; 3590 warn "emergency_perl_save: enter\n";
2927 3591
2928 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
2929 # use a peculiar iteration method to avoid tripping on perl 3598 # use a peculiar iteration method to avoid tripping on perl
2930 # refcount bugs in for. also avoids problems with players 3599 # refcount bugs in for. also avoids problems with players
2931 # and maps saved/destroyed asynchronously. 3600 # and maps saved/destroyed asynchronously.
2932 warn "begin emergency player save\n"; 3601 warn "emergency_perl_save: begin player save\n";
2933 for my $login (keys %cf::PLAYER) { 3602 for my $login (keys %cf::PLAYER) {
2934 my $pl = $cf::PLAYER{$login} or next; 3603 my $pl = $cf::PLAYER{$login} or next;
2935 $pl->valid or next; 3604 $pl->valid or next;
3605 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2936 $pl->save; 3606 $pl->save;
2937 } 3607 }
2938 warn "end emergency player save\n"; 3608 warn "emergency_perl_save: end player save\n";
2939 3609
2940 warn "begin emergency map save\n"; 3610 warn "emergency_perl_save: begin map save\n";
2941 for my $path (keys %cf::MAP) { 3611 for my $path (keys %cf::MAP) {
2942 my $map = $cf::MAP{$path} or next; 3612 my $map = $cf::MAP{$path} or next;
2943 $map->valid or next; 3613 $map->valid or next;
2944 $map->save; 3614 $map->save;
2945 } 3615 }
2946 warn "end emergency map save\n"; 3616 warn "emergency_perl_save: end map save\n";
2947 3617
2948 warn "begin emergency database checkpoint\n"; 3618 warn "emergency_perl_save: begin database checkpoint\n";
2949 BDB::db_env_txn_checkpoint $DB_ENV; 3619 BDB::db_env_txn_checkpoint $DB_ENV;
2950 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";
2951 }; 3625 };
2952 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
2953 warn "leave emergency perl save\n"; 3632 warn "emergency_perl_save: leave\n";
2954} 3633}
2955 3634
2956sub post_cleanup { 3635sub post_cleanup {
2957 my ($make_core) = @_; 3636 my ($make_core) = @_;
2958 3637
2959 warn Carp::longmess "post_cleanup backtrace" 3638 warn Carp::longmess "post_cleanup backtrace"
2960 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#
2961} 3669}
2962 3670
2963sub do_reload_perl() { 3671sub do_reload_perl() {
2964 # can/must only be called in main 3672 # can/must only be called in main
2965 if ($Coro::current != $Coro::main) { 3673 if ($Coro::current != $Coro::main) {
2966 warn "can only reload from main coroutine"; 3674 warn "can only reload from main coroutine";
2967 return; 3675 return;
2968 } 3676 }
2969 3677
3678 return if $RELOAD++;
3679
3680 my $t1 = EV::time;
3681
3682 while ($RELOAD) {
2970 warn "reloading..."; 3683 warn "reloading...";
2971 3684
2972 warn "entering sync_job"; 3685 warn "entering sync_job";
2973 3686
2974 cf::sync_job { 3687 cf::sync_job {
2975 cf::write_runtime; # external watchdog should not bark 3688 cf::write_runtime_sync; # external watchdog should not bark
2976 cf::emergency_save; 3689 cf::emergency_save;
2977 cf::write_runtime; # external watchdog should not bark 3690 cf::write_runtime_sync; # external watchdog should not bark
2978 3691
2979 warn "syncing database to disk"; 3692 warn "syncing database to disk";
2980 BDB::db_env_txn_checkpoint $DB_ENV; 3693 BDB::db_env_txn_checkpoint $DB_ENV;
2981 3694
2982 # 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
2983 3696
2984 warn "cancelling all WF_AUTOCANCEL watchers";
2985 for (Event::all_watchers) {
2986 $_->cancel if $_->data & WF_AUTOCANCEL;
2987 }
2988
2989 warn "flushing outstanding aio requests"; 3697 warn "flushing outstanding aio requests";
2990 for (;;) {
2991 BDB::flush;
2992 IO::AIO::flush;
2993 Coro::cede;
2994 last unless IO::AIO::nreqs || BDB::nreqs; 3698 while (IO::AIO::nreqs || BDB::nreqs) {
2995 warn "iterate..."; 3699 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2996 }
2997
2998 ++$RELOAD;
2999
3000 warn "cancelling all extension coros";
3001 $_->cancel for values %EXT_CORO;
3002 %EXT_CORO = ();
3003
3004 warn "removing commands";
3005 %COMMAND = ();
3006
3007 warn "removing ext/exti commands";
3008 %EXTCMD = ();
3009 %EXTICMD = ();
3010
3011 warn "unloading/nuking all extensions";
3012 for my $pkg (@EXTS) {
3013 warn "... unloading $pkg";
3014
3015 if (my $cb = $pkg->can ("unload")) {
3016 eval {
3017 $cb->($pkg);
3018 1
3019 } or warn "$pkg unloaded, but with errors: $@";
3020 } 3700 }
3021 3701
3022 warn "... nuking $pkg"; 3702 warn "cancelling all extension coros";
3023 Symbol::delete_package $pkg; 3703 $_->cancel for values %EXT_CORO;
3024 } 3704 %EXT_CORO = ();
3025 3705
3026 warn "unloading all perl modules loaded from $LIBDIR"; 3706 warn "removing commands";
3027 while (my ($k, $v) = each %INC) { 3707 %COMMAND = ();
3028 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3029 3708
3709 warn "removing ext/exti commands";
3710 %EXTCMD = ();
3711 %EXTICMD = ();
3712
3713 warn "unloading/nuking all extensions";
3714 for my $pkg (@EXTS) {
3030 warn "... unloading $k"; 3715 warn "... unloading $pkg";
3031 delete $INC{$k};
3032 3716
3033 $k =~ s/\.pm$//;
3034 $k =~ s/\//::/g;
3035
3036 if (my $cb = $k->can ("unload_module")) { 3717 if (my $cb = $pkg->can ("unload")) {
3718 eval {
3037 $cb->(); 3719 $cb->($pkg);
3720 1
3721 } or warn "$pkg unloaded, but with errors: $@";
3722 }
3723
3724 warn "... clearing $pkg";
3725 clear_package $pkg;
3038 } 3726 }
3039 3727
3040 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;
3041 } 3743 }
3042 3744
3043 warn "getting rid of safe::, as good as possible"; 3745 warn "getting rid of safe::, as good as possible";
3044 Symbol::delete_package "safe::$_" 3746 clear_package "safe::$_"
3045 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);
3046 3748
3047 warn "unloading cf.pm \"a bit\""; 3749 warn "unloading cf.pm \"a bit\"";
3048 delete $INC{"cf.pm"}; 3750 delete $INC{"cf.pm"};
3049 delete $INC{"cf/pod.pm"}; 3751 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3050 3752
3051 # don't, removes xs symbols, too, 3753 # don't, removes xs symbols, too,
3052 # and global variables created in xs 3754 # and global variables created in xs
3053 #Symbol::delete_package __PACKAGE__; 3755 #clear_package __PACKAGE__;
3054 3756
3055 warn "unload completed, starting to reload now"; 3757 warn "unload completed, starting to reload now";
3056 3758
3057 warn "reloading cf.pm"; 3759 warn "reloading cf.pm";
3058 require cf; 3760 require cf;
3059 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3761 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3060 3762
3061 warn "loading config and database again"; 3763 warn "loading config and database again";
3062 cf::cfg_load; 3764 cf::reload_config;
3063 3765
3064 warn "loading extensions"; 3766 warn "loading extensions";
3065 cf::load_extensions; 3767 cf::load_extensions;
3066 3768
3769 if ($REATTACH_ON_RELOAD) {
3067 warn "reattaching attachments to objects/players"; 3770 warn "reattaching attachments to objects/players";
3068 _global_reattach; # objects, sockets 3771 _global_reattach; # objects, sockets
3069 warn "reattaching attachments to maps"; 3772 warn "reattaching attachments to maps";
3070 reattach $_ for values %MAP; 3773 reattach $_ for values %MAP;
3071 warn "reattaching attachments to players"; 3774 warn "reattaching attachments to players";
3072 reattach $_ for values %PLAYER; 3775 reattach $_ for values %PLAYER;
3776 }
3073 3777
3778 warn "running post_init jobs";
3779 (pop @POST_INIT)->(1) while @POST_INIT;
3780
3074 warn "leaving sync_job"; 3781 warn "leaving sync_job";
3075 3782
3076 1 3783 1
3077 } or do { 3784 } or do {
3078 warn $@; 3785 warn $@;
3079 warn "error while reloading, exiting."; 3786 cf::cleanup "error while reloading, exiting.";
3080 exit 1;
3081 }; 3787 };
3082 3788
3083 warn "reloaded"; 3789 warn "reloaded";
3790 --$RELOAD;
3791 }
3792
3793 $t1 = EV::time - $t1;
3794 warn "reload completed in ${t1}s\n";
3084}; 3795};
3085 3796
3086our $RELOAD_WATCHER; # used only during reload 3797our $RELOAD_WATCHER; # used only during reload
3087 3798
3088sub reload_perl() { 3799sub reload_perl() {
3089 # doing reload synchronously and two reloads happen back-to-back, 3800 # doing reload synchronously and two reloads happen back-to-back,
3090 # coro crashes during coro_state_free->destroy here. 3801 # coro crashes during coro_state_free->destroy here.
3091 3802
3092 $RELOAD_WATCHER ||= Event->timer ( 3803 $RELOAD_WATCHER ||= cf::async {
3093 reentrant => 0, 3804 Coro::AIO::aio_wait cache_extensions;
3094 after => 0, 3805
3095 data => WF_AUTOCANCEL, 3806 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3096 cb => sub {
3097 do_reload_perl; 3807 do_reload_perl;
3098 undef $RELOAD_WATCHER; 3808 undef $RELOAD_WATCHER;
3099 }, 3809 };
3100 ); 3810 };
3101} 3811}
3102 3812
3103register_command "reload" => sub { 3813register_command "reload" => sub {
3104 my ($who, $arg) = @_; 3814 my ($who, $arg) = @_;
3105 3815
3106 if ($who->flag (FLAG_WIZ)) { 3816 if ($who->flag (FLAG_WIZ)) {
3107 $who->message ("reloading server."); 3817 $who->message ("reloading server.");
3818 async {
3819 $Coro::current->{desc} = "perl_reload";
3108 async { reload_perl }; 3820 reload_perl;
3821 };
3109 } 3822 }
3110}; 3823};
3111 3824
3112unshift @INC, $LIBDIR; 3825unshift @INC, $LIBDIR;
3113 3826
… …
3115 3828
3116our @WAIT_FOR_TICK; 3829our @WAIT_FOR_TICK;
3117our @WAIT_FOR_TICK_BEGIN; 3830our @WAIT_FOR_TICK_BEGIN;
3118 3831
3119sub wait_for_tick { 3832sub wait_for_tick {
3120 return unless $TICK_WATCHER->is_active;
3121 return if $Coro::current == $Coro::main; 3833 return if tick_inhibit || $Coro::current == $Coro::main;
3122 3834
3123 my $signal = new Coro::Signal; 3835 my $signal = new Coro::Signal;
3124 push @WAIT_FOR_TICK, $signal; 3836 push @WAIT_FOR_TICK, $signal;
3125 $signal->wait; 3837 $signal->wait;
3126} 3838}
3127 3839
3128sub wait_for_tick_begin { 3840sub wait_for_tick_begin {
3129 return unless $TICK_WATCHER->is_active;
3130 return if $Coro::current == $Coro::main; 3841 return if tick_inhibit || $Coro::current == $Coro::main;
3131 3842
3132 my $signal = new Coro::Signal; 3843 my $signal = new Coro::Signal;
3133 push @WAIT_FOR_TICK_BEGIN, $signal; 3844 push @WAIT_FOR_TICK_BEGIN, $signal;
3134 $signal->wait; 3845 $signal->wait;
3135} 3846}
3136 3847
3137 my $min = 1e6;#d# 3848sub tick {
3138 my $avg = 10;
3139$TICK_WATCHER = Event->timer (
3140 reentrant => 0,
3141 parked => 1,
3142 prio => 0,
3143 at => $NEXT_TICK || $TICK,
3144 data => WF_AUTOCANCEL,
3145 cb => sub {
3146 if ($Coro::current != $Coro::main) { 3849 if ($Coro::current != $Coro::main) {
3147 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"
3148 unless ++$bug_warning > 10; 3851 unless ++$bug_warning > 10;
3149 return; 3852 return;
3150 } 3853 }
3151 3854
3152 $NOW = $tick_start = Event::time;
3153
3154 cf::server_tick; # one server iteration 3855 cf::server_tick; # one server iteration
3155 3856
3156 0 && sync_job {#d# 3857 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3157 for(1..10) { 3858 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3158 my $t = Event::time; 3859 Coro::async_pool {
3159 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3860 $Coro::current->{desc} = "runtime saver";
3160 or die; 3861 write_runtime_sync
3161 3862 or warn "ERROR: unable to write runtime file: $!";
3162 $map->width (50);
3163 $map->height (50);
3164 $map->alloc;
3165 $map->_load_objects ("/tmp/x.map", 1);
3166 my $t = Event::time - $t;
3167
3168 #next unless $t < 0.0013;#d#
3169 if ($t < $min) {
3170 $min = $t;
3171 }
3172 $avg = $avg * 0.99 + $t * 0.01;
3173 }
3174 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3175 exit 0;
3176 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3177 }; 3863 };
3864 }
3178 3865
3179 $RUNTIME += $TICK;
3180 $NEXT_TICK += $TICK;
3181
3182 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3183 $NEXT_RUNTIME_WRITE = $NOW + 10;
3184 Coro::async_pool {
3185 write_runtime
3186 or warn "ERROR: unable to write runtime file: $!";
3187 };
3188 }
3189
3190# my $AFTER = Event::time;
3191# warn $AFTER - $NOW;#d#
3192
3193 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3866 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3194 $sig->send; 3867 $sig->send;
3195 } 3868 }
3196 while (my $sig = shift @WAIT_FOR_TICK) { 3869 while (my $sig = shift @WAIT_FOR_TICK) {
3197 $sig->send; 3870 $sig->send;
3198 } 3871 }
3199 3872
3200 $NOW = Event::time; 3873 $LOAD = ($NOW - $TICK_START) / $TICK;
3201
3202 # if we are delayed by four ticks or more, skip them all
3203 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3204
3205 $TICK_WATCHER->at ($NEXT_TICK);
3206 $TICK_WATCHER->start;
3207
3208 $LOAD = ($NOW - $tick_start) / $TICK;
3209 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3874 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3210 3875
3211 _post_tick; 3876 if (0) {
3212 3877 if ($NEXT_TICK) {
3213 3878 my $jitter = $TICK_START - $NEXT_TICK;
3879 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3880 warn "jitter $JITTER\n";#d#
3881 }
3214 }, 3882 }
3215); 3883}
3216 3884
3217{ 3885{
3218 BDB::max_poll_time $TICK * 0.1; 3886 # configure BDB
3219 $BDB_POLL_WATCHER = Event->io ( 3887
3220 reentrant => 0,
3221 fd => BDB::poll_fileno,
3222 poll => 'r',
3223 prio => 0,
3224 data => WF_AUTOCANCEL,
3225 cb => \&BDB::poll_cb,
3226 );
3227 BDB::min_parallel 8; 3888 BDB::min_parallel 8;
3228 3889 BDB::max_poll_reqs $TICK * 0.1;
3229 BDB::set_sync_prepare { 3890 $AnyEvent::BDB::WATCHER->priority (1);
3230 my $status;
3231 my $current = $Coro::current;
3232 (
3233 sub {
3234 $status = $!;
3235 $current->ready; undef $current;
3236 },
3237 sub {
3238 Coro::schedule while defined $current;
3239 $! = $status;
3240 },
3241 )
3242 };
3243 3891
3244 unless ($DB_ENV) { 3892 unless ($DB_ENV) {
3245 $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);
3246 3899
3247 cf::sync_job { 3900 cf::sync_job {
3248 eval { 3901 eval {
3249 BDB::db_env_open 3902 BDB::db_env_open
3250 $DB_ENV, 3903 $DB_ENV,
… …
3252 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
3253 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3906 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3254 0666; 3907 0666;
3255 3908
3256 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3909 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3257
3258 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3259 $DB_ENV->set_lk_detect;
3260 }; 3910 };
3261 3911
3262 cf::cleanup "db_env_open(db): $@" if $@; 3912 cf::cleanup "db_env_open(db): $@" if $@;
3263 }; 3913 };
3264 } 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 };
3265} 3925}
3266 3926
3267{ 3927{
3928 # configure IO::AIO
3929
3268 IO::AIO::min_parallel 8; 3930 IO::AIO::min_parallel 8;
3269
3270 undef $Coro::AIO::WATCHER;
3271 IO::AIO::max_poll_time $TICK * 0.1; 3931 IO::AIO::max_poll_time $TICK * 0.1;
3272 $AIO_POLL_WATCHER = Event->io ( 3932 undef $AnyEvent::AIO::WATCHER;
3273 reentrant => 0,
3274 data => WF_AUTOCANCEL,
3275 fd => IO::AIO::poll_fileno,
3276 poll => 'r',
3277 prio => 6,
3278 cb => \&IO::AIO::poll_cb,
3279 );
3280} 3933}
3281 3934
3282my $_log_backtrace; 3935my $_log_backtrace;
3283 3936
3284sub _log_backtrace { 3937sub _log_backtrace {
… …
3287 $msg =~ s/\n//; 3940 $msg =~ s/\n//;
3288 3941
3289 # limit the # of concurrent backtraces 3942 # limit the # of concurrent backtraces
3290 if ($_log_backtrace < 2) { 3943 if ($_log_backtrace < 2) {
3291 ++$_log_backtrace; 3944 ++$_log_backtrace;
3945 my $perl_bt = Carp::longmess $msg;
3292 async { 3946 async {
3947 $Coro::current->{desc} = "abt $msg";
3948
3293 my @bt = fork_call { 3949 my @bt = fork_call {
3294 @addr = map { sprintf "%x", $_ } @addr; 3950 @addr = map { sprintf "%x", $_ } @addr;
3295 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3951 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3296 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 |"
3297 or die "addr2line: $!"; 3953 or die "addr2line: $!";
… …
3305 } 3961 }
3306 3962
3307 @funcs 3963 @funcs
3308 }; 3964 };
3309 3965
3310 LOG llevInfo, "[ABT] $msg\n"; 3966 LOG llevInfo, "[ABT] $perl_bt\n";
3967 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3311 LOG llevInfo, "[ABT] $_\n" for @bt; 3968 LOG llevInfo, "[ABT] $_\n" for @bt;
3312 --$_log_backtrace; 3969 --$_log_backtrace;
3313 }; 3970 };
3314 } else { 3971 } else {
3315 LOG llevInfo, "[ABT] $msg\n"; 3972 LOG llevInfo, "[ABT] $msg\n";
3316 LOG llevInfo, "[ABT] [suppressed]\n"; 3973 LOG llevInfo, "[ABT] [suppressed]\n";
3317 } 3974 }
3318} 3975}
3319 3976
3320# load additional modules 3977# load additional modules
3321use cf::pod; 3978require "cf/$_.pm" for @EXTRA_MODULES;
3322 3979
3323END { cf::emergency_save } 3980END { cf::emergency_save }
3324 3981
33251 39821
3326 3983

Diff Legend

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