锘??xml version="1.0" encoding="utf-8" standalone="yes"?> 2銆佸緩绔嬫湰鍦板伐浣滃垎鏀紝寮濮嬪伐浣滐細 淇敼鍐呭鐩存帴commit錛屽姞涓?a寮澶翠互鐪佺暐git add鎿嶄綔錛? 3銆佹彁浜ゅ洖svn鐨勮繃紼嬶細 鍦ㄤ粖澶╁伐浣滀腑錛屾垜鎻愪氦鍥瀞vn鐨勬柟寮忔槸錛? 緇撴灉svn rebase鏃跺湪master鍒嗘敮涓婁駭鐢熶簡涓涓柊鐨刵ode錛岃繖鏍穖erge鏃跺氨涓嶈兘蹇熷悎騫訛紝鍑虹幇浜嗗啿紿侊紝淇鍚庯紝鍦╠commit鏃跺嚭閿欙紝鍑虹幇N涓绔嬭妭鐐廣傚洜涓轟笉鐔熸倝錛屽氨checkout鍑簑ork鍒嗘敮錛岃繘琛屼簡dcommit錛岀劧鍚庨噸鏂扮敓鎴愪竴嬈it搴撱?br> 浣嗘垜鍦ㄦ墽琛実it svn rebase鏃訛紝鍙堝嚭鐜板啿紿侊紝榪欎釜鏃跺欙紝鍙渶瑕佹墜宸ュ悎騫舵帀鍐茬獊錛屽茍閲嶆柊add涓涓嬶細 鐒跺悗錛屽啀鎵ц錛? 濡傛灉鎶ュ憡璇存病鏈変慨鏀瑰唴瀹癸紝鍒欐崲鎴愭墽琛岋細 瀹屾垚rebase榪囩▼錛岃繖鏃跺氨鍙互git svn dcommit浜嗐?br>榪欐牱錛屾葷畻瑙e喅浜唖vn鍘嗗彶鍐茬獊闂錛屼笉鐢ㄨ薄鍓嶉潰閭f牱絎ㄧ鐨勯噸鏂癵it-svn clone. 鏌ョ湅/var/log/messages澶ц嚧鎰忔濇槸SEMMIN/SEMMNS涓嶅浜嗐傚ソ鍔烇紝濡備笅鎿嶄綔錛?/p> 淇敼 /etc/sysctl.conf 澧炲姞浠ヤ笅鎸囦護 淇敼 /boot/loader.conf 澧炲姞浠ヤ笅鎸囦護 淇敼/usr/local/psql/data/postgresql.conf 淇敼浠ュ悗闇瑕侀噸鍚? 涓鍒囧畨闈欎簡銆傘傘傛涔夌嫾涓嶅彨浜嗭紝涓栫晫鍜屽鉤浜嗐?/p> sudo emacs /etc/login.conf To initialize the database, run sudo /usr/local/etc/rc.d/postgresql initdb You can then start PostgreSQL by running: sudo /usr/local/etc/rc.d/postgresql start 鐩戝惉鎵鏈夊湴鍧 sudo emacs /usr/local/pgsql/data/postgresql.conf 鍏佽鏌恑p孌佃繛鎺? sudo emacs /usr/local/pgsql/data/pg_hba.conf 淇敼pgsql瀵嗙爜 su 緇欐煇涓猟b澧炲姞榪囩▼璇█ createlang plpgsql yangchao 瀹夎鏈鏂扮増鏈殑git錛屼粠git 1.5.3浠ュ悗鏀寔git-svn錛実it鍜宻vn鐨勯厤鍚堝氨瑕佸熷姪榪欎釜鍔熻兘銆? 瀹夎瀹屾瘯鍚庤鍋氫竴浜涚畝鍗曠殑閰嶇疆銆傛渶鐩存帴鐨勫仛娉曞氨鏄垱寤轟慨鏀箏/.gitconfig銆備笅闈㈡槸鎴戠殑.gitconfig [user]閮ㄥ垎鏍囩ず鍑轟嬌鐢ㄨ呯殑韜喚錛屼綘鎻愪氦鐨勪唬鐮佷細鑷姩寮曠敤榪欎竴韜喚淇℃伅銆俒color]璁劇疆鍛戒護杈撳嚭鐨勯鑹層俒alias]閮ㄥ垎鍙互綆鍖栦竴浜涘父鐢ㄥ懡浠わ紝姣斿鍦ㄨ繖閲屽皢git status綆鍖栦負git st銆?
棣栧厛鐢╣it-svn鏉ュ垵濮嬪寲鏈湴鐨勪唬鐮佸簱(repository) svn-repository-url閮ㄥ垎浣跨敤svn浠g爜搴撶殑url銆傚鏋滆浠巘runk鐩綍鎴栬呮煇涓猙ranch鐩綍閲宑heck out錛岃鎶?s鎹㈡垚-T銆?b絳夐夐」銆傚叿浣撳弬鐪媘an git-svn銆傝繖涓懡浠ゆ椂闂存瘮杈冮暱錛屽洜涓洪渶瑕佸悓姝ユ墍鏈夌殑鎻愪氦鍘嗗彶錛岃繕濂藉彧姝や竴嬈★紝浠ュ悗涓嶄細榪欎箞鎱簡銆傚仛瀹岃繖涓姝ワ紝鍦ㄦ湰鍦板氨鏈変簡涓涓畬鏁寸殑浠g爜搴擄紝鍖呮嫭鎵鏈塩ommit鐨勫巻鍙插拰log錛屽凡緇忓彲浠ュ紑濮嬬敤瀹冩潵榪涜寮鍙戝伐浣滀簡銆?
涓嶈繃錛屽湪寮濮嬪紑鍙戜箣鍓嶏紝鏈濂藉厛鍋氫竴嬈″瀮鍦炬悳闆嗭細 瀹冨浠g爜搴撶殑淇℃伅榪涜鍨冨溇鎼滈泦鍜屽帇緙╋紝鏈鏄庢樉鐨勪綔鐢ㄥ氨鏄噺灝忕鐩樺崰鐢ㄧ┖闂淬傜涓嬈″仛鏁堟灉灝ゅ叾鏄庢樉銆?
浣犲彲浠ユ鏌ヤ竴涓嬩唬鐮佸簱鐨勭姸鎬侊細 鐜板湪搴旇鍦ㄤ竴涓彨鈥漨aster鈥濈殑鍒嗘敮(branch)涓娿?
鐢ㄨ繖涓懡浠ゆ潵鏄劇ず鍑烘墍鏈夌殑鍒嗘敮(branch): master鍓嶆湁涓涓?鍙鳳紝浠h〃浣犵幇鍦ㄦ墍澶勭殑鍒嗘敮錛屽彟澶栬繕鏈変竴涓垎鏀彨trunk錛屽畠鏄竴涓繙紼嬪垎鏀?remote branch)錛屽搴旂殑鏄繙紼媠vn浠g爜搴撱俶aster瀹為檯涓婃槸trunk鐨勪竴涓湰鍦板垎鏀?
鎺ヤ笅鏉ワ紝闇瑕侀厤緗拷鐣ユ枃浠訛紝璁ゞit蹇界暐涓浜涚洰褰曚腑涓嶅笇鏈涘姞鍏ヤ唬鐮佸簱鐨勬枃浠訛紝綾諱技svn propset svn:ignore銆傚叏灞鏈夋晥鐨勫拷鐣ユ枃浠跺垪琛ㄥ彲浠ユ坊鍔犲湪./.git/info/exclude鏂囦歡涓傛瘮濡傛垜闇瑕佸拷鐣ユ墍鏈塿i浜х敓鐨剆wp鏂囦歡錛?pre>.*.swp
瀵逛簬鍜岀洰褰曟湁鍏崇殑蹇界暐鏂囦歡璁劇疆鍙互鍦ㄨ鐩綍涓嬪垱寤?gitignore錛岀劧鍚庡姞鍏ラ渶瑕佸拷鐣ョ殑鍐呭錛屾瘮濡傛垜甯屾湜蹇界暐鏍圭洰褰曚笅鐨刲og,tmp絳夌洰褰曪紝鍙互鐩存帴鍦ㄦ牴鐩綍涓嬬殑.gitignore涓姞鍏? 鍙互寮濮嬪伐浣滀簡銆傜敤git鍚庡紑濮嬪吇鎴愪竴涓柊涔犳儻錛屽氨鏄伐浣滃墠鍏堝垱寤烘柊鍒嗘敮: -b鍚庢槸鍒嗘敮鍚嶏紝鍒涘緩鐨勫悓鏃訛紝浣犺杞埌浜嗘柊鍒嗘敮涓娿傚敖閲忎繚鎸乵aster涓婃病鏈夋湭鎻愪氦鍒皊vn鐨刢ommit錛岃繖鏍烽殢鏃墮兘鍙互寰堝鏄撶殑浜х敓涓涓共鍑鐨勫垎鏀?
鎺ヤ笅鏉ヤ綘鍙互鍐欎唬鐮侊紝淇敼鏂囦歡鎴栬呮坊鍔犳枃浠躲傚鏋滄兂鐪嬬湅淇敼浜嗕粈涔堬紝鍙互鐢細 濡傛灉瀵規煇涓慨鏀逛笉婊℃剰錛屽笇鏈涙仮澶嶅師鐘訛紝鍙互浣跨敤: 鐩稿綋浜巗vn revert
git寮曞叆涓涓儲寮?index)鐨勬蹇碉紝鎻愪氦鍓嶏紝闇瑕佹妸瑕佹彁浜ょ殑鏂囦歡鍔犲叆鍒癵it绱㈠紩(index)涓細 鐒跺悗鎻愪氦 姣忔commit閮芥槸鎻愪氦绱㈠紩(index)涓殑鍐呭銆?
濡傛灉瑕佷竴嬈℃彁浜ゆ墍鏈変慨鏀硅繃鐨勬枃浠訛紝鍙互涓嬈℃ф坊鍔狅紝鐒跺悗鎻愪氦 濡傛灉鍙槸淇敼錛屽茍娌℃湁娣誨姞鏂版枃浠訛紝鍙互鐩存帴鐢ㄤ笅闈㈢殑鍛戒護: 灝嗚淇敼鏂囦歡鍔犲叆绱㈠紩騫舵彁浜わ紝涓嬈″畬鎴愬叏榪囩▼銆?
鍦ㄤ慨鏀瑰姞鍏ユ墍绱㈠紩鍚庯紝濡傛灉鎯崇湅鐪嬬儲寮曞唴瀹逛腑閮芥墍浜嗕粈涔堜慨鏀癸紝鍙互鐢細 閫傚悎鍦ㄦ彁浜ゅ墠鍋氭渶鍚庣殑code review銆?
鏌ョ湅鏈榪戜竴嬈℃彁浜ょ殑鍐呭錛屽彲浠ヤ嬌鐢?pre>git show
淇敼涓殢鏃舵煡鐪嬪綋鍓嶄唬鐮佸簱鐨勭姸鎬侊細 鐩稿綋浜巗vn status
鍒犻櫎鍜岀Щ鍔ㄦ煇涓枃浠訛細 鍦ㄥ畬鎴愪簡鍑犺疆宸ヤ綔鍚庯紝瑕佸皢鏈湴鍐呭鎻愪氦鍒拌繙紼媠vn涓紝鍙互鍏堣褰撳墠鍒嗘敮鍜岃繙紼媠vn鍚屾錛?pre>git svn rebase
鐒跺悗灝嗘墍鏈夊凡緇忓悎騫跺埌master鍒嗘敮鐨勬湰鍦頒慨鏀規彁浜ゅ埌svn 濡傛灉鍦╣it svn rebase鏃跺彂鐢熶唬鐮佸啿紿侊紝闇瑕佸厛鎵嬪姩瑙e喅鍐茬獊錛岀劧鍚庣敤git add灝嗕慨鏀瑰姞鍏ョ儲寮曪紝鐒跺悗緇х畫rebase 鏈鍚庤璇磋繖縐嶅伐浣滄柟寮忕殑緙虹偣銆傝繖涓瘽棰樼◢寰鏉備竴鐐廣?
svn鍜実it鐨勫伐浣滃師鐞嗘瘯绔熶笉鍚岋紝git瀵逛唬鐮佹彁浜ょ殑闈炵嚎鎬х壒鎬у湪svn涓毦浠ュ啀鐜幫紝濡傛灉浣跨敤浜唃it-merge鎴栬単it-pull錛屽啀鎻愪氦鍒皊vn錛岀浉鍏沖垎鏀笂鐨勬彁浜ゅ巻鍙叉湁鍙兘鏃犳硶浣撶幇鍦╯vn涓娿備粠svn鐨勪嬌鐢ㄨ呯殑瑙掑害錛屾棤娉曡鯨鍒繖鏄竴涓彁浜よ繕鏄竴嬈″悎騫訛紝鎵浠ュ湪鍜宻vn鍗忎綔榪囩▼涓紝灝介噺涓嶈浣跨敤merge錛屾垨鑰呰錛屽敖閲忚浠g爜搴撲繚鎸佺嚎鎬с?
鎴戠殑緇忛獙鏄紝濡傛灉涓嶅湪涔巗vn涓槸鍚﹀弽鏄犲嚭鎻愪氦鍘嗗彶錛屼嬌鐢╩erge涔熸棤濡ㄣ傛瘮濡傚畬鎴愬伐浣滃悗錛屽彲浠ュ皢宸ヤ綔鍒嗘敮鍚堝茍鍒頒富鍒嗘敮涓幓錛?pre>git checkout master
git merge new_branch
鍏堢敤checkout鍛戒護鍒囨崲鍥瀖aster鍒嗘敮錛岀劧鍚庡皢鏂板垎鏀腑鍐呭鍚堝茍榪涙潵銆傜劧鍚庡湪master鍒嗘敮涓婂仛git svn rebase鍜宒commit銆備粠svn鏉ョ湅錛岃繖灝辨槸涓涓猚ommit錛宯ew_branch涓婄殑鎻愪氦鍘嗗彶鍦╯vn涓婁綋鐜頒笉鍑烘潵銆?鏈変緥澶栨儏鍐碉紝浠ュ悗鍐嶈璁?銆?
榪樻湁涓涓В鍐沖姙娉曟槸灝介噺淇濇寔git浠g爜搴撶殑綰挎х壒寰併傛瘮濡傚湪new_branch鍒嗘敮涓紝鍏堝拰master鍋歳ebase錛屽啀鍚堝茍鍒癿aster鍒嗘敮涓細 鐒跺悗鍦╩aster涓婂仛dcommit錛屽氨鍙互鍦╯vn浠g爜搴撲腑鐪嬪埌瀹屾暣鐨勬彁浜ゅ巻鍙層?
濡傛灉鐪嬪埌榪欏凡緇忔湁鐐瑰ご鏅曚簡錛屽彲浠ュ共鑴嗕笉綆″畠錛屽氨鎸夌収鍓嶉潰鐨勫仛娉曪紝鐩存帴鍦ㄤ綘鐨勫伐浣滃垎鏀噷dcommit錛岀瓑瀵歸潪綰挎у紑鍙戞湁涓瀹氫簡瑙e啀鏉ョ湅鍚勭鎯呭喌銆?
濂戒簡錛屽熀鏈笂鐭ラ亾榪欎簺灝卞彲浠ュ共媧諱簡銆?/p> 棣栧厛涓嶈鏈夊績鐞嗛殰紕嶏紝閭d簺鍚嶈瘝閮芥槸鍚撳敩浜虹殑銆傛墍璋撶殑鈥滈潪綰挎у紑鍙戔濇棤闈炴槸鎸囧己澶х殑branch鍜宮erge鐨勮兘鍔涳紝鈥滃垎甯冨紡鐗堟湰綆$悊鈥濆氨鏄姣忎漢鑷繁閮芥湁涓濂楁湰鍦扮殑repository錛屼笉瀛樺湪涓涓泦涓殑鐗堟湰鏈嶅姟鍣ㄣ? 緇欐垜甯︽潵鐨勬渶鐩存帴鐨勫ソ澶勬湁錛? 宸ュ叿涔嬫墍浠ュソ錛岄櫎浜嗘柟渚垮ソ鐢紝榪樺湪浜庡畠甯姪騫墮紦鍔變綘鍋氭紜殑浜嬫儏銆傞綣乧heck in鏄竴浠跺緢濂界殑浜嬫儏錛屽ソ澶勬垜涓嶅璇翠簡錛実it灝遍紦鍔變綘棰戠箒check in銆俠ranch涔熸槸涓浠跺ソ浜嬫儏錛屾垜浠ぇ澶氬緢鎬昩ranch鍥犱負瀹冨お楹葷儲浜嗭紝鍘繪帀榪欏眰蹇冪悊鍖呰⒈錛宐ranch鍙互璁╂垜浠殑寮鍙戝伐浣滃緢鏈夋潯渚嬨? 榪樻湁涓浜涘疄鐢ㄧ殑鍔熻兘錛屾瘮濡俠isect,鐢ㄤ簩鍒嗘硶鏉ュ鎵緍egression錛屼綘浠ュ墠鎵嬪姩鍋氳繃榪欑浜嬩箞錛熸垜鍋氳繃銆備互鍚庡鏋滆鍋氬氨涓嶄細鎬曚簡銆傝繕鏈塻tash錛屽仛hot fix闈炲父鏂逛究銆? 濡傛灉姝e湪鐢╯vn錛屽姖鏈嶆墍鏈夊悎浣滃紑鍙戣呬嬌鐢╣it涔嬪墠錛屽彲浠ュ厛鐢╣it-svn錛屽拰svn鏁村悎寰楅潪甯稿ソ銆? 鍒嗗竷寮忕増鏈鐞嗙郴緇熷彇浠i泦涓紡鐗堟湰綆$悊緋葷粺錛屽彧鏄椂闂寸殑闂浜嗐?/p> 榪樻槸璇翠笅鏋舵瀯錛岃繖嬈″幓鍜屽乏鎷夎亰榪囦箣鍚庯紝姣旇緝鏈夋劅瑙︼紝浣嗘槸渚濈劧鏈変笉璧炲悓鐨勫湴鏂癸紝浠栧潥鎸佸崟鏈嶆瀯鏋訛紝鍙槸鍔犲叆澶氱嚎紼嬭璁′嬌鎵胯澆鎻愬崌錛屼笂灞傚掓槸璁″垝鐢ㄤ竴浜涚被浼兼棤緙濆湴鍥捐繖鏍風殑鎶鏈紝浣嗘槸鎴戝鍗曟湇鎵胯澆鑳藉姏鍜屽閿欒兘鍔涗緷鐒惰〃紺烘鐤戙傚鍔犱簡鍑洪敊鍑犵巼鍜岀▼搴忓憳璋冭瘯鏃墮棿錛屽綋鐒惰繖浜涙垜瀵逛粬鏄病搴曟皵浜夎京鐨勶紝浠栧畬鏁寸殑緇忓巻浜嗕袱涓」鐩紝緇忛獙鏄棤娉曟瘮鐨勩?/p> 鎴戜緷鐒跺潥鎸佹垜鐨勫簳灞傚綰跨▼錛岄昏緫鍗曠嚎紼嬫灦鏋勶紝寮鍙戣皟璇曠畝鍗曘傚崟綰跨▼閫昏緫鑳藉姏鐨勪笉瓚蟲垜鐢ㄥ鏈嶆潵鍒嗘暎銆傚氨鎴戠殑緇忛獙鏉ョ湅錛岃繖鏍峰鎴戠洰鍓嶇殑鍥㈤槦濂藉鏈澶э紝鍥犱負鏈嶅姟绔昏緫紼嬪簭鍛橀兘鏄柊鎵嬶紝鍐欏綰跨▼紼嬪簭緇忛獙涓嶈凍錛岀粡甯告閿併佹紡閿併?/p> valgrind鍦ㄥ唴瀛樻硠闇叉柟闈㈣繕鏄笉澶ソ鐢紝涔熷彧鑳芥槸鑳界敤錛屼絾鏄叾浠栨柟闈㈠掓槸鏈変竴浜涙剰鎯充笉鍒扮殑鏀惰幏錛屽彂鐜頒簡鍑犲閫昏緫BUG錛屾瘮濡傛垜鐨勬湇鍔$綰跨▼accept鍒版柊鐨剆ocket鍚庡氨鍒涘緩涓涓嚎紼嬫敹鍙戝寘錛屼絾鏄仠姝㈡椂鎴戝厛鍋滀簡accept綰跨▼錛屼笉鎸?a target="_blank">valgrind灝辨病浜嬶紝鎸備笂灝県ang up鍦╬thread_join浣嶇疆涓婏紝閮侀椃寰堜箙錛屾敼浜嗛『搴忓氨瀹屽叏ok銆?/p> 閽堝鍐呭瓨娉勯湶錛屾垜鍙堟壘浜嗕竴涓緢灝忕殑宸ュ叿memcheck錛屾晥鏋滃嚭涔庢剰鏂欑殑濂姐傛垜瑕佺殑灝辨槸瀵筸alloc/realloc鐨勫唴瀛樻嫻嬫槸鍚ree鎺変簡銆傝繖涓皬宸ュ叿涔熷彧鏈夎繖涓姛鑳斤紝鍦╨inux涓嬮潰榪樿兘鐪嬪埌backtrace錛屼笉閿欎笉閿欍?/p> 璇村埌linux錛屼笉鐭ラ亾鏄垜鐨勯敊瑙夎繕鏄粈涔堬紝鏂板簳灞傚湪linux涓嬭窇鐨勮矊浼肩‘瀹炶濂戒竴浜涳紝涓嶆槸鎸囬熷害錛岄偅涓槸鑲夌溂鏃犳硶瑙傚療鍑烘潵鐨勶紝綰補鐨勬劅瑙夛紝璋冭瘯榪囩▼涓殑杈撳嚭銆乬db緇欑殑鍙嶉絳夌瓑銆傛庝箞褰㈠鍛€傛劅瑙塅reeBSD姣旇緝紜紝鏇村亸紼嬪簭鍛樺涓浜涖俵inux灝辨瘮杈冭蔣錛屾浛鏈嶅姟鍣ㄧ鐞嗗憳鑰冭檻鐨勫氨澶氫竴浜涖傜函鎰熻銆?/p> 絎竴嬈¢噸鏋勬湇鍔$鏄垰鏉ョ殑鏃跺欙紝鍖呮嫭澶氭湇鍔$鏋勬灦錛屽綰跨▼搴曞眰錛屽洜涓烘椂闂寸揣錛屼嬌鐢ㄧ殑鏄垜涓婁竴涓湇鍔$鐨勫ぇ浣撴鏋訛紝涓婁竴濂楁湇鍔″櫒浣跨敤c++/stlport/boost/asio錛岄昏緫鏄畝鍗曚簡錛屼絾鏄棶棰樹篃闅愯棌璧鋒潵浜嗭紝榪欐騫茶剢浣跨敤綰痗浠g爜+libev銆傚綋搴曞眰鎼緩瀹屾垚紼嬪簭鍛樺紑濮嬪伐浣滃悗錛屾垜鍒╃敤鍓╀綑鏃墮棿閲嶆柊鑰冭檻浜嗕竴涓嬫湇鍔$錛岄鍏堣鎴戞斁寮冪殑鏄竴寮濮嬪氨鑰冭檻涓婁竾浜烘壙杞姐佹棤緙濆湴鍥劇瓑絳夛紝鎶婃壙杞芥斁鍦ㄤ簡姣旇緝鍚堢悊鐨勮璁?k錛屽疄闄?k涓緇勪笂錛岀粡榪囧拰鍏朵粬閮ㄩ棬鐨勬矡閫氾紝鍦ㄦ瀯鏋朵笂涔熷仛浜嗕竴浜涙敼鍔紝閬垮厤浜嗕竴澶勬槑鏄劇殑鐡墮璁捐銆?/p> 鍐嶆閲嶆瀯渚濈劧閲囩敤澶氭湇鍔$鏋勬灦錛屽仛浜嗙畝鍗曠殑璺?nix騫沖彴錛岀洰鍓嶅湪FreeBSD7.2鍜孋entOS5.2涓婂紑鍙戯紝搴曞眰鏄綰跨▼錛岄昏緫鍗曠嚎紼嬶紝瀹㈡埛绔洃鍚嬌鐢?涓敹錛?涓彂鏉ュ鐞咺O錛屾湇鍔$涔嬮棿鏄竴涓繛鎺ヤ竴涓嚎紼嬶紝kqueue/epoll鍙拡瀵瑰鎴風鐩戝惉浣跨敤錛岀洃鍚嬌鐢ㄤ竴涓紝4涓敹鍖呯嚎紼嬩竴涓嚎紼嬩嬌鐢ㄤ竴涓?/p> 閫昏緫綰跨▼灝變竴涓紝綆鍗曠殑浠庢敹鍒扮殑鍖呯殑闃熷垪閲屽彇鍑烘暟鎹劧鍚庡鐞嗐?/p> 閮芥槸浜涜交杞︾啛璺殑涓滆タ錛屽啓涓嬫潵涓嶅埌1000琛屼唬鐮侊紝鏁堟灉榪橀渶瑕佸帇鏉ユ祴璇曘?/p> 鍦ㄤ竴嬈℃閲嶆瀯涓紝鐪熸鎰熻鍒頒簡綆鍗曠殑緹庝附錛岀幇鍦ㄧ殑浠g爜榪瀕ibev閮芥姏寮冧簡錛宬queue/epoll綆鍗曞寘瑁呬簡涓涓嬶紝綰痗鐨勪唬鐮佽繍鐢ㄨ搗鏉ヤ篃娓愭笎寰楀績搴旀墜錛屾病鏈変換浣曞鏉傜殑鏁版嵁緇撴瀯錛屾劅瑙夊緢濂姐?/p> valgrind緇堜簬榪涜浜嗛噸澶у崌綰э紝铏界劧features涓婃彁鐨勬槸鏀寔MacOS錛屼絾濂芥鍜孎reeBSD鍚屾簮涓嶆槸錛?.5.0鐗堟湰鍦‵reeBSD涓婁嬌鐢ㄥ啀涔熶笉闇瑕乵ount /proc浜嗭紝鑰屼笖涓婁釜鐗堟湰鍦‵B7.2涓婃牴鏈敤涓嶆垚銆傝繖嬈¤〃鐜扮殑寰堝ソ錛岃櫧鐒惰鎶ヤ緷鐒朵竴澶у爢錛屼絾濂芥鏈夋姤涓嶆槸銆傜粓浜庝笉鍦‵B涓婂啓紼嬪簭鐨勬椂鍊欐彁蹇冨悐鑳嗕簡錛屼互鍓嶅彲鏄牴鏈氨娌℃硠闇叉嫻嬪伐鍏楓傚弽鍊掓槸CentOS涓婄紪璇憊algrind澶辮觸錛屽ソ鍍忔槸涓涓猟efine鐨勯棶棰橈紝娌″幓綆″畠銆?/p> 褰撲釜欏圭洰鎬葷洃錛岀壒鍒槸姣旇緝澶ч」鐩殑綆$悊鑰呰繕鏄緢绱殑錛屼笉榪囨垜瑙夊緱鍋氱鐞嗚鏈夋墍渚濓紝鏈嶅姟绔紪紼嬫垜涓嶄細鏀句笅錛屽啀蹇欐瘡澶╅兘瑕佹娊鍑烘椂闂存潵鍐欏嚑孌典唬鐮侊紝鍏跺疄綆$悊寰堢畝鍗曪紝鎴戠殑椋庢牸涓嶅枩嬈㈡悶澶浜嬫儏錛屾噿錛屼絾鏄仛綆$悊榪欐牱鏄笉澶熺殑錛岀己涔忓己娌熼氥佸己鎺ㄥ姩銆傛昏寰楀洟闃熷皯浜嗘渶鏍稿績鐨勪竴鐐逛粈涔堛傚姫鍔涳紒 璁頒笅鏉ュ惂銆傚厤寰楁瘡嬈¢兘瑕佹壘鍊熷彛鍘葷溂闀滃簵鐪煎厜 R –3.75 –2.00 X165 L –5.00 –2.00 X15 鐬寵窛68 Mark涓涓嬶紝鍏嶅緱30澶╁悗鍙堝繕浜嗐傛敼澶╂湁絀虹爺絀朵竴涓嬪Agent鐨勬晥鐜囥?/p> IncrediBuild鏄竴涓緢寮虹殑鍒嗗竷寮忕紪璇戝伐鍏鳳紝鍙互鏄庢樉緙╃煭澶у瀷欏圭洰緙栬瘧鏃墮棿錛屼絾鏄環鏍間笉鑿層傚浜庢垜榪欐牱鐨勭┓浜烘潵璇達紝鍙兘浣跨敤璇曠敤鐗堛傝瘯鐢ㄦ湡闄愭槸30澶╋紝30澶╁埌浜嗗嵆浣垮垹鎺夊啀瀹夎浠嶇劧涓嶈兘浣跨敤銆傜粰Xoreax鍐欎俊鐢寵寤墮暱璇曠敤鏈熼檺錛屼篃娌$粰絳斿錛屼及璁¢拡瀵逛釜浜轟粬浠牴鏈氨涓嶈寤墮暱璇曠敤銆?/p> 浠や漢閮侀椃鐨勬槸錛岀綉涓婅兘鎵懼埌鐨勬墍鏈夌牬瑙i兘鏄棤鏁堢殑銆傚嵆浣跨晫闈㈡樉紺哄凡緇忕牬瑙o紝浣嗘槸鏃墮棿涓鍒幫紝鍔熻兘鏍規湰涓嶆甯搞傛牴鏈笉浼氭妸緙栬瘧浠誨姟鍒嗗彂緇欏埆浜猴紝鍙兘鏈満緙栬瘧浜嗐?/p> IncrediBuild 2.40鐨凩icense鏈?涓枃浠禖oordLicense.dat鍜孉gentLicense.dat錛屽垎鍒綅浜嶤oordinator鍜孉gent瀹夎鐩綍涓嬶紝榪欎袱涓枃浠墮兘鏄疪SA鏁板瓧絳懼悕榪囩殑錛岄櫎闈炰慨鏀?exe鏂囦歡涓殑瑙e瘑瀵嗛挜錛屽惁鍒欐病娉曚吉閫燣icense鏂囦歡銆備絾鏃㈢劧緗戜笂鑳芥壘鍒扮殑鐮磋В閮芥棤娉曟甯鎬嬌鐢紝鎵浠ヨ偗瀹氫笉瀹規槗鎼炲畾銆傚浜?.20搴旇涔熷ぇ鍚屽皬寮傘?/p> IncrediBuild鍦ㄧ涓嬈¤繍琛岀殑鏃跺欎細鍚戞敞鍐岃〃涓啓鍏ヨ蔣浠跺埌鏈熺殑鏃墮棿銆?/p> 2.40: HKCR\Interface\{E9B0227F-437C-4F7A-86D9-2676B83F359F}\ProxyStubClsid32 = {M1-M2-M3-T1-T2} 3.20: HKCR\Interface\{B7348B5D-B65D-4BF5-AF63-A3135249ACA7}\ProxyStubClsid32 = {M1-M2-M3-T1-T2} 鍗歌澆杞歡鐨勬椂鍊欏茍涓嶄細鍗歌澆榪欎釜娉ㄥ唽琛ㄩ」錛屾墍浠ラ噸鏂板畨瑁呬粛鐒朵笉鑳戒嬌鐢ㄣ傛渶綆鍗曠殑鍔炴硶鏄嵏杞借蔣浠跺悗鎵嬪姩鍒犻櫎榪欎釜娉ㄥ唽琛ㄩ」錛岀劧鍚庨噸鏂板畨瑁咃紝灝卞張鍙互緇х畫璇曠敤銆傝繕鏈変竴縐嶅姙娉曞氨鏄紝鎴戜滑瀹氭湡鏇存柊涓婇潰榪欎釜娉ㄥ唽琛ㄩ」鐨勫鹼紝鎶婃椂闂村線鍚庢帹縐匯傝繕濂借杞歡鏃墮棿綆楁硶騫朵笉澶嶆潅錛屽緢瀹規槗綆楀嚭鏉ャ?/p> 姣斿璇村埌鏈熸椂闂存槸2008.5.30鏃?3:59:59錛屽彲浠ュ啓涓よ綆鍗曠殑浠g爜錛?/p> COleDateTime DateTime(2008, 5, 30, 23, 59, 59); DATE Date = (DATE)DateTime; 姝ゆ椂Date鐨勫兼槸39598.999988425923 (0x37BA E7FFDF55E340) T1錛?7BA T2錛欵7FFDF55E340 M1 = 37 * BA * E7 * FF = 23EAEB06 M2 = DF * 55 = 4A0B M3 = E3 * 40 = 38C0 榪欐牱鎴戜滑灝卞彲浠ユ妸娉ㄥ唽琛ㄤ腑涓婅堪閿兼敼涓猴細{23EAEB06-4A0B-38C0-37BA-E7FFDF55E340} 榪欐牱錛岃蔣浠跺埌浜?008.5.31 00:00:00鎵嶄細榪囨湡銆?/p>
浠婂ぉ瑙e喅浜嗚繖涓棶棰橈紝鍙傝冧互涓嬬綉鍧錛?a >https://wiki.bnl.gov/dayabay/index.php?title=Synchronizing_Repositories銆?br>浠ヤ笅閲嶆柊鎻忚堪涓涓嬮棶棰樺拰瑙e喅鏂規硶錛?br>1銆佸湪鎵цgit svn dcommit鏃訛紝鍑虹幇濡備笅閿欒錛?br>Committing to https://svn.xxx.com/svn/projects/trunk ...
鎻愪氦鏃跺彂鐢熷悎騫跺啿紿? 鎮ㄧ殑鏂囦歡鎴栫洰褰曗漷est/functional/xxx_controller_test.rb鈥滃彲鑳藉凡緇忚繃鏃? The version resource does not correspond to the resource within the transaction. Either the requested version resource is out of date (needs to be updated), or the requested version resource is newer than the transaction root (restart the commit). at /usr/bin/git-svn line 450
2銆佽繖鏃訛紝閲嶆柊鎵ц浠ヤ笅姝ラ鍗沖彲錛?
]]>
kern.ipc.shmmax=134217728
kern.ipc.shmall=32768
kern.ipc.semmap=256
kern.ipc.semmni=256
kern.ipc.semmns=512
kern.ipc.semmnu=256
max_connections = 100
sudo make install clean
---
postgres:\
:lang=en_US.UTF-8:\
:setenv=LC_COLLATE=C:\
:tc=default:
---
and run `cap_mkdb /etc/login.conf'.
Then add 'postgresql_class="postgres"' to /etc/rc.conf.
To run PostgreSQL at startup, add
'postgresql_enable="YES"' to /etc/rc.conf
listen_addresses = '*'
# my lan
host all all 192.168.64.0/22 md5
su pgsql
psql -d postgres
alter user pgsql with password '******';
]]>寮濮?/h5>
[user]
name = Robin Lu
email = ---@gmail.com
[color]
diff = auto
status = auto
branch = auto
[alias]
st = status
rb = svn rebase
ci = commit -a
co = checkout
鍒濆鍖栦唬鐮佸簱
git svn clone -s svn-repository-url
git gc
git status
git branch -a
log
tmp
寮鍙戞祦紼?/h5>
git checkout -b new_branch
git diff
git checkout path/filename
git add path/filename1
git add path/filename2
...
git commit -m "鎻愪氦鎰熻█"
git add .
git commit -m "鎻愪氦鎰熻█"
git commit -a -m "鎻愪氦鎰熻█"
git diff --cached
git status
git rm file
git mv file newfile
鎻愪氦鍒皊vn
git svn dcommit
git svn rebase --continue
緙虹偣
git rebase master
git checkout master
git merge new_branch
]]>
]]>
systat鍩烘湰涓婃槸FreeBSD涓渶鍔熻兘鏈澶氱殑緋葷粺鐩戣鍛戒護錛屾樉紺篊PU銆両/O銆佸唴瀛樸佽櫄鎷熷唴瀛樸乵bufs銆佺鐩業O銆佺綉緇滅姸鎬佺瓑淇℃伅絳夈?/p>
鍛戒護錛?/p>
systat [-display] [refresh-interval]
鍏朵腑 display 涓烘垜浠墍瑕佹樉紺虹殑淇℃伅欏圭洰錛屾垜浠篃鍙互鍦ㄨ繘鍏?systat 鍚庨氳繃杈撳叆“:display”鍙樻洿鏄劇ず欏圭洰錛?strong>refresh-interval 鍙傛暟鏄渶瑕佸闀挎椂闂撮噰鏍蜂竴嬈$郴緇熸暟鎹緭鍑哄埌灞忓箷錛屽崟浣嶆槸縐掋?/p>
瀹炰緥錛?strong># systat -vmstat 1
鍛戒護瑙i噴錛氭樉紺篊PU銆両/O銆佸唴瀛樸佽櫄鎷熷唴瀛樸乵bufs銆佺鐩業O銆佺綉緇滅姸鎬佺瓑淇℃伅銆備俊鎭噰鏍峰埛鏂版椂闂翠負1縐掋?/p>
浠ヤ笅涓哄彲鐢ㄧ殑 display 鍙傛暟錛?/strong>
pigs 鏄劇ず鐩墠緋葷粺涓嬌鐢?CPU 鏈澶氱殑琛岀▼鍚嶇О銆傚鏋滄墍鏈夎紼嬬殑 CPU 浣跨敤閲忔湭婊?100%錛屽垯澶氬嚭鏉ョ殑閮ㄤ喚鏄劇ず涓?IDLE銆?
icmp 緇熻鐩墠 ICMP 灝佸寘鐨勮繘鍑烘儏褰€?
icmp6 鏄劇ず IPv6 鐨?ICMP 灝佸寘榪涘嚭鎯呭艦銆?
ip 鏄劇ず IP 灞傜殑灝佸寘緇熻鍙?UDP 灝佸寘淇℃伅銆?
ip6 鍜?IP 涓鏍鳳紝浣嗗彧鏄劇ず IPv6 鐨勫皝鍖呫?
tcp 鏄劇ず TCP 鐨勫皝鍖呯粺璁°?
iostat 鏄劇ず I/O 鐘跺喌緇熻錛屽茍鍒嗙被涓哄悇縐嶆ā寮忔樉紺恒?
swap 鏄劇ず鐩墠鍚勪釜鍌ㄥ瓨絀洪棿涓婄殑铏氭嫙鍐呭瓨鐨勪嬌鐢ㄦ儏褰€?
mbufs 鏄劇ず mbufs 琚嬌鐢ㄧ殑鐘舵併?
vmstat 榪欐槸鎴戜滑鏈甯哥敤鐨勬樉紺烘ā寮忥紝瀹冩樉紺轟簡鏈澶氱殑淇℃伅錛屽寘鍚?I/O銆佽櫄鎷熷唴瀛樸乵bufs銆佺綉緇滅瓑淇℃伅銆?
netstat 鏄劇ず緗戠粶鐨勪嬌鐢ㄦ儏褰€?
ifstat 鏄劇ず鍚勪釜緗戠粶閫傞厤鍗$殑浣跨敤鎯呭艦銆?/p>
==================================================
鏈蹇殑FreeBSD鍗囩駭鍔炴硶錛?/p>
The freebsd-update(8) utility supports binary upgrades of i386 and amd64 systems running earlier FreeBSD releases. Systems running 7.0-RELEASE, 7.1-RELEASE, 7.2-BETA, 7.2-RC1, or 7.2-RC2 can upgrade as follows:
# freebsd-update upgrade -r 7.2-RELEASE
During this process, FreeBSD Update may ask the user to help by merging some configuration files or by confirming that the automatically performed merging was done correctly.
# freebsd-update install
The system must be rebooted with the newly installed kernel before continuing.
# shutdown -r now
After rebooting, freebsd-update needs to be run again to install the new userland components, and the system needs to be rebooted again:
# freebsd-update install # shutdown -r now
Users of earlier FreeBSD releases (FreeBSD 6.x) can also use freebsd-update to upgrade to FreeBSD 7.2, but will be prompted to rebuild all third-party applications (e.g., anything installed from the ports tree) after the second invocation of "freebsd-update install", in order to handle differences in the system libraries between FreeBSD 6.x and FreeBSD 7.x.
==================================================
娣誨姞鐢ㄦ埛緇勶細
pw group add coder
娣誨姞鏂扮敤鎴鳳細
adduser