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.319 by root, Tue Jul 24 15:56:45 2007 UTC vs.
Revision 1.479 by root, Thu Oct 8 05:04:27 2009 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict qw(vars subs);
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
37use Guard ();
15use Coro 3.61 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
51use Coro::Util ();
24 52
25use JSON::XS 1.4 (); 53use JSON::XS 2.01 ();
26use BDB (); 54use BDB ();
27use Data::Dumper; 55use Data::Dumper;
28use Digest::MD5; 56use Digest::MD5;
29use Fcntl; 57use Fcntl;
30use YAML::Syck (); 58use YAML ();
31use IO::AIO 2.32 (); 59use IO::AIO ();
32use Time::HiRes; 60use Time::HiRes;
33use Compress::LZF; 61use Compress::LZF;
34use Digest::MD5 (); 62use Digest::MD5 ();
63
64AnyEvent::detect;
35 65
36# configure various modules to our taste 66# configure various modules to our taste
37# 67#
38$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 69Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
70
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72
73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
40Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
41 76
42$Event::Eval = 1; # no idea why this is required, but it is 77# strictly for debugging
43 78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 79
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 81
51our %COMMAND = (); 82our %COMMAND = ();
52our %COMMAND_TIME = (); 83our %COMMAND_TIME = ();
… …
55our %EXTCMD = (); 86our %EXTCMD = ();
56our %EXTICMD = (); 87our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 88our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 89our %EXT_MAP = (); # pluggable maps
59 90
60our $RELOAD; # number of reloads so far 91our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 92our @EVENT;
93our @REFLECT; # set by XS
94our %REFLECT; # set by us
62 95
63our $CONFDIR = confdir; 96our $CONFDIR = confdir;
64our $DATADIR = datadir; 97our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 98our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 99our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 100our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 101our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 102our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 103our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 104our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 105our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 106our $BDBDIR = "$LOCALDIR/db";
107our $PIDFILE = "$LOCALDIR/pid";
108our $RUNTIMEFILE = "$LOCALDIR/runtime";
109
110our %RESOURCE;
74 111
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 112our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 114our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 115our $USE_FSYNC = 1; # use fsync to write maps - default on
82 116
117our $BDB_DEADLOCK_WATCHER;
118our $BDB_CHECKPOINT_WATCHER;
83our $BDB_POLL_WATCHER; 119our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 120our $DB_ENV;
121
122our @EXTRA_MODULES = qw(pod mapscript);
85 123
86our %CFG; 124our %CFG;
87 125
88our $UPTIME; $UPTIME ||= time; 126our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 127our $RUNTIME;
128our $NOW;
90 129
91our %PLAYER; # all users 130our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 131our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 132our $LINK_MAP; # the special {link} map, which is always available
94 133
95# used to convert map paths into valid unix filenames by replacing / by ∕ 134# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 135our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 136
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 137our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 138our $LOADAVG; # same thing, but with alpha-smoothing
139our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 140our $TICK_START; # for load detecting purposes
141
142our @POST_INIT;
143
144our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
145our $REALLY_UNLOOP; # never set to true, please :)
101 146
102binmode STDOUT; 147binmode STDOUT;
103binmode STDERR; 148binmode STDERR;
104 149
105# read virtual server time, if available 150# read virtual server time, if available
106unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 151unless ($RUNTIME || !-e $RUNTIMEFILE) {
107 open my $fh, "<", "$LOCALDIR/runtime" 152 open my $fh, "<", $RUNTIMEFILE
108 or die "unable to read runtime file: $!"; 153 or die "unable to read $RUNTIMEFILE file: $!";
109 $RUNTIME = <$fh> + 0.; 154 $RUNTIME = <$fh> + 0.;
110} 155}
156
157eval "sub TICK() { $TICK } 1" or die;
111 158
112mkdir $_ 159mkdir $_
113 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 160 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
114 161
115our $EMERGENCY_POSITION; 162our $EMERGENCY_POSITION;
116 163
117sub cf::map::normalise; 164sub cf::map::normalise;
165
166#############################################################################
167
168%REFLECT = ();
169for (@REFLECT) {
170 my $reflect = JSON::XS::decode_json $_;
171 $REFLECT{$reflect->{class}} = $reflect;
172}
118 173
119############################################################################# 174#############################################################################
120 175
121=head2 GLOBAL VARIABLES 176=head2 GLOBAL VARIABLES
122 177
… …
158 213
159The raw value load value from the last tick. 214The raw value load value from the last tick.
160 215
161=item %cf::CFG 216=item %cf::CFG
162 217
163Configuration for the server, loaded from C</etc/crossfire/config>, or 218Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 219from wherever your confdir points to.
165 220
166=item cf::wait_for_tick, cf::wait_for_tick_begin 221=item cf::wait_for_tick, cf::wait_for_tick_begin
167 222
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 223These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
… …
173 228
174This array contains the results of the last C<invoke ()> call. When 229This array contains the results of the last C<invoke ()> call. When
175C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 230C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
176that call. 231that call.
177 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
178=back 239=back
179 240
180=cut 241=cut
181 242
182BEGIN { 243$Coro::State::WARNHOOK = sub {
183 *CORE::GLOBAL::warn = sub {
184 my $msg = join "", @_; 244 my $msg = join "", @_;
185 245
186 $msg .= "\n" 246 $msg .= "\n"
187 unless $msg =~ /\n$/; 247 unless $msg =~ /\n$/;
188 248
189 $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;
190 250
191 utf8::encode $msg;
192 LOG llevError, $msg; 251 LOG llevError, $msg;
193 }; 252};
194} 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};
195 267
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 268@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 269@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 270@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 271@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
206for my $pkg (qw( 278for my $pkg (qw(
207 cf::global cf::attachable 279 cf::global cf::attachable
208 cf::object cf::object::player 280 cf::object cf::object::player
209 cf::client cf::player 281 cf::client cf::player
210 cf::arch cf::living 282 cf::arch cf::living
283 cf::map cf::mapspace
211 cf::map cf::party cf::region 284 cf::party cf::region
212)) { 285)) {
213 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 286 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 287}
216 288
217$Event::DIED = sub { 289$EV::DIED = sub {
218 warn "error in event callback: @_"; 290 warn "error in event callback: @_";
219}; 291};
220 292
221############################################################################# 293#############################################################################
222 294
… …
245 $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;
246 $d 318 $d
247 } || "[unable to dump $_[0]: '$@']"; 319 } || "[unable to dump $_[0]: '$@']";
248} 320}
249 321
250=item $ref = cf::from_json $json 322=item $ref = cf::decode_json $json
251 323
252Converts a JSON string into the corresponding perl data structure. 324Converts a JSON string into the corresponding perl data structure.
253 325
254=item $json = cf::to_json $ref 326=item $json = cf::encode_json $ref
255 327
256Converts a perl data structure into its JSON representation. 328Converts a perl data structure into its JSON representation.
257 329
258=cut 330=cut
259 331
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 332our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 333
262sub to_json ($) { $json_coder->encode ($_[0]) } 334sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 335sub decode_json($) { $json_coder->decode ($_[0]) }
336
337=item cf::post_init { BLOCK }
338
339Execute the given codeblock, I<after> all extensions have been (re-)loaded,
340but I<before> the server starts ticking again.
341
342The cdoeblock will have a single boolean argument to indicate whether this
343is a reload or not.
344
345=cut
346
347sub post_init(&) {
348 push @POST_INIT, shift;
349}
264 350
265=item cf::lock_wait $string 351=item cf::lock_wait $string
266 352
267Wait until the given lock is available. See cf::lock_acquire. 353Wait until the given lock is available. See cf::lock_acquire.
268 354
269=item my $lock = cf::lock_acquire $string 355=item my $lock = cf::lock_acquire $string
270 356
271Wait 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
272a 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,
273for example when the coroutine gets canceled), the lock is automatically 359for example when the coroutine gets canceled), the lock is automatically
274returned. 360returned.
275 361
362Locks are *not* recursive, locking from the same coro twice results in a
363deadlocked coro.
364
276Lock 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
277uses map_find and cf::map::load uses map_load). 366uses map_find and cf::map::load uses map_load).
278 367
279=item $locked = cf::lock_active $string 368=item $locked = cf::lock_active $string
280 369
281Return 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.
282 371
283=cut 372=cut
284 373
285our %LOCK; 374our $LOCKS = new Coro::SemaphoreSet;
286 375
287sub lock_wait($) { 376sub lock_wait($) {
288 my ($key) = @_; 377 $LOCKS->wait ($_[0]);
289
290 # wait for lock, if any
291 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule;
294 }
295} 378}
296 379
297sub lock_acquire($) { 380sub lock_acquire($) {
298 my ($key) = @_; 381 $LOCKS->guard ($_[0])
299
300 # wait, to be sure we are not locked
301 lock_wait $key;
302
303 $LOCK{$key} = [];
304
305 Coro::guard {
306 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} };
308 }
309} 382}
310 383
311sub lock_active($) { 384sub lock_active($) {
312 my ($key) = @_; 385 $LOCKS->count ($_[0]) < 1
313
314 ! ! $LOCK{$key}
315} 386}
316 387
317sub freeze_mainloop { 388sub freeze_mainloop {
318 return unless $TICK_WATCHER->is_active; 389 tick_inhibit_inc;
319 390
320 my $guard = Coro::guard { 391 &Guard::guard (\&tick_inhibit_dec);
321 $TICK_WATCHER->start; 392}
322 }; 393
323 $TICK_WATCHER->stop; 394=item cf::periodic $interval, $cb
324 $guard 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
325} 407}
326 408
327=item cf::get_slot $time[, $priority[, $name]] 409=item cf::get_slot $time[, $priority[, $name]]
328 410
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 411Allocate $time seconds of blocking CPU time at priority C<$priority>:
… …
340our @SLOT_QUEUE; 422our @SLOT_QUEUE;
341our $SLOT_QUEUE; 423our $SLOT_QUEUE;
342 424
343$SLOT_QUEUE->cancel if $SLOT_QUEUE; 425$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async { 426$SLOT_QUEUE = Coro::async {
427 $Coro::current->desc ("timeslot manager");
428
345 my $signal = new Coro::Signal; 429 my $signal = new Coro::Signal;
346 430
347 while () { 431 while () {
348 next_job: 432 next_job:
349 my $avail = cf::till_tick; 433 my $avail = cf::till_tick;
… …
357 } 441 }
358 } 442 }
359 } 443 }
360 444
361 if (@SLOT_QUEUE) { 445 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive 446 # we do not use wait_for_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal; 447 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait; 448 $signal->wait;
365 } else { 449 } else {
366 Coro::schedule; 450 Coro::schedule;
367 } 451 }
368 } 452 }
369}; 453};
370 454
371sub get_slot($;$$) { 455sub get_slot($;$$) {
456 return if tick_inhibit || $Coro::current == $Coro::main;
457
372 my ($time, $pri, $name) = @_; 458 my ($time, $pri, $name) = @_;
373 459
374 $time = $TICK * .6 if $time > $TICK * .6; 460 $time = $TICK * .6 if $time > $TICK * .6;
375 my $sig = new Coro::Signal; 461 my $sig = new Coro::Signal;
376 462
… …
390 476
391BEGIN { *async = \&Coro::async_pool } 477BEGIN { *async = \&Coro::async_pool }
392 478
393=item cf::sync_job { BLOCK } 479=item cf::sync_job { BLOCK }
394 480
395The design of Crossfire TRT requires that the main coroutine ($Coro::main) 481The design of Deliantra requires that the main coroutine ($Coro::main)
396is always able to handle events or runnable, as Crossfire TRT is only 482is always able to handle events or runnable, as Deliantra is only
397partly 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
398acceptable. 484acceptable.
399 485
400If 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
401the given BLOCK in another coroutine while waiting for the result. The 487the given BLOCK in another coroutine while waiting for the result. The
… …
406 492
407sub sync_job(&) { 493sub sync_job(&) {
408 my ($job) = @_; 494 my ($job) = @_;
409 495
410 if ($Coro::current == $Coro::main) { 496 if ($Coro::current == $Coro::main) {
411 my $time = Event::time; 497 my $time = EV::time;
412 498
413 # this is the main coro, too bad, we have to block 499 # this is the main coro, too bad, we have to block
414 # till the operation succeeds, freezing the server :/ 500 # till the operation succeeds, freezing the server :/
415 501
416 # TODO: use suspend/resume instead 502 LOG llevError, Carp::longmess "sync job";#d#
417 # (but this is cancel-safe) 503
418 my $freeze_guard = freeze_mainloop; 504 my $freeze_guard = freeze_mainloop;
419 505
420 my $busy = 1; 506 my $busy = 1;
421 my @res; 507 my @res;
422 508
423 (async { 509 (async {
510 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 511 @res = eval { $job->() };
425 warn $@ if $@; 512 warn $@ if $@;
426 undef $busy; 513 undef $busy;
427 })->prio (Coro::PRIO_MAX); 514 })->prio (Coro::PRIO_MAX);
428 515
429 while ($busy) { 516 while ($busy) {
430 Coro::cede or Event::one_event; 517 if (Coro::nready) {
518 Coro::cede_notself;
519 } else {
520 EV::loop EV::LOOP_ONESHOT;
431 } 521 }
522 }
432 523
433 $time = Event::time - $time; 524 my $time = EV::time - $time;
434 525
435 LOG llevError | logBacktrace, Carp::longmess "long sync job"
436 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
437
438 $tick_start += $time; # do not account sync jobs to server load 526 $TICK_START += $time; # do not account sync jobs to server load
439 527
440 wantarray ? @res : $res[0] 528 wantarray ? @res : $res[0]
441 } else { 529 } else {
442 # we are in another coroutine, how wonderful, everything just works 530 # we are in another coroutine, how wonderful, everything just works
443 531
… …
468=item fork_call { }, $args 556=item fork_call { }, $args
469 557
470Executes the given code block with the given arguments in a seperate 558Executes the given code block with the given arguments in a seperate
471process, returning the results. Everything must be serialisable with 559process, returning the results. Everything must be serialisable with
472Coro::Storable. May, of course, block. Note that the executed sub may 560Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 561never block itself or use any form of event handling.
474 562
475=cut 563=cut
476
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485 564
486sub fork_call(&@) { 565sub fork_call(&@) {
487 my ($cb, @args) = @_; 566 my ($cb, @args) = @_;
488 567
489# 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,
490# or die "socketpair: $!"; 569 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 570 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 571
494 if (my $pid = fork) { 572 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 573 reset_signals;
508 local $SIG{__WARN__}; 574 &$cb
509 local $SIG{__DIE__}; 575 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 576
516 eval { 577 wantarray ? @res : $res[-1]
517 close $fh1; 578}
518 579
519 my @res = eval { $cb->(@args) }; 580=item $coin = coin_from_name $name
520 581
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 582=cut
522 close $fh2;
523 };
524 583
525 warn $@ if $@; 584our %coin_alias = (
526 _exit 0; 585 "silver" => "silvercoin",
527 } 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
528} 605}
529 606
530=item $value = cf::db_get $family => $key 607=item $value = cf::db_get $family => $key
531 608
532Returns a single value from the environment database. 609Returns a single value from the environment database.
… …
534=item cf::db_put $family => $key => $value 611=item cf::db_put $family => $key => $value
535 612
536Stores 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
537data 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).
538 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
539=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}
540 639
541our $DB; 640our $DB;
542 641
543sub db_init { 642sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 643 cf::sync_job {
548 eval { 644 $DB ||= db_table "db";
549 $DB->set_flags (BDB::CHKSUM);
550
551 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
552 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
553 cf::cleanup "db_open(db): $!" if $!;
554 };
555 cf::cleanup "db_open(db): $@" if $@;
556 };
557 } 645 };
558} 646}
559 647
560sub db_get($$) { 648sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 649 my $key = "$_[0]/$_[1]";
562 650
… …
612 if (1) { 700 if (1) {
613 $md5 = 701 $md5 =
614 join "\x00", 702 join "\x00",
615 $processversion, 703 $processversion,
616 map { 704 map {
617 Coro::cede; 705 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 706 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 707 } 0.. $#$src;
620 708
621 709
622 my $dbmd5 = db_get cache => "$id/md5"; 710 my $dbmd5 = db_get cache => "$id/md5";
… …
660 748
661############################################################################# 749#############################################################################
662 750
663=head2 ATTACHABLE OBJECTS 751=head2 ATTACHABLE OBJECTS
664 752
665Many 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
666attach callbacks/event handlers (a collection of which is called an "attachment") 754attach callbacks/event handlers (a collection of which is called an "attachment")
667to it. All such attachable objects support the following methods. 755to it. All such attachable objects support the following methods.
668 756
669In 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>
670C<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
671Crossfire TRT). 759Deliantra).
672 760
673=over 4 761=over 4
674 762
675=item $attachable->attach ($attachment, key => $value...) 763=item $attachable->attach ($attachment, key => $value...)
676 764
… …
720=item cf::CLASS::attachment $name, ... 808=item cf::CLASS::attachment $name, ...
721 809
722Register an attachment by C<$name> through which attachable objects of the 810Register an attachment by C<$name> through which attachable objects of the
723given CLASS can refer to this attachment. 811given CLASS can refer to this attachment.
724 812
725Some classes such as crossfire maps and objects can specify attachments 813Some classes such as deliantra maps and objects can specify attachments
726that 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.
727 815
728These calls expect any number of the following handler/hook descriptions: 816These calls expect any number of the following handler/hook descriptions:
729 817
730=over 4 818=over 4
… …
958 } 1046 }
959 1047
960 0 1048 0
961} 1049}
962 1050
963=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1051=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
964 1052
965=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1053=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
966 1054
967Generate an object-specific event with the given arguments. 1055Generate an object-specific event with the given arguments.
968 1056
… …
974 1062
975=cut 1063=cut
976 1064
977############################################################################# 1065#############################################################################
978# object support 1066# object support
979#
980 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#
981sub _can_merge { 1101sub _can_merge {
982 my ($ob1, $ob2) = @_; 1102 my ($ob1, $ob2) = @_;
983 1103
984 local $Storable::canonical = 1; 1104 ++$SLOW_MERGES;#d#
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987 1105
988 $fob1 eq $fob2 1106 # we do the slow way here
1107 return _object_equal $ob1, $ob2
989} 1108}
990 1109
991sub reattach { 1110sub reattach {
992 # basically do the same as instantiate, without calling instantiate 1111 # basically do the same as instantiate, without calling instantiate
993 my ($obj) = @_; 1112 my ($obj) = @_;
994 1113
1114 # no longer needed after getting rid of delete_package?
995 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
996 1116
997 my $registry = $obj->registry; 1117 my $registry = $obj->registry;
998 1118
999 @$registry = (); 1119 @$registry = ();
1000 1120
… …
1015cf::attachable->attach ( 1135cf::attachable->attach (
1016 prio => -1000000, 1136 prio => -1000000,
1017 on_instantiate => sub { 1137 on_instantiate => sub {
1018 my ($obj, $data) = @_; 1138 my ($obj, $data) = @_;
1019 1139
1020 $data = from_json $data; 1140 $data = decode_json $data;
1021 1141
1022 for (@$data) { 1142 for (@$data) {
1023 my ($name, $args) = @$_; 1143 my ($name, $args) = @$_;
1024 1144
1025 $obj->attach ($name, %{$args || {} }); 1145 $obj->attach ($name, %{$args || {} });
… …
1041sub object_freezer_save { 1161sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1162 my ($filename, $rdata, $objs) = @_;
1043 1163
1044 sync_job { 1164 sync_job {
1045 if (length $$rdata) { 1165 if (length $$rdata) {
1166 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1167 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1168 $decname, length $$rdata, scalar @$objs;
1048 1169
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1170 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1171 aio_chmod $fh, SAVE_MODE;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1172 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 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 }
1053 close $fh; 1177 aio_close $fh;
1054 1178
1055 if (@$objs) { 1179 if (@$objs) {
1056 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) {
1057 chmod SAVE_MODE, $fh; 1181 aio_chmod $fh, SAVE_MODE;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1182 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1183 aio_write $fh, 0, (length $data), $data, 0;
1060 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 }
1061 close $fh; 1188 aio_close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1189 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1190 }
1064 } else { 1191 } else {
1065 aio_unlink "$filename.pst"; 1192 aio_unlink "$filename.pst";
1066 } 1193 }
1067 1194
1068 aio_rename "$filename~", $filename; 1195 aio_rename "$filename~", $filename;
1196
1197 $filename =~ s%/[^/]+$%%;
1198 aio_pathsync $filename if $cf::USE_FSYNC;
1069 } else { 1199 } else {
1070 warn "FATAL: $filename~: $!\n"; 1200 warn "unable to save objects: $filename~: $!\n";
1071 } 1201 }
1072 } else { 1202 } else {
1073 aio_unlink $filename; 1203 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1204 aio_unlink "$filename.pst";
1075 } 1205 }
1076 } 1206 };
1077} 1207}
1078 1208
1079sub object_freezer_as_string { 1209sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1210 my ($rdata, $objs) = @_;
1081 1211
… …
1093 or return; 1223 or return;
1094 1224
1095 unless (aio_stat "$filename.pst") { 1225 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1226 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1227 or return;
1228
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1229 my $st = eval { Coro::Storable::thaw $av };
1230 $av = $st->{objs};
1099 } 1231 }
1100 1232
1233 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1234 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1235 $decname, length $data, scalar @{$av || []};
1236
1103 return ($data, $av); 1237 ($data, $av)
1104} 1238}
1105 1239
1106=head2 COMMAND CALLBACKS 1240=head2 COMMAND CALLBACKS
1107 1241
1108=over 4 1242=over 4
… …
1162 my ($name, $cb) = @_; 1296 my ($name, $cb) = @_;
1163 1297
1164 $EXTICMD{$name} = $cb; 1298 $EXTICMD{$name} = $cb;
1165} 1299}
1166 1300
1301use File::Glob ();
1302
1167cf::player->attach ( 1303cf::player->attach (
1168 on_command => sub { 1304 on_command => sub {
1169 my ($pl, $name, $params) = @_; 1305 my ($pl, $name, $params) = @_;
1170 1306
1171 my $cb = $COMMAND{$name} 1307 my $cb = $COMMAND{$name}
… …
1186 my ($type, $reply, @payload) = 1322 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1323 "ARRAY" eq ref $msg
1188 ? @$msg 1324 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1325 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1326
1327 my @reply;
1328
1191 if (my $cb = $EXTCMD{$type}) { 1329 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1330 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1331 }
1332
1333 $pl->ext_reply ($reply, @reply)
1334 if $reply;
1335
1197 } else { 1336 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1337 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1338 }
1200 1339
1201 cf::override; 1340 cf::override;
1202 }, 1341 },
1203); 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}
1204 1356
1205sub load_extensions { 1357sub load_extensions {
1206 cf::sync_job { 1358 cf::sync_job {
1207 my %todo; 1359 my %todo;
1208 1360
… …
1228 1380
1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1381 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1382 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231 1383
1232 $ext{source} = 1384 $ext{source} =
1233 "package $pkg; use strict; use utf8;\n" 1385 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1234 . "#line 1 \"$path\"\n{\n" 1386 . "#line 1 \"$path\"\n{\n"
1235 . $source 1387 . $source
1236 . "\n};\n1"; 1388 . "\n};\n1";
1237 1389
1238 $todo{$base} = \%ext; 1390 $todo{$base} = \%ext;
… …
1254 my $msg = $@ ? "$v->{path}: $@\n" 1406 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n"; 1407 : "$v->{base}: extension inactive.\n";
1256 1408
1257 if (exists $v->{meta}{mandatory}) { 1409 if (exists $v->{meta}{mandatory}) {
1258 warn $msg; 1410 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n"; 1411 cf::cleanup "mandatory extension failed to load, exiting.";
1260 exit 1;
1261 } 1412 }
1262 1413
1263 warn $msg; 1414 warn $msg;
1264 } 1415 }
1265 1416
… …
1279 1430
1280=back 1431=back
1281 1432
1282=head2 CORE EXTENSIONS 1433=head2 CORE EXTENSIONS
1283 1434
1284Functions and methods that extend core crossfire objects. 1435Functions and methods that extend core deliantra objects.
1285 1436
1286=cut 1437=cut
1287 1438
1288package cf::player; 1439package cf::player;
1289 1440
1290use Coro::AIO; 1441use Coro::AIO;
1291 1442
1292=head3 cf::player 1443=head3 cf::player
1293 1444
1294=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}
1295 1460
1296=item cf::player::find $login 1461=item cf::player::find $login
1297 1462
1298Returns the given player object, loading it if necessary (might block). 1463Returns the given player object, loading it if necessary (might block).
1299 1464
… …
1318 1483
1319sub exists($) { 1484sub exists($) {
1320 my ($login) = @_; 1485 my ($login) = @_;
1321 1486
1322 $cf::PLAYER{$login} 1487 $cf::PLAYER{$login}
1323 or cf::sync_job { !aio_stat path $login } 1488 or !aio_stat path $login
1324} 1489}
1325 1490
1326sub find($) { 1491sub find($) {
1327 return $cf::PLAYER{$_[0]} || do { 1492 return $cf::PLAYER{$_[0]} || do {
1328 my $login = $_[0]; 1493 my $login = $_[0];
… …
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1500 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1501 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1502 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1503 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1504
1340 my $pl = load_pl path $login 1505 my $f = new_from_file cf::object::thawer path $login
1341 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;
1342 $cf::PLAYER{$login} = $pl 1513 $cf::PLAYER{$login} = $pl
1343 } 1514 }
1344 } 1515 }
1345} 1516}
1346 1517
… …
1355 return if $pl->{deny_save}; 1526 return if $pl->{deny_save};
1356 1527
1357 aio_mkdir playerdir $pl, 0770; 1528 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1529 $pl->{last_save} = $cf::RUNTIME;
1359 1530
1531 cf::get_slot 0.01;
1532
1360 $pl->save_pl ($path); 1533 $pl->save_pl ($path);
1361 Coro::cede; 1534 cf::cede_to_tick;
1362} 1535}
1363 1536
1364sub new($) { 1537sub new($) {
1365 my ($login) = @_; 1538 my ($login) = @_;
1366 1539
… …
1372 $cf::PLAYER{$login} = $self; 1545 $cf::PLAYER{$login} = $self;
1373 1546
1374 $self 1547 $self
1375} 1548}
1376 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
1377=item $pl->quit_character 1560=item $pl->quit_character
1378 1561
1379Nukes the player without looking back. If logged in, the connection will 1562Nukes the player without looking back. If logged in, the connection will
1380be destroyed. May block for a long time. 1563be destroyed. May block for a long time.
1381 1564
… …
1385 my ($pl) = @_; 1568 my ($pl) = @_;
1386 1569
1387 my $name = $pl->ob->name; 1570 my $name = $pl->ob->name;
1388 1571
1389 $pl->{deny_save} = 1; 1572 $pl->{deny_save} = 1;
1390 $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
1391 1574
1392 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1575 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1393 $pl->deactivate; 1576 $pl->deactivate;
1577 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1578 $pl->ob->check_score;
1394 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1579 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1395 $pl->ns->destroy if $pl->ns; 1580 $pl->ns->destroy if $pl->ns;
1396 1581
1397 my $path = playerdir $pl; 1582 my $path = playerdir $pl;
1398 my $temp = "$path~$cf::RUNTIME~deleting~"; 1583 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1434 or return []; 1619 or return [];
1435 1620
1436 my @logins; 1621 my @logins;
1437 1622
1438 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") {
1439 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1629 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1440 aio_read $fh, 0, 512, my $buf, 0 or next; 1630 aio_read $fh, 0, 512, my $buf, 0 or next;
1441 $buf !~ /^password -------------$/m or next; # official not-valid tag 1631 $buf !~ /^password -------------$/m or next; # official not-valid tag
1632 }
1442 1633
1443 utf8::decode $login; 1634 utf8::decode $login;
1444 push @logins, $login; 1635 push @logins, $login;
1445 } 1636 }
1446 1637
… …
1473 } 1664 }
1474 1665
1475 \@paths 1666 \@paths
1476} 1667}
1477 1668
1478=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1669=item $protocol_xml = $player->expand_cfpod ($cfpod)
1479 1670
1480Expand crossfire pod fragments into protocol xml. 1671Expand deliantra pod fragments into protocol xml.
1481
1482=cut
1483
1484sub expand_cfpod {
1485 ((my $self), (local $_)) = @_;
1486
1487 # escape & and <
1488 s/&/&amp;/g;
1489 s/(?<![BIUGH])</&lt;/g;
1490
1491 # this is buggy, it needs to properly take care of nested <'s
1492
1493 1 while
1494 # replace B<>, I<>, U<> etc.
1495 s/B<([^\>]*)>/<b>$1<\/b>/
1496 || s/I<([^\>]*)>/<i>$1<\/i>/
1497 || s/U<([^\>]*)>/<u>$1<\/u>/
1498 # replace G<male|female> tags
1499 || s{G<([^>|]*)\|([^>]*)>}{
1500 $self->gender ? $2 : $1
1501 }ge
1502 # replace H<hint text>
1503 || s{H<([^\>]*)>}
1504 {
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "")
1508 [$self->{hintmode}]
1509 }ge;
1510
1511 # create single paragraphs (very hackish)
1512 s/(?<=\S)\n(?=\w)/ /g;
1513
1514 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines
1519
1520 $_
1521}
1522
1523sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode}
1526}
1527 1672
1528=item $player->ext_reply ($msgid, @msg) 1673=item $player->ext_reply ($msgid, @msg)
1529 1674
1530Sends an ext reply to the player. 1675Sends an ext reply to the player.
1531 1676
1532=cut 1677=cut
1533 1678
1534sub ext_reply($$@) { 1679sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1680 my ($self, $id, @msg) = @_;
1536 1681
1537 if ($self->ns->extcmd == 2) { 1682 $self->ns->ext_reply ($id, @msg)
1538 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1539 } elsif ($self->ns->extcmd == 1) {
1540 #TODO: version 1, remove
1541 unshift @msg, msgtype => "reply", msgid => $id;
1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1544} 1683}
1545 1684
1546=item $player->ext_msg ($type, @msg) 1685=item $player->ext_msg ($type, @msg)
1547 1686
1548Sends an ext event to the client. 1687Sends an ext event to the client.
… …
1604our $MAX_RESET = 3600; 1743our $MAX_RESET = 3600;
1605our $DEFAULT_RESET = 3000; 1744our $DEFAULT_RESET = 3000;
1606 1745
1607sub generate_random_map { 1746sub generate_random_map {
1608 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
1609 # mit "rum" bekleckern, nicht 1751 # mit "rum" bekleckern, nicht
1610 $self->_create_random_map ( 1752 $self->_create_random_map (
1611 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1753 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1612 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1754 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1613 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1755 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1735 1877
1736# the temporary/swap location 1878# the temporary/swap location
1737sub save_path { 1879sub save_path {
1738 my ($self) = @_; 1880 my ($self) = @_;
1739 1881
1740 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1882 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1741 "$TMPDIR/$path.map" 1883 "$TMPDIR/$path.map"
1742} 1884}
1743 1885
1744# the unique path, undef == no special unique path 1886# the unique path, undef == no special unique path
1745sub uniq_path { 1887sub uniq_path {
1746 my ($self) = @_; 1888 my ($self) = @_;
1747 1889
1748 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1890 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1749 "$UNIQUEDIR/$path" 1891 "$UNIQUEDIR/$path"
1750}
1751
1752# and all this just because we cannot iterate over
1753# all maps in C++...
1754sub change_all_map_light {
1755 my ($change) = @_;
1756
1757 $_->change_map_light ($change)
1758 for grep $_->outdoor, values %cf::MAP;
1759} 1892}
1760 1893
1761sub decay_objects { 1894sub decay_objects {
1762 my ($self) = @_; 1895 my ($self) = @_;
1763 1896
… …
1776 1909
1777sub load_header_from($) { 1910sub load_header_from($) {
1778 my ($self, $path) = @_; 1911 my ($self, $path) = @_;
1779 1912
1780 utf8::encode $path; 1913 utf8::encode $path;
1781 #aio_open $path, O_RDONLY, 0 1914 my $f = new_from_file cf::object::thawer $path
1782 # or return;
1783
1784 $self->_load_header ($path)
1785 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;
1786 1922
1787 $self->{load_path} = $path; 1923 $self->{load_path} = $path;
1788 1924
1789 1 1925 1
1790} 1926}
… …
1844sub find { 1980sub find {
1845 my ($path, $origin) = @_; 1981 my ($path, $origin) = @_;
1846 1982
1847 $path = normalise $path, $origin && $origin->path; 1983 $path = normalise $path, $origin && $origin->path;
1848 1984
1985 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1849 cf::lock_wait "map_find:$path"; 1986 my $guard2 = cf::lock_acquire "map_find:$path";
1850 1987
1851 $cf::MAP{$path} || do { 1988 $cf::MAP{$path} || do {
1852 my $guard = cf::lock_acquire "map_find:$path";
1853 my $map = new_from_path cf::map $path 1989 my $map = new_from_path cf::map $path
1854 or return; 1990 or return;
1855 1991
1856 $map->{last_save} = $cf::RUNTIME; 1992 $map->{last_save} = $cf::RUNTIME;
1857 1993
… …
1859 or return; 1995 or return;
1860 1996
1861 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1997 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1862 # doing this can freeze the server in a sync job, obviously 1998 # doing this can freeze the server in a sync job, obviously
1863 #$cf::WAIT_FOR_TICK->wait; 1999 #$cf::WAIT_FOR_TICK->wait;
2000 undef $guard2;
2001 undef $guard1;
1864 $map->reset; 2002 $map->reset;
1865 undef $guard;
1866 return find $path; 2003 return find $path;
1867 } 2004 }
1868 2005
1869 $cf::MAP{$path} = $map 2006 $cf::MAP{$path} = $map
1870 } 2007 }
… …
1879 local $self->{deny_reset} = 1; # loading can take a long time 2016 local $self->{deny_reset} = 1; # loading can take a long time
1880 2017
1881 my $path = $self->{path}; 2018 my $path = $self->{path};
1882 2019
1883 { 2020 {
1884 my $guard = cf::lock_acquire "map_load:$path"; 2021 my $guard = cf::lock_acquire "map_data:$path";
1885 2022
2023 return unless $self->valid;
1886 return if $self->in_memory != cf::MAP_SWAPPED; 2024 return unless $self->in_memory == cf::MAP_SWAPPED;
1887 2025
1888 $self->in_memory (cf::MAP_LOADING); 2026 $self->in_memory (cf::MAP_LOADING);
1889 2027
1890 $self->alloc; 2028 $self->alloc;
1891 2029
1892 $self->pre_load; 2030 $self->pre_load;
1893 Coro::cede; 2031 cf::cede_to_tick;
1894 2032
2033 my $f = new_from_file cf::object::thawer $self->{load_path};
2034 $f->skip_block;
1895 $self->_load_objects ($self->{load_path}, 1) 2035 $self->_load_objects ($f)
1896 or return; 2036 or return;
1897 2037
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2038 $self->post_load_original
1899 if delete $self->{load_original}; 2039 if delete $self->{load_original};
1900 2040
1901 if (my $uniq = $self->uniq_path) { 2041 if (my $uniq = $self->uniq_path) {
1902 utf8::encode $uniq; 2042 utf8::encode $uniq;
1903 if (aio_open $uniq, O_RDONLY, 0) { 2043 unless (aio_stat $uniq) {
2044 if (my $f = new_from_file cf::object::thawer $uniq) {
1904 $self->clear_unique_items; 2045 $self->clear_unique_items;
1905 $self->_load_objects ($uniq, 0); 2046 $self->_load_objects ($f);
2047 $f->resolve_delayed_derefs;
2048 }
1906 } 2049 }
1907 } 2050 }
1908 2051
1909 Coro::cede; 2052 $f->resolve_delayed_derefs;
2053
2054 cf::cede_to_tick;
1910 # now do the right thing for maps 2055 # now do the right thing for maps
1911 $self->link_multipart_objects; 2056 $self->link_multipart_objects;
1912 $self->difficulty ($self->estimate_difficulty) 2057 $self->difficulty ($self->estimate_difficulty)
1913 unless $self->difficulty; 2058 unless $self->difficulty;
1914 Coro::cede; 2059 cf::cede_to_tick;
1915 2060
1916 unless ($self->{deny_activate}) { 2061 unless ($self->{deny_activate}) {
1917 $self->decay_objects; 2062 $self->decay_objects;
1918 $self->fix_auto_apply; 2063 $self->fix_auto_apply;
1919 $self->update_buttons; 2064 $self->update_buttons;
1920 Coro::cede; 2065 cf::cede_to_tick;
1921 $self->set_darkness_map;
1922 Coro::cede;
1923 $self->activate; 2066 $self->activate;
1924 } 2067 }
1925 2068
2069 $self->{last_save} = $cf::RUNTIME;
2070 $self->last_access ($cf::RUNTIME);
2071
1926 $self->in_memory (cf::MAP_IN_MEMORY); 2072 $self->in_memory (cf::MAP_ACTIVE);
1927 } 2073 }
1928 2074
1929 $self->post_load; 2075 $self->post_load;
1930} 2076}
1931 2077
… …
1940 2086
1941 $self 2087 $self
1942} 2088}
1943 2089
1944# 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
1945sub load_diag { 2091sub load_neighbours {
1946 my ($map) = @_; 2092 my ($map) = @_;
1947 2093
1948 my @diag; # diagonal neighbours 2094 my @neigh; # diagonal neighbours
1949 2095
1950 for (0 .. 3) { 2096 for (0 .. 3) {
1951 my $neigh = $map->tile_path ($_) 2097 my $neigh = $map->tile_path ($_)
1952 or next; 2098 or next;
1953 $neigh = find $neigh, $map 2099 $neigh = find $neigh, $map
1954 or next; 2100 or next;
1955 $neigh->load; 2101 $neigh->load;
1956 2102
2103 push @neigh,
1957 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2104 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1958 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2105 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1959 } 2106 }
1960 2107
1961 for (@diag) { 2108 for (grep defined $_->[0], @neigh) {
2109 my ($path, $origin) = @$_;
1962 my $neigh = find @$_ 2110 my $neigh = find $path, $origin
1963 or next; 2111 or next;
1964 $neigh->load; 2112 $neigh->load;
1965 } 2113 }
1966} 2114}
1967 2115
… …
1972} 2120}
1973 2121
1974sub do_load_sync { 2122sub do_load_sync {
1975 my ($map) = @_; 2123 my ($map) = @_;
1976 2124
2125 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2126 if $Coro::current == $Coro::main;
2127
1977 cf::sync_job { $map->load }; 2128 cf::sync_job { $map->load };
1978} 2129}
1979 2130
1980our %MAP_PREFETCH; 2131our %MAP_PREFETCH;
1981our $MAP_PREFETCHER = undef; 2132our $MAP_PREFETCHER = undef;
1982 2133
1983sub find_async { 2134sub find_async {
1984 my ($path, $origin) = @_; 2135 my ($path, $origin, $load) = @_;
1985 2136
1986 $path = normalise $path, $origin && $origin->{path}; 2137 $path = normalise $path, $origin && $origin->{path};
1987 2138
1988 if (my $map = $cf::MAP{$path}) { 2139 if (my $map = $cf::MAP{$path}) {
1989 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2140 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1990 } 2141 }
1991 2142
1992 undef $MAP_PREFETCH{$path}; 2143 $MAP_PREFETCH{$path} |= $load;
2144
1993 $MAP_PREFETCHER ||= cf::async { 2145 $MAP_PREFETCHER ||= cf::async {
2146 $Coro::current->{desc} = "map prefetcher";
2147
1994 while (%MAP_PREFETCH) { 2148 while (%MAP_PREFETCH) {
1995 for my $path (keys %MAP_PREFETCH) { 2149 while (my ($k, $v) = each %MAP_PREFETCH) {
1996 if (my $map = find $path) { 2150 if (my $map = find $k) {
1997 $map->load; 2151 $map->load if $v;
1998 } 2152 }
1999 2153
2000 delete $MAP_PREFETCH{$path}; 2154 delete $MAP_PREFETCH{$k};
2001 } 2155 }
2002 } 2156 }
2003 undef $MAP_PREFETCHER; 2157 undef $MAP_PREFETCHER;
2004 }; 2158 };
2005 $MAP_PREFETCHER->prio (6); 2159 $MAP_PREFETCHER->prio (6);
… …
2008} 2162}
2009 2163
2010sub save { 2164sub save {
2011 my ($self) = @_; 2165 my ($self) = @_;
2012 2166
2013 my $lock = cf::lock_acquire "map_data:" . $self->path; 2167 my $lock = cf::lock_acquire "map_data:$self->{path}";
2014 2168
2015 $self->{last_save} = $cf::RUNTIME; 2169 $self->{last_save} = $cf::RUNTIME;
2016 2170
2017 return unless $self->dirty; 2171 return unless $self->dirty;
2018 2172
… …
2024 return if $self->{deny_save}; 2178 return if $self->{deny_save};
2025 2179
2026 local $self->{last_access} = $self->last_access;#d# 2180 local $self->{last_access} = $self->last_access;#d#
2027 2181
2028 cf::async { 2182 cf::async {
2183 $Coro::current->{desc} = "map player save";
2029 $_->contr->save for $self->players; 2184 $_->contr->save for $self->players;
2030 }; 2185 };
2186
2187 cf::get_slot 0.02;
2031 2188
2032 if ($uniq) { 2189 if ($uniq) {
2033 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2190 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2034 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2191 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2035 } else { 2192 } else {
… …
2041 my ($self) = @_; 2198 my ($self) = @_;
2042 2199
2043 # save first because save cedes 2200 # save first because save cedes
2044 $self->save; 2201 $self->save;
2045 2202
2046 my $lock = cf::lock_acquire "map_data:" . $self->path; 2203 my $lock = cf::lock_acquire "map_data:$self->{path}";
2047 2204
2048 return if $self->players; 2205 return if $self->players;
2049 return if $self->in_memory != cf::MAP_IN_MEMORY; 2206 return if $self->in_memory != cf::MAP_ACTIVE;
2050 return if $self->{deny_save}; 2207 return if $self->{deny_save};
2051 2208
2209 $self->in_memory (cf::MAP_SWAPPED);
2210
2211 $self->deactivate;
2212 $_->clear_links_to ($self) for values %cf::MAP;
2052 $self->clear; 2213 $self->clear;
2053 $self->in_memory (cf::MAP_SWAPPED);
2054} 2214}
2055 2215
2056sub reset_at { 2216sub reset_at {
2057 my ($self) = @_; 2217 my ($self) = @_;
2058 2218
… …
2076 2236
2077 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2237 my $lock = cf::lock_acquire "map_data:$self->{path}";
2078 2238
2079 return if $self->players; 2239 return if $self->players;
2080 2240
2081 warn "resetting map ", $self->path; 2241 warn "resetting map ", $self->path, "\n";
2082 2242
2083 $self->in_memory (cf::MAP_SWAPPED); 2243 $self->in_memory (cf::MAP_SWAPPED);
2084 2244
2085 # need to save uniques path 2245 # need to save uniques path
2086 unless ($self->{deny_save}) { 2246 unless ($self->{deny_save}) {
… …
2090 if $uniq; 2250 if $uniq;
2091 } 2251 }
2092 2252
2093 delete $cf::MAP{$self->path}; 2253 delete $cf::MAP{$self->path};
2094 2254
2255 $self->deactivate;
2256 $_->clear_links_to ($self) for values %cf::MAP;
2095 $self->clear; 2257 $self->clear;
2096
2097 $_->clear_links_to ($self) for values %cf::MAP;
2098 2258
2099 $self->unlink_save; 2259 $self->unlink_save;
2100 $self->destroy; 2260 $self->destroy;
2101} 2261}
2102 2262
2103my $nuke_counter = "aaaa"; 2263my $nuke_counter = "aaaa";
2104 2264
2105sub nuke { 2265sub nuke {
2106 my ($self) = @_; 2266 my ($self) = @_;
2107 2267
2268 {
2269 my $lock = cf::lock_acquire "map_data:$self->{path}";
2270
2108 delete $cf::MAP{$self->path}; 2271 delete $cf::MAP{$self->path};
2109 2272
2110 $self->unlink_save; 2273 $self->unlink_save;
2111 2274
2112 bless $self, "cf::map"; 2275 bless $self, "cf::map";
2113 delete $self->{deny_reset}; 2276 delete $self->{deny_reset};
2114 $self->{deny_save} = 1; 2277 $self->{deny_save} = 1;
2115 $self->reset_timeout (1); 2278 $self->reset_timeout (1);
2116 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2279 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2117 2280
2118 $cf::MAP{$self->path} = $self; 2281 $cf::MAP{$self->path} = $self;
2282 }
2119 2283
2120 $self->reset; # polite request, might not happen 2284 $self->reset; # polite request, might not happen
2121} 2285}
2122 2286
2123=item $maps = cf::map::tmp_maps 2287=item $maps = cf::map::tmp_maps
… …
2165 2329
2166sub unique_maps() { 2330sub unique_maps() {
2167 [ 2331 [
2168 map { 2332 map {
2169 utf8::decode $_; 2333 utf8::decode $_;
2170 /\.map$/ 2334 s/\.map$//; # TODO future compatibility hack
2335 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2336 ? ()
2171 ? normalise $_ 2337 : normalise $_
2172 : ()
2173 } @{ aio_readdir $UNIQUEDIR or [] } 2338 } @{ aio_readdir $UNIQUEDIR or [] }
2174 ] 2339 ]
2175} 2340}
2176 2341
2177package cf;
2178
2179=back 2342=back
2180 2343
2181=head3 cf::object 2344=head3 cf::object
2182 2345
2183=cut 2346=cut
… …
2186 2349
2187=over 4 2350=over 4
2188 2351
2189=item $ob->inv_recursive 2352=item $ob->inv_recursive
2190 2353
2191Returns 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.
2192 2356
2193=cut 2357=cut
2194 2358
2195sub inv_recursive_; 2359sub inv_recursive_;
2196sub inv_recursive_ { 2360sub inv_recursive_ {
… …
2199 2363
2200sub inv_recursive { 2364sub inv_recursive {
2201 inv_recursive_ inv $_[0] 2365 inv_recursive_ inv $_[0]
2202} 2366}
2203 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
2204package cf; 2396package cf;
2205 2397
2206=back 2398=back
2207 2399
2208=head3 cf::object::player 2400=head3 cf::object::player
… …
2214Sends 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>
2215can 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
2216dialogue with the given NPC character. 2408dialogue with the given NPC character.
2217 2409
2218=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};
2219 2425
2220# rough implementation of a future "reply" method that works 2426# rough implementation of a future "reply" method that works
2221# with dialog boxes. 2427# with dialog boxes.
2222#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
2223sub cf::object::player::reply($$$;$) { 2429sub cf::object::player::reply($$$;$) {
… …
2235 my $dialog = $pl->{npc_dialog}; 2441 my $dialog = $pl->{npc_dialog};
2236 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2442 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2237 2443
2238 } else { 2444 } else {
2239 $msg = $npc->name . " says: $msg" if $npc; 2445 $msg = $npc->name . " says: $msg" if $npc;
2240 $self->message ($msg, $flags); 2446 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2241 } 2447 }
2242 } 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 (@_);
2243} 2459}
2244 2460
2245=item $player_object->may ("access") 2461=item $player_object->may ("access")
2246 2462
2247Returns wether the given player is authorized to access resource "access" 2463Returns wether the given player is authorized to access resource "access"
… …
2260 2476
2261=item $player_object->enter_link 2477=item $player_object->enter_link
2262 2478
2263Freezes 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}>).
2264 2480
2265The 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.
2266I<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.
2267 2485
2268Will never block. 2486Will never block.
2269 2487
2270=item $player_object->leave_link ($map, $x, $y) 2488=item $player_object->leave_link ($map, $x, $y)
2271 2489
… …
2326 # use -1 or undef as default coordinates, not 0, 0 2544 # use -1 or undef as default coordinates, not 0, 0
2327 ($x, $y) = ($map->enter_x, $map->enter_y) 2545 ($x, $y) = ($map->enter_x, $map->enter_y)
2328 if $x <=0 && $y <= 0; 2546 if $x <=0 && $y <= 0;
2329 2547
2330 $map->load; 2548 $map->load;
2331 $map->load_diag; 2549 $map->load_neighbours;
2332 2550
2333 return unless $self->contr->active; 2551 return unless $self->contr->active;
2334 $self->activate_recursive;
2335 2552
2336 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2553 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2337 $self->enter_map ($map, $x, $y); 2554 $self->enter_map ($map, $x, $y);
2555
2556 # only activate afterwards, to support waiting in hooks
2557 $self->activate_recursive;
2338} 2558}
2339 2559
2340=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2560=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2341 2561
2342Moves 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
2343her, loading and preparing them map, calling the provided $check callback 2563her, loading and preparing them map, calling the provided $check callback
2344that 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
2345the new (success) or old (failed) map position. In either case, $done will 2565the new (success) or old (failed) map position. In either case, $done will
2346be called at the end of this process. 2566be called at the end of this process.
2347 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 >>.
2570
2348=cut 2571=cut
2349 2572
2350our $GOTOGEN; 2573our $GOTOGEN;
2351 2574
2352sub cf::object::player::goto { 2575sub cf::object::player::goto {
… …
2356 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2579 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2357 2580
2358 $self->enter_link; 2581 $self->enter_link;
2359 2582
2360 (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
2361 my $map = eval { 2605 my $map = eval {
2362 my $map = cf::map::find $path; 2606 my $map = defined $path ? cf::map::find $path : undef;
2363 2607
2364 if ($map) { 2608 if ($map) {
2365 $map = $map->customise_for ($self); 2609 $map = $map->customise_for ($self);
2366 $map = $check->($map) if $check && $map; 2610 $map = $check->($map) if $check && $map;
2367 } else { 2611 } else {
2368 $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);
2369 } 2613 }
2370 2614
2371 $map 2615 $map
2372 }; 2616 };
2373 2617
… …
2409} 2653}
2410 2654
2411sub prepare_random_map { 2655sub prepare_random_map {
2412 my ($exit) = @_; 2656 my ($exit) = @_;
2413 2657
2414 my $guard = cf::lock_acquire "exit_prepare:$exit";
2415
2416 # all this does is basically replace the /! path by 2658 # all this does is basically replace the /! path by
2417 # a new random map path (?random/...) with a seed 2659 # a new random map path (?random/...) with a seed
2418 # that depends on the exit object 2660 # that depends on the exit object
2419 2661
2420 my $rmp = parse_random_map_params $exit->msg; 2662 my $rmp = parse_random_map_params $exit->msg;
… …
2422 if ($exit->map) { 2664 if ($exit->map) {
2423 $rmp->{region} = $exit->region->name; 2665 $rmp->{region} = $exit->region->name;
2424 $rmp->{origin_map} = $exit->map->path; 2666 $rmp->{origin_map} = $exit->map->path;
2425 $rmp->{origin_x} = $exit->x; 2667 $rmp->{origin_x} = $exit->x;
2426 $rmp->{origin_y} = $exit->y; 2668 $rmp->{origin_y} = $exit->y;
2669
2670 $exit->map->touch;
2427 } 2671 }
2428 2672
2429 $rmp->{random_seed} ||= $exit->random_seed; 2673 $rmp->{random_seed} ||= $exit->random_seed;
2430 2674
2431 my $data = cf::to_json $rmp; 2675 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2432 my $md5 = Digest::MD5::md5_hex $data; 2676 my $md5 = Digest::MD5::md5_hex $data;
2433 my $meta = "$RANDOMDIR/$md5.meta"; 2677 my $meta = "$RANDOMDIR/$md5.meta";
2434 2678
2435 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2679 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2436 aio_write $fh, 0, (length $data), $data, 0; 2680 aio_write $fh, 0, (length $data), $data, 0;
2437 undef $fh; 2681 undef $fh;
2438 aio_rename "$meta~", $meta; 2682 aio_rename "$meta~", $meta;
2439 2683
2684 my $slaying = "?random/$md5";
2685
2686 if ($exit->valid) {
2440 $exit->slaying ("?random/$md5"); 2687 $exit->slaying ("?random/$md5");
2441 $exit->msg (undef); 2688 $exit->msg (undef);
2689 }
2442 } 2690 }
2443} 2691}
2444 2692
2445sub cf::object::player::enter_exit { 2693sub cf::object::player::enter_exit {
2446 my ($self, $exit) = @_; 2694 my ($self, $exit) = @_;
2447 2695
2448 return unless $self->type == cf::PLAYER; 2696 return unless $self->type == cf::PLAYER;
2449 2697
2450 if ($exit->slaying eq "/!") {
2451 #TODO: this should de-fi-ni-te-ly not be a sync-job
2452 # the problem is that $exit might not survive long enough
2453 # so it needs to be done right now, right here
2454 cf::sync_job { prepare_random_map $exit };
2455 }
2456
2457 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2458 my $hp = $exit->stats->hp;
2459 my $sp = $exit->stats->sp;
2460
2461 $self->enter_link; 2698 $self->enter_link;
2462 2699
2463 # if exit is damned, update players death & WoR home-position
2464 $self->contr->savebed ($slaying, $hp, $sp)
2465 if $exit->flag (FLAG_DAMNED);
2466
2467 (async { 2700 (async {
2468 $self->deactivate_recursive; # just to be sure 2701 $Coro::current->{desc} = "enter_exit";
2702
2469 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
2470 $self->goto ($slaying, $hp, $sp); 2718 $self->goto ($map, $x, $y);
2471 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
2472 1; 2724 1
2473 }) { 2725 }) {
2474 $self->message ("Something went wrong deep within the crossfire server. " 2726 $self->message ("Something went wrong deep within the deliantra server. "
2475 . "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. "
2476 . "Please report this to the dungeon master!", 2728 . "Please report this to the dungeon master!",
2477 cf::NDI_UNIQUE | cf::NDI_RED); 2729 cf::NDI_UNIQUE | cf::NDI_RED);
2478 2730
2479 warn "ERROR in enter_exit: $@"; 2731 warn "ERROR in enter_exit: $@";
… …
2507the message, with C<log> being the default. If C<$color> is negative, suppress 2759the message, with C<log> being the default. If C<$color> is negative, suppress
2508the message unless the client supports the msg packet. 2760the message unless the client supports the msg packet.
2509 2761
2510=cut 2762=cut
2511 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
2512sub cf::client::send_msg { 2866sub cf::client::send_msg {
2513 my ($self, $channel, $msg, $color, @extra) = @_; 2867 my ($self, $channel, $msg, $color, @extra) = @_;
2514 2868
2515 $msg = $self->pl->expand_cfpod ($msg); 2869 $msg = $self->pl->expand_cfpod ($msg)
2870 unless $color & cf::NDI_VERBATIM;
2516 2871
2517 $color &= ~cf::NDI_UNIQUE; # just in case... 2872 $color &= cf::NDI_CLIENT_MASK; # just in case...
2518 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
2519 if (ref $channel) { 2881 } elsif (ref $channel) {
2520 # send meta info to client, if not yet sent 2882 # send meta info to client, if not yet sent
2521 unless (exists $self->{channel}{$channel->{id}}) { 2883 unless (exists $self->{channel}{$channel->{id}}) {
2522 $self->{channel}{$channel->{id}} = $channel; 2884 $self->{channel}{$channel->{id}} = $channel;
2523 $self->ext_msg (channel_info => $channel); 2885 $self->ext_msg (channel_info => $channel);
2524 } 2886 }
… …
2526 $channel = $channel->{id}; 2888 $channel = $channel->{id};
2527 } 2889 }
2528 2890
2529 return unless @extra || length $msg; 2891 return unless @extra || length $msg;
2530 2892
2531 if ($self->can_msg) { 2893 # default colour, mask it out
2532 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2894 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2533 } else { 2895 if $color & cf::NDI_DEF;
2534 # replace some tags by gcfclient-compatible ones
2535 for ($msg) {
2536 1 while
2537 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2538 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2539 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2540 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2541 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2542 }
2543 2896
2544 if ($color >= 0) { 2897 my $pkt = "msg "
2545 if (0 && $msg =~ /\[/) { 2898 . $self->{json_coder}->encode (
2546 $self->send_packet ("drawextinfo $color 4 0 $msg") 2899 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2547 } else { 2900 );
2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2901
2549 $self->send_packet ("drawinfo $color $msg") 2902 # try lzf for large packets
2550 } 2903 $pkt = "lzf " . Compress::LZF::compress $pkt
2551 } 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";
2552 } 2910 }
2911
2912 $self->send_packet ($pkt);
2553} 2913}
2554 2914
2555=item $client->ext_msg ($type, @msg) 2915=item $client->ext_msg ($type, @msg)
2556 2916
2557Sends an ext event to the client. 2917Sends an ext event to the client.
… …
2559=cut 2919=cut
2560 2920
2561sub cf::client::ext_msg($$@) { 2921sub cf::client::ext_msg($$@) {
2562 my ($self, $type, @msg) = @_; 2922 my ($self, $type, @msg) = @_;
2563 2923
2564 my $extcmd = $self->extcmd;
2565
2566 if ($extcmd == 2) { 2924 if ($self->extcmd == 2) {
2567 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2925 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2568 } elsif ($extcmd == 1) { # TODO: remove 2926 } elsif ($self->extcmd == 1) { # TODO: remove
2569 push @msg, msgtype => "event_$type"; 2927 push @msg, msgtype => "event_$type";
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;
2570 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2946 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2571 } 2947 }
2572} 2948}
2573 2949
2574=item $success = $client->query ($flags, "text", \&cb) 2950=item $success = $client->query ($flags, "text", \&cb)
… …
2636 my ($type, $reply, @payload) = 3012 my ($type, $reply, @payload) =
2637 "ARRAY" eq ref $msg 3013 "ARRAY" eq ref $msg
2638 ? @$msg 3014 ? @$msg
2639 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 3015 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2640 3016
3017 my @reply;
3018
2641 if (my $cb = $EXTICMD{$type}) { 3019 if (my $cb = $EXTICMD{$type}) {
2642 my @reply = $cb->($ns, @payload); 3020 @reply = $cb->($ns, @payload);
2643
2644 $ns->ext_reply ($reply, @reply)
2645 if $reply;
2646 } 3021 }
3022
3023 $ns->ext_reply ($reply, @reply)
3024 if $reply;
3025
2647 } else { 3026 } else {
2648 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3027 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2649 } 3028 }
2650 3029
2651 cf::override; 3030 cf::override;
… …
2698our $safe = new Safe "safe"; 3077our $safe = new Safe "safe";
2699our $safe_hole = new Safe::Hole; 3078our $safe_hole = new Safe::Hole;
2700 3079
2701$SIG{FPE} = 'IGNORE'; 3080$SIG{FPE} = 'IGNORE';
2702 3081
2703$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));
2704 3087
2705# here we export the classes and methods available to script code 3088# here we export the classes and methods available to script code
2706 3089
2707=pod 3090=pod
2708 3091
2709The following functions and methods are available within a safe environment: 3092The following functions and methods are available within a safe environment:
2710 3093
2711 cf::object 3094 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 3095 contr pay_amount pay_player map x y force_find force_add destroy
2713 insert remove 3096 insert remove name archname title slaying race decrease split
3097 value
2714 3098
2715 cf::object::player 3099 cf::object::player
2716 player 3100 player
2717 3101
2718 cf::player 3102 cf::player
… …
2723 3107
2724=cut 3108=cut
2725 3109
2726for ( 3110for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3111 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2728 insert remove)], 3112 insert remove inv nrof name archname title slaying race
3113 decrease split destroy change_exp value msg lore send_msg)],
2729 ["cf::object::player" => qw(player)], 3114 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 3115 ["cf::player" => qw(peaceful send_msg)],
2731 ["cf::map" => qw(trigger)], 3116 ["cf::map" => qw(trigger)],
2732) { 3117) {
2733 no strict 'refs'; 3118 no strict 'refs';
2734 my ($pkg, @funs) = @$_; 3119 my ($pkg, @funs) = @$_;
2735 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3120 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2752 my ($code, %vars) = @_; 3137 my ($code, %vars) = @_;
2753 3138
2754 my $qcode = $code; 3139 my $qcode = $code;
2755 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3140 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2756 $qcode =~ s/\n/\\n/g; 3141 $qcode =~ s/\n/\\n/g;
3142
3143 %vars = (_dummy => 0) unless %vars;
2757 3144
2758 local $_; 3145 local $_;
2759 local @safe::cf::_safe_eval_args = values %vars; 3146 local @safe::cf::_safe_eval_args = values %vars;
2760 3147
2761 my $eval = 3148 my $eval =
… …
2809# the server's init and main functions 3196# the server's init and main functions
2810 3197
2811sub load_facedata($) { 3198sub load_facedata($) {
2812 my ($path) = @_; 3199 my ($path) = @_;
2813 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
2814 warn "loading facedata from $path\n"; 3207 warn "loading facedata from $path\n";
2815 3208
2816 my $facedata; 3209 my $facedata;
2817 0 < aio_load $path, $facedata 3210 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 3211 or die "$path: $!";
… …
2820 $facedata = Coro::Storable::thaw $facedata; 3213 $facedata = Coro::Storable::thaw $facedata;
2821 3214
2822 $facedata->{version} == 2 3215 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 3216 or cf::cleanup "$path: version mismatch, cannot proceed.";
2824 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
2825 { 3225 {
2826 my $faces = $facedata->{faceinfo}; 3226 my $faces = $facedata->{faceinfo};
2827 3227
2828 while (my ($face, $info) = each %$faces) { 3228 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3229 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3230
2830 cf::face::set_visibility $idx, $info->{visibility}; 3231 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 3232 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3233 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3234 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 3235
2835 cf::cede_to_tick; 3236 cf::cede_to_tick;
2836 } 3237 }
2837 3238
2838 while (my ($face, $info) = each %$faces) { 3239 while (my ($face, $info) = each %$faces) {
2839 next unless $info->{smooth}; 3240 next unless $info->{smooth};
3241
2840 my $idx = cf::face::find $face 3242 my $idx = cf::face::find $face
2841 or next; 3243 or next;
3244
2842 if (my $smooth = cf::face::find $info->{smooth}) { 3245 if (my $smooth = cf::face::find $info->{smooth}) {
2843 cf::face::set_smooth $idx, $smooth; 3246 cf::face::set_smooth $idx, $smooth;
2844 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3247 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2845 } else { 3248 } else {
2846 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3249 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
2863 3266
2864 { 3267 {
2865 # TODO: for gcfclient pleasure, we should give resources 3268 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 3269 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 3270 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869 3271
2870 while (my ($name, $info) = each %$res) { 3272 while (my ($name, $info) = each %$res) {
2871 my $meta = $enc->encode ({ 3273 if (defined $info->{type}) {
2872 name => $name,
2873 copyright => $info->{copyright}, #TODO#
2874 });
2875
2876 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3274 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3275 my $data;
2877 3276
2878 if ($info->{type} & 1) { 3277 if ($info->{type} & 1) {
2879 # prepend meta info 3278 # prepend meta info
2880 3279
3280 my $meta = $enc->encode ({
3281 name => $name,
3282 %{ $info->{meta} || {} },
3283 });
3284
2881 my $data = pack "(w/a*)*", $meta, $info->{data}; 3285 $data = pack "(w/a*)*", $meta, $info->{data};
2882 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata 3286 } else {
3287 $data = $info->{data};
3288 }
2883 3289
2884 cf::face::set_data $idx, 0, $data, $chk; 3290 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3291 cf::face::set_type $idx, $info->{type};
2885 } else { 3292 } else {
2886 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3293 $RESOURCE{$name} = $info;
2887 } 3294 }
2888 3295
2889 cf::face::set_type $idx, $info->{type};
2890
2891 cf::cede_to_tick; 3296 cf::cede_to_tick;
2892 } 3297 }
2893 } 3298 }
2894 3299
3300 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3301
2895 1 3302 1
2896} 3303}
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});
2897 3324
2898register_exticmd fx_want => sub { 3325register_exticmd fx_want => sub {
2899 my ($ns, $want) = @_; 3326 my ($ns, $want) = @_;
2900 3327
2901 while (my ($k, $v) = each %$want) { 3328 while (my ($k, $v) = each %$want) {
2902 $ns->fx_want ($k, $v); 3329 $ns->fx_want ($k, $v);
2903 } 3330 }
2904}; 3331};
2905 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
2906sub 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
2907 load_resource_file "$MAPDIR/regions" 3348 load_resource_file "$MAPDIR/regions"
2908 or die "unable to load regions file\n"; 3349 or die "unable to load regions file\n";
2909 3350
2910 for (cf::region::list) { 3351 for (cf::region::list) {
2911 $_->{match} = qr/$_->{match}/ 3352 $_->{match} = qr/$_->{match}/
… …
2919} 3360}
2920 3361
2921sub reload_archetypes { 3362sub reload_archetypes {
2922 load_resource_file "$DATADIR/archetypes" 3363 load_resource_file "$DATADIR/archetypes"
2923 or die "unable to load archetypes\n"; 3364 or die "unable to load archetypes\n";
2924 #d# NEED to laod twice to resolve forward references
2925 # this really needs to be done in an extra post-pass
2926 # (which needs to be synchronous, so solve it differently)
2927 load_resource_file "$DATADIR/archetypes"
2928 or die "unable to load archetypes\n";
2929} 3365}
2930 3366
2931sub reload_treasures { 3367sub reload_treasures {
2932 load_resource_file "$DATADIR/treasures" 3368 load_resource_file "$DATADIR/treasures"
2933 or die "unable to load treasurelists\n"; 3369 or die "unable to load treasurelists\n";
2934} 3370}
2935 3371
2936sub reload_resources { 3372sub reload_resources {
2937 warn "reloading resource files...\n"; 3373 warn "reloading resource files...\n";
2938 3374
3375 reload_facedata;
3376 reload_archetypes;
2939 reload_regions; 3377 reload_regions;
2940 reload_facedata;
2941 #reload_archetypes;#d#
2942 reload_archetypes;
2943 reload_treasures; 3378 reload_treasures;
2944 3379
2945 warn "finished reloading resource files\n"; 3380 warn "finished reloading resource files\n";
2946} 3381}
2947 3382
2948sub init { 3383sub reload_config {
2949 reload_resources;
2950}
2951
2952sub cfg_load {
2953 open my $fh, "<:utf8", "$CONFDIR/config" 3384 open my $fh, "<:utf8", "$CONFDIR/config"
2954 or return; 3385 or return;
2955 3386
2956 local $/; 3387 local $/;
2957 *CFG = YAML::Syck::Load <$fh>; 3388 *CFG = YAML::Load <$fh>;
2958 3389
2959 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3390 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2960 3391
2961 $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};
2962 $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};
… …
2968 }; 3399 };
2969 warn $@ if $@; 3400 warn $@ if $@;
2970 } 3401 }
2971} 3402}
2972 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
2973sub 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
2974 # we must not ever block the main coroutine 3447 # we must not ever block the main coroutine
2975 local $Coro::idle = sub { 3448 local $Coro::idle = sub {
2976 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#
2977 (async { 3450 (async {
2978 Event::one_event; 3451 $Coro::current->{desc} = "IDLE BUG HANDLER";
3452 EV::loop EV::LOOP_ONESHOT;
2979 })->prio (Coro::PRIO_MAX); 3453 })->prio (Coro::PRIO_MAX);
2980 }; 3454 };
2981 3455
2982 cfg_load; 3456 evthread_start IO::AIO::poll_fileno;
3457
3458 cf::sync_job {
3459 reload_resources;
3460 reload_config;
2983 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
2984 load_extensions; 3474 load_extensions;
2985 3475
2986 $TICK_WATCHER->start; 3476 utime time, time, $RUNTIMEFILE;
2987 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;
2988} 3486}
2989 3487
2990############################################################################# 3488#############################################################################
2991# initialisation and cleanup 3489# initialisation and cleanup
2992 3490
2993# install some emergency cleanup handlers 3491# install some emergency cleanup handlers
2994BEGIN { 3492BEGIN {
3493 our %SIGWATCHER = ();
2995 for my $signal (qw(INT HUP TERM)) { 3494 for my $signal (qw(INT HUP TERM)) {
2996 Event->signal ( 3495 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2997 reentrant => 0,
2998 data => WF_AUTOCANCEL,
2999 signal => $signal,
3000 prio => 0,
3001 cb => sub {
3002 cf::cleanup "SIG$signal"; 3496 cf::cleanup "SIG$signal";
3003 },
3004 ); 3497 };
3005 } 3498 }
3006} 3499}
3007 3500
3008sub write_runtime { 3501sub write_runtime_sync {
3009 my $runtime = "$LOCALDIR/runtime";
3010
3011 # first touch the runtime file to show we are still running: 3502 # first touch the runtime file to show we are still running:
3012 # the fsync below can take a very very long time. 3503 # the fsync below can take a very very long time.
3013 3504
3014 IO::AIO::aio_utime $runtime, undef, undef; 3505 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3015 3506
3016 my $guard = cf::lock_acquire "write_runtime"; 3507 my $guard = cf::lock_acquire "write_runtime";
3017 3508
3018 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3509 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3019 or return; 3510 or return;
3020 3511
3021 my $value = $cf::RUNTIME + 90 + 10; 3512 my $value = $cf::RUNTIME + 90 + 10;
3022 # 10 is the runtime save interval, for a monotonic clock 3513 # 10 is the runtime save interval, for a monotonic clock
3023 # 60 allows for the watchdog to kill the server. 3514 # 60 allows for the watchdog to kill the server.
… …
3033 aio_utime $fh, undef, undef; 3524 aio_utime $fh, undef, undef;
3034 3525
3035 close $fh 3526 close $fh
3036 or return; 3527 or return;
3037 3528
3038 aio_rename "$runtime~", $runtime 3529 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3039 and return; 3530 and return;
3040 3531
3041 warn "runtime file written.\n"; 3532 warn "runtime file written.\n";
3042 3533
3043 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 };
3044} 3585}
3045 3586
3046sub emergency_save() { 3587sub emergency_save() {
3047 my $freeze_guard = cf::freeze_mainloop; 3588 my $freeze_guard = cf::freeze_mainloop;
3048 3589
3049 warn "enter emergency perl save\n"; 3590 warn "emergency_perl_save: enter\n";
3050 3591
3051 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
3052 # use a peculiar iteration method to avoid tripping on perl 3598 # use a peculiar iteration method to avoid tripping on perl
3053 # refcount bugs in for. also avoids problems with players 3599 # refcount bugs in for. also avoids problems with players
3054 # and maps saved/destroyed asynchronously. 3600 # and maps saved/destroyed asynchronously.
3055 warn "begin emergency player save\n"; 3601 warn "emergency_perl_save: begin player save\n";
3056 for my $login (keys %cf::PLAYER) { 3602 for my $login (keys %cf::PLAYER) {
3057 my $pl = $cf::PLAYER{$login} or next; 3603 my $pl = $cf::PLAYER{$login} or next;
3058 $pl->valid or next; 3604 $pl->valid or next;
3605 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3059 $pl->save; 3606 $pl->save;
3060 } 3607 }
3061 warn "end emergency player save\n"; 3608 warn "emergency_perl_save: end player save\n";
3062 3609
3063 warn "begin emergency map save\n"; 3610 warn "emergency_perl_save: begin map save\n";
3064 for my $path (keys %cf::MAP) { 3611 for my $path (keys %cf::MAP) {
3065 my $map = $cf::MAP{$path} or next; 3612 my $map = $cf::MAP{$path} or next;
3066 $map->valid or next; 3613 $map->valid or next;
3067 $map->save; 3614 $map->save;
3068 } 3615 }
3069 warn "end emergency map save\n"; 3616 warn "emergency_perl_save: end map save\n";
3070 3617
3071 warn "begin emergency database checkpoint\n"; 3618 warn "emergency_perl_save: begin database checkpoint\n";
3072 BDB::db_env_txn_checkpoint $DB_ENV; 3619 BDB::db_env_txn_checkpoint $DB_ENV;
3073 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";
3074 }; 3625 };
3075 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
3076 warn "leave emergency perl save\n"; 3632 warn "emergency_perl_save: leave\n";
3077} 3633}
3078 3634
3079sub post_cleanup { 3635sub post_cleanup {
3080 my ($make_core) = @_; 3636 my ($make_core) = @_;
3081 3637
3082 warn Carp::longmess "post_cleanup backtrace" 3638 warn Carp::longmess "post_cleanup backtrace"
3083 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#
3084} 3669}
3085 3670
3086sub do_reload_perl() { 3671sub do_reload_perl() {
3087 # can/must only be called in main 3672 # can/must only be called in main
3088 if ($Coro::current != $Coro::main) { 3673 if ($Coro::current != $Coro::main) {
3089 warn "can only reload from main coroutine"; 3674 warn "can only reload from main coroutine";
3090 return; 3675 return;
3091 } 3676 }
3092 3677
3678 return if $RELOAD++;
3679
3680 my $t1 = EV::time;
3681
3682 while ($RELOAD) {
3093 warn "reloading..."; 3683 warn "reloading...";
3094 3684
3095 warn "entering sync_job"; 3685 warn "entering sync_job";
3096 3686
3097 cf::sync_job { 3687 cf::sync_job {
3098 cf::write_runtime; # external watchdog should not bark 3688 cf::write_runtime_sync; # external watchdog should not bark
3099 cf::emergency_save; 3689 cf::emergency_save;
3100 cf::write_runtime; # external watchdog should not bark 3690 cf::write_runtime_sync; # external watchdog should not bark
3101 3691
3102 warn "syncing database to disk"; 3692 warn "syncing database to disk";
3103 BDB::db_env_txn_checkpoint $DB_ENV; 3693 BDB::db_env_txn_checkpoint $DB_ENV;
3104 3694
3105 # 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
3106 3696
3107 warn "cancelling all WF_AUTOCANCEL watchers";
3108 for (Event::all_watchers) {
3109 $_->cancel if $_->data & WF_AUTOCANCEL;
3110 }
3111
3112 warn "flushing outstanding aio requests"; 3697 warn "flushing outstanding aio requests";
3113 for (;;) {
3114 BDB::flush;
3115 IO::AIO::flush;
3116 Coro::cede;
3117 last unless IO::AIO::nreqs || BDB::nreqs; 3698 while (IO::AIO::nreqs || BDB::nreqs) {
3118 warn "iterate..."; 3699 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3119 }
3120
3121 ++$RELOAD;
3122
3123 warn "cancelling all extension coros";
3124 $_->cancel for values %EXT_CORO;
3125 %EXT_CORO = ();
3126
3127 warn "removing commands";
3128 %COMMAND = ();
3129
3130 warn "removing ext/exti commands";
3131 %EXTCMD = ();
3132 %EXTICMD = ();
3133
3134 warn "unloading/nuking all extensions";
3135 for my $pkg (@EXTS) {
3136 warn "... unloading $pkg";
3137
3138 if (my $cb = $pkg->can ("unload")) {
3139 eval {
3140 $cb->($pkg);
3141 1
3142 } or warn "$pkg unloaded, but with errors: $@";
3143 } 3700 }
3144 3701
3145 warn "... nuking $pkg"; 3702 warn "cancelling all extension coros";
3146 Symbol::delete_package $pkg; 3703 $_->cancel for values %EXT_CORO;
3147 } 3704 %EXT_CORO = ();
3148 3705
3149 warn "unloading all perl modules loaded from $LIBDIR"; 3706 warn "removing commands";
3150 while (my ($k, $v) = each %INC) { 3707 %COMMAND = ();
3151 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3152 3708
3709 warn "removing ext/exti commands";
3710 %EXTCMD = ();
3711 %EXTICMD = ();
3712
3713 warn "unloading/nuking all extensions";
3714 for my $pkg (@EXTS) {
3153 warn "... unloading $k"; 3715 warn "... unloading $pkg";
3154 delete $INC{$k};
3155 3716
3156 $k =~ s/\.pm$//;
3157 $k =~ s/\//::/g;
3158
3159 if (my $cb = $k->can ("unload_module")) { 3717 if (my $cb = $pkg->can ("unload")) {
3718 eval {
3160 $cb->(); 3719 $cb->($pkg);
3720 1
3721 } or warn "$pkg unloaded, but with errors: $@";
3722 }
3723
3724 warn "... clearing $pkg";
3725 clear_package $pkg;
3161 } 3726 }
3162 3727
3163 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;
3164 } 3743 }
3165 3744
3166 warn "getting rid of safe::, as good as possible"; 3745 warn "getting rid of safe::, as good as possible";
3167 Symbol::delete_package "safe::$_" 3746 clear_package "safe::$_"
3168 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);
3169 3748
3170 warn "unloading cf.pm \"a bit\""; 3749 warn "unloading cf.pm \"a bit\"";
3171 delete $INC{"cf.pm"}; 3750 delete $INC{"cf.pm"};
3172 delete $INC{"cf/pod.pm"}; 3751 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3173 3752
3174 # don't, removes xs symbols, too, 3753 # don't, removes xs symbols, too,
3175 # and global variables created in xs 3754 # and global variables created in xs
3176 #Symbol::delete_package __PACKAGE__; 3755 #clear_package __PACKAGE__;
3177 3756
3178 warn "unload completed, starting to reload now"; 3757 warn "unload completed, starting to reload now";
3179 3758
3180 warn "reloading cf.pm"; 3759 warn "reloading cf.pm";
3181 require cf; 3760 require cf;
3182 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3761 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3183 3762
3184 warn "loading config and database again"; 3763 warn "loading config and database again";
3185 cf::cfg_load; 3764 cf::reload_config;
3186 3765
3187 warn "loading extensions"; 3766 warn "loading extensions";
3188 cf::load_extensions; 3767 cf::load_extensions;
3189 3768
3769 if ($REATTACH_ON_RELOAD) {
3190 warn "reattaching attachments to objects/players"; 3770 warn "reattaching attachments to objects/players";
3191 _global_reattach; # objects, sockets 3771 _global_reattach; # objects, sockets
3192 warn "reattaching attachments to maps"; 3772 warn "reattaching attachments to maps";
3193 reattach $_ for values %MAP; 3773 reattach $_ for values %MAP;
3194 warn "reattaching attachments to players"; 3774 warn "reattaching attachments to players";
3195 reattach $_ for values %PLAYER; 3775 reattach $_ for values %PLAYER;
3776 }
3196 3777
3778 warn "running post_init jobs";
3779 (pop @POST_INIT)->(1) while @POST_INIT;
3780
3197 warn "leaving sync_job"; 3781 warn "leaving sync_job";
3198 3782
3199 1 3783 1
3200 } or do { 3784 } or do {
3201 warn $@; 3785 warn $@;
3202 warn "error while reloading, exiting."; 3786 cf::cleanup "error while reloading, exiting.";
3203 exit 1;
3204 }; 3787 };
3205 3788
3206 warn "reloaded"; 3789 warn "reloaded";
3790 --$RELOAD;
3791 }
3792
3793 $t1 = EV::time - $t1;
3794 warn "reload completed in ${t1}s\n";
3207}; 3795};
3208 3796
3209our $RELOAD_WATCHER; # used only during reload 3797our $RELOAD_WATCHER; # used only during reload
3210 3798
3211sub reload_perl() { 3799sub reload_perl() {
3212 # doing reload synchronously and two reloads happen back-to-back, 3800 # doing reload synchronously and two reloads happen back-to-back,
3213 # coro crashes during coro_state_free->destroy here. 3801 # coro crashes during coro_state_free->destroy here.
3214 3802
3215 $RELOAD_WATCHER ||= Event->timer ( 3803 $RELOAD_WATCHER ||= cf::async {
3216 reentrant => 0, 3804 Coro::AIO::aio_wait cache_extensions;
3217 after => 0, 3805
3218 data => WF_AUTOCANCEL, 3806 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3219 cb => sub {
3220 do_reload_perl; 3807 do_reload_perl;
3221 undef $RELOAD_WATCHER; 3808 undef $RELOAD_WATCHER;
3222 }, 3809 };
3223 ); 3810 };
3224} 3811}
3225 3812
3226register_command "reload" => sub { 3813register_command "reload" => sub {
3227 my ($who, $arg) = @_; 3814 my ($who, $arg) = @_;
3228 3815
3229 if ($who->flag (FLAG_WIZ)) { 3816 if ($who->flag (FLAG_WIZ)) {
3230 $who->message ("reloading server."); 3817 $who->message ("reloading server.");
3818 async {
3819 $Coro::current->{desc} = "perl_reload";
3231 async { reload_perl }; 3820 reload_perl;
3821 };
3232 } 3822 }
3233}; 3823};
3234 3824
3235unshift @INC, $LIBDIR; 3825unshift @INC, $LIBDIR;
3236 3826
… …
3238 3828
3239our @WAIT_FOR_TICK; 3829our @WAIT_FOR_TICK;
3240our @WAIT_FOR_TICK_BEGIN; 3830our @WAIT_FOR_TICK_BEGIN;
3241 3831
3242sub wait_for_tick { 3832sub wait_for_tick {
3243 return unless $TICK_WATCHER->is_active;
3244 return if $Coro::current == $Coro::main; 3833 return if tick_inhibit || $Coro::current == $Coro::main;
3245 3834
3246 my $signal = new Coro::Signal; 3835 my $signal = new Coro::Signal;
3247 push @WAIT_FOR_TICK, $signal; 3836 push @WAIT_FOR_TICK, $signal;
3248 $signal->wait; 3837 $signal->wait;
3249} 3838}
3250 3839
3251sub wait_for_tick_begin { 3840sub wait_for_tick_begin {
3252 return unless $TICK_WATCHER->is_active;
3253 return if $Coro::current == $Coro::main; 3841 return if tick_inhibit || $Coro::current == $Coro::main;
3254 3842
3255 my $signal = new Coro::Signal; 3843 my $signal = new Coro::Signal;
3256 push @WAIT_FOR_TICK_BEGIN, $signal; 3844 push @WAIT_FOR_TICK_BEGIN, $signal;
3257 $signal->wait; 3845 $signal->wait;
3258} 3846}
3259 3847
3260 my $min = 1e6;#d# 3848sub tick {
3261 my $avg = 10;
3262$TICK_WATCHER = Event->timer (
3263 reentrant => 0,
3264 parked => 1,
3265 prio => 0,
3266 at => $NEXT_TICK || $TICK,
3267 data => WF_AUTOCANCEL,
3268 cb => sub {
3269 if ($Coro::current != $Coro::main) { 3849 if ($Coro::current != $Coro::main) {
3270 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"
3271 unless ++$bug_warning > 10; 3851 unless ++$bug_warning > 10;
3272 return; 3852 return;
3273 } 3853 }
3274 3854
3275 $NOW = $tick_start = Event::time;
3276
3277 cf::server_tick; # one server iteration 3855 cf::server_tick; # one server iteration
3278 3856
3279 0 && sync_job {#d# 3857 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3280 for(1..10) { 3858 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3281 my $t = Event::time; 3859 Coro::async_pool {
3282 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3860 $Coro::current->{desc} = "runtime saver";
3283 or die; 3861 write_runtime_sync
3284 3862 or warn "ERROR: unable to write runtime file: $!";
3285 $map->width (50);
3286 $map->height (50);
3287 $map->alloc;
3288 $map->_load_objects ("/tmp/x.map", 1);
3289 my $t = Event::time - $t;
3290
3291 #next unless $t < 0.0013;#d#
3292 if ($t < $min) {
3293 $min = $t;
3294 }
3295 $avg = $avg * 0.99 + $t * 0.01;
3296 }
3297 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3298 exit 0;
3299 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3300 }; 3863 };
3864 }
3301 3865
3302 $RUNTIME += $TICK;
3303 $NEXT_TICK += $TICK;
3304
3305 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3306 $NEXT_RUNTIME_WRITE = $NOW + 10;
3307 Coro::async_pool {
3308 write_runtime
3309 or warn "ERROR: unable to write runtime file: $!";
3310 };
3311 }
3312
3313# my $AFTER = Event::time;
3314# warn $AFTER - $NOW;#d#
3315
3316 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3866 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3317 $sig->send; 3867 $sig->send;
3318 } 3868 }
3319 while (my $sig = shift @WAIT_FOR_TICK) { 3869 while (my $sig = shift @WAIT_FOR_TICK) {
3320 $sig->send; 3870 $sig->send;
3321 } 3871 }
3322 3872
3323 $NOW = Event::time; 3873 $LOAD = ($NOW - $TICK_START) / $TICK;
3324
3325 # if we are delayed by four ticks or more, skip them all
3326 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3327
3328 $TICK_WATCHER->at ($NEXT_TICK);
3329 $TICK_WATCHER->start;
3330
3331 $LOAD = ($NOW - $tick_start) / $TICK;
3332 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3874 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3333 3875
3334 _post_tick; 3876 if (0) {
3335 3877 if ($NEXT_TICK) {
3336 3878 my $jitter = $TICK_START - $NEXT_TICK;
3879 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3880 warn "jitter $JITTER\n";#d#
3881 }
3337 }, 3882 }
3338); 3883}
3339 3884
3340{ 3885{
3341 BDB::max_poll_time $TICK * 0.1; 3886 # configure BDB
3342 $BDB_POLL_WATCHER = Event->io ( 3887
3343 reentrant => 0,
3344 fd => BDB::poll_fileno,
3345 poll => 'r',
3346 prio => 0,
3347 data => WF_AUTOCANCEL,
3348 cb => \&BDB::poll_cb,
3349 );
3350 BDB::min_parallel 8; 3888 BDB::min_parallel 8;
3351 3889 BDB::max_poll_reqs $TICK * 0.1;
3352 BDB::set_sync_prepare { 3890 $AnyEvent::BDB::WATCHER->priority (1);
3353 my $status;
3354 my $current = $Coro::current;
3355 (
3356 sub {
3357 $status = $!;
3358 $current->ready; undef $current;
3359 },
3360 sub {
3361 Coro::schedule while defined $current;
3362 $! = $status;
3363 },
3364 )
3365 };
3366 3891
3367 unless ($DB_ENV) { 3892 unless ($DB_ENV) {
3368 $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);
3369 3899
3370 cf::sync_job { 3900 cf::sync_job {
3371 eval { 3901 eval {
3372 BDB::db_env_open 3902 BDB::db_env_open
3373 $DB_ENV, 3903 $DB_ENV,
… …
3375 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
3376 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3906 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3377 0666; 3907 0666;
3378 3908
3379 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3909 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3380
3381 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3382 $DB_ENV->set_lk_detect;
3383 }; 3910 };
3384 3911
3385 cf::cleanup "db_env_open(db): $@" if $@; 3912 cf::cleanup "db_env_open(db): $@" if $@;
3386 }; 3913 };
3387 } 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 };
3388} 3925}
3389 3926
3390{ 3927{
3928 # configure IO::AIO
3929
3391 IO::AIO::min_parallel 8; 3930 IO::AIO::min_parallel 8;
3392
3393 undef $Coro::AIO::WATCHER;
3394 IO::AIO::max_poll_time $TICK * 0.1; 3931 IO::AIO::max_poll_time $TICK * 0.1;
3395 $AIO_POLL_WATCHER = Event->io ( 3932 undef $AnyEvent::AIO::WATCHER;
3396 reentrant => 0,
3397 data => WF_AUTOCANCEL,
3398 fd => IO::AIO::poll_fileno,
3399 poll => 'r',
3400 prio => 6,
3401 cb => \&IO::AIO::poll_cb,
3402 );
3403} 3933}
3404 3934
3405my $_log_backtrace; 3935my $_log_backtrace;
3406 3936
3407sub _log_backtrace { 3937sub _log_backtrace {
… …
3410 $msg =~ s/\n//; 3940 $msg =~ s/\n//;
3411 3941
3412 # limit the # of concurrent backtraces 3942 # limit the # of concurrent backtraces
3413 if ($_log_backtrace < 2) { 3943 if ($_log_backtrace < 2) {
3414 ++$_log_backtrace; 3944 ++$_log_backtrace;
3945 my $perl_bt = Carp::longmess $msg;
3415 async { 3946 async {
3947 $Coro::current->{desc} = "abt $msg";
3948
3416 my @bt = fork_call { 3949 my @bt = fork_call {
3417 @addr = map { sprintf "%x", $_ } @addr; 3950 @addr = map { sprintf "%x", $_ } @addr;
3418 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3951 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3419 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 |"
3420 or die "addr2line: $!"; 3953 or die "addr2line: $!";
… …
3428 } 3961 }
3429 3962
3430 @funcs 3963 @funcs
3431 }; 3964 };
3432 3965
3433 LOG llevInfo, "[ABT] $msg\n"; 3966 LOG llevInfo, "[ABT] $perl_bt\n";
3967 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3434 LOG llevInfo, "[ABT] $_\n" for @bt; 3968 LOG llevInfo, "[ABT] $_\n" for @bt;
3435 --$_log_backtrace; 3969 --$_log_backtrace;
3436 }; 3970 };
3437 } else { 3971 } else {
3438 LOG llevInfo, "[ABT] $msg\n"; 3972 LOG llevInfo, "[ABT] $msg\n";
3439 LOG llevInfo, "[ABT] [suppressed]\n"; 3973 LOG llevInfo, "[ABT] [suppressed]\n";
3440 } 3974 }
3441} 3975}
3442 3976
3443# load additional modules 3977# load additional modules
3444use cf::pod; 3978require "cf/$_.pm" for @EXTRA_MODULES;
3445 3979
3446END { cf::emergency_save } 3980END { cf::emergency_save }
3447 3981
34481 39821
3449 3983

Diff Legend

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