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

Diff Legend

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