ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/ext/login.ext
(Generate patch)

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.85 by root, Mon May 5 16:02:20 2008 UTC vs.
Revision 1.94 by root, Sat Dec 13 21:46:12 2008 UTC

… …
13} 13}
14 14
15sub query { 15sub query {
16 my ($ns, $flags, $text) = @_; 16 my ($ns, $flags, $text) = @_;
17 17
18 my $current = $Coro::current; 18 $ns->query ($flags, $text, Coro::rouse_cb);
19 $ns->query ($flags, $text, sub { $current->ready; $current = $_[0] }); 19 Coro::rouse_wait
20 Coro::schedule while ref $current;
21
22 $current
23} 20}
24 21
25sub can_cleanup { 22sub can_cleanup {
26 my ($pl, $mtime) = @_; 23 my ($pl, $mtime) = @_;
27 24
… …
73} 70}
74 71
75sub enter_map { 72sub enter_map {
76 my ($pl) = @_; 73 my ($pl) = @_;
77 74
75 warn $pl->ob->name, ": enter map 1\n";#d#
78 my $ob = $pl->ob; 76 my $ob = $pl->ob;
79 77
80 my ($map, $x, $y) 78 my ($map, $x, $y)
81 = $ob->{_link_pos} 79 = $ob->{_link_pos}
82 ? @{delete $ob->{_link_pos}} 80 ? @{delete $ob->{_link_pos}}
83 : ($pl->maplevel, $ob->x, $ob->y); 81 : ($pl->maplevel, $ob->x, $ob->y);
84 82
83 warn $pl->ob->name, ": enter map 2\n";#d#
85 $ob->enter_link; 84 $ob->enter_link;
85 warn $pl->ob->name, ": enter map 3\n";#d#
86 86
87 my $m = cf::map::find $map; 87 my $m = cf::map::find $map;
88 my $time = delete $pl->{unclean_save}; 88 my $time = delete $pl->{unclean_save};
89 warn $pl->ob->name, ": enter map 4\n";#d#
89 90
90 if ($time && $m) { 91 if ($time && $m) {
91 if ($time < $m->{instantiate_time}) { 92 if ($time < $m->{instantiate_time}) {
92 # the map was reset in the meantime 93 # the map was reset in the meantime
93 my $age = $cf::RUNTIME - $time; 94 my $age = $cf::RUNTIME - $time;
… …
103 cf::NDI_RED 104 cf::NDI_RED
104 ); 105 );
105 # kill them. 106 # kill them.
106 # reminds me of the famous badness 10000 syndrome... 107 # reminds me of the famous badness 10000 syndrome...
107 $ob->stats->hp (-10000); #] if they survive this they deserved to live 108 $ob->stats->hp (-10000); #] if they survive this they deserved to live
108 my $killer = cf::arch::get "killer_login"; 109 my $killer = cf::arch::get "killer_login"; $pl->killer ($killer); $killer->destroy;
109 $pl->killer ($killer);
110 $killer->destroy;
111 } else { 110 } else {
112 ($map, $x, $y) = $pl->savebed; 111 ($map, $x, $y) = $pl->savebed;
113 112
114 $ob->message ( 113 $ob->message (
115 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " 114 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
… …
128 cf::NDI_RED 127 cf::NDI_RED
129 ); 128 );
130 } 129 }
131 } 130 }
132 131
132 warn $pl->ob->name, ": enter map 5\n";#d#
133 $ob->goto ($map, $x, $y); 133 #$ob->goto ($map, $x, $y);
134 $ob->goto ($map, $x, $y, sub {
135 warn $pl->ob->name, ": enter map check\n";#d#
136 $_[0]
137 }, sub {
138 warn $pl->ob->name, ": enter map done\n";#d#
139 });
140 warn $pl->ob->name, ": enter map 6\n";#d#
141
134} 142}
135 143
136# delete a player directory, be non-blocking AND synchronous... 144# delete a player directory, be non-blocking AND synchronous...
137# (thats hard, so we crap out and fork). 145# (thats hard, so we crap out and fork).
138sub nuke_playerdir { 146sub nuke_playerdir {
… …
211 cf::NDI_BLUE 219 cf::NDI_BLUE
212 ); 220 );
213 221
214 # read username 222 # read username
215 while () { 223 while () {
216 $user = query $ns, 0, "What is your name?\n:"; 224 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
217 225
218 if ($cf::LOGIN_LOCK{$user}) { 226 if ($cf::LOGIN_LOCK{$user}) {
219 $ns->send_drawinfo ( 227 $ns->send_drawinfo (
220 "That username is currently used in another login session. " 228 "That username is currently used in another login session. "
221 . "Chose another, or wait till the other session has ended.", 229 . "Chose another, or wait till the other session has ended.",
222 cf::NDI_RED 230 cf::NDI_RED
223 ); 231 );
224 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}\z/) { 232 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {
225 last; 233 last;
226 } else { 234 } else {
227 $ns->send_drawinfo ( 235 $ns->send_drawinfo (
228 "Your username contains illegal characters " 236 "Your username contains illegal characters "
229 . "(only a-z, A-Z and 0-9 are allowed), " 237 . "(only a-z, A-Z and 0-9 are allowed), "
230 . "or is not between 3 and 18 characters in length.", 238 . "or is not between 3 and 20 characters in length.",
231 cf::NDI_RED 239 cf::NDI_RED
232 ); 240 );
233 } 241 }
234 Coro::Timer::sleep 0.4; 242 Coro::Timer::sleep 0.4;
235 } 243 }
… …
281 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 289 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
282 nuke_str $pass; 290 nuke_str $pass;
283 # password matches, wonderful 291 # password matches, wonderful
284 my $pl = cf::player::find $user or next; 292 my $pl = cf::player::find $user or next;
285 $pl->connect ($ns); 293 $pl->connect ($ns);
294 $pl->ob->flag (cf::FLAG_DEBUG, 1);#d# temp
286 enter_map $pl; 295 enter_map $pl;
287 last; 296 last;
288 } elsif (can_cleanup $pl, $mtime) { 297 } elsif (can_cleanup $pl, $mtime) {
289 Coro::Timer::sleep 1; 298 Coro::Timer::sleep 1;
290 299
… …
379 } 388 }
380 } else { 389 } else {
381 $ob->roll_stats; 390 $ob->roll_stats;
382 } 391 }
383 392
384 Coro::Timer::sleep 0.2; 393 Coro::Timer::sleep 0.05;
385 } 394 }
386 395
387 $ob->set_animation (2); 396 $ob->set_animation (2);
388 $ob->add_statbonus; 397 $ob->add_statbonus;
389 398
… …
420 } 429 }
421 Coro::Timer::sleep 0.2; 430 Coro::Timer::sleep 0.2;
422 } 431 }
423 432
424 $ob->reply (undef, "Welcome to Deliantra!"); 433 $ob->reply (undef, "Welcome to Deliantra!");
434
435 # XXX: Workaround for delayed client ext protocol handshake
436 $pl->esrv_new_player;
425 437
426 delete $pl->{deny_save}; 438 delete $pl->{deny_save};
427 439
428 last; 440 last;
429 } 441 }
… …
470 482
471 # update respawn position 483 # update respawn position
472 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 484 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
473 cf::async { $pl->save }; 485 cf::async { $pl->save };
474 486
475 my $killer = cf::arch::get "killer_logout"; 487 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
476 $pl->killer ($killer);
477 $killer->destroy;
478 $ob->check_score; 488 $ob->check_score;
479 489
480 $ob->reply (undef, "In the future, you will wake up here when you die."); 490 $ob->reply (undef, "In the future, you will wake up here when you die.");
481 491
482 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 492 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
… …
510 unless safe_spot $pl; 520 unless safe_spot $pl;
511 } 521 }
512 }, 522 },
513); 523);
514 524
515#############################################################################
516 525
517our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
518our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
519
520our $SCHEDULER = cf::async_ext {
521 $Coro::current->{desc} = "player scheduler";
522
523 while () {
524 Coro::EV::timer_once $SCHEDULE_INTERVAL;
525
526 # this weird form of iteration over values is used because
527 # the hash changes underneath us frequently, and for
528 # keeps a direct reference to the value without (in 5.8 perls)
529 # keeping a reference, so this is prone to crashes or worse.
530 my @players = keys %cf::PLAYER;
531 for (@players) {
532 my $pl = $cf::PLAYER{$_}
533 or next;
534 $pl->valid or next;
535
536 eval {
537 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
538 $pl->save;
539
540 unless ($pl->active || $pl->ns) {
541 # check refcounts, this is tricky and needs to be adjusted to fit server internals
542 my $ob = $pl->ob;
543
544 my $pl_ref = $pl->refcnt_cnt;
545 my $ob_ref = $ob->refcnt_cnt;
546
547 ## pl_ref == $pl + ob->contr + %cf::PLAYER
548 ## ob_ref == $ob + pl->observe + simply being an object
549 if ($pl_ref == 3 && $ob_ref == 3) {
550 warn "player-scheduler destroy ", $ob->name;#d#
551
552 # remove from sight and get fresh "copies"
553 $pl = delete $cf::PLAYER{$ob->name};
554 $ob = $pl->ob;
555
556 $pl->destroy; # destroys $ob
557 } else {
558 my $a_ = $pl->refcnt;#d#
559 my $b_ = $ob->refcnt;#d#
560
561 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref/3 ob $ob_ref/3 (C pl $a_/1 ob $b_/2)\n";#d#
562 }
563 }
564 }
565 };
566 warn $@ if $@;
567 cf::cede_to_tick;
568 };
569 }
570};
571
572$SCHEDULER->prio (1);
573

Diff Legend

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