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

Diff Legend

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